diff --git a/.github/workflows/benchmark-destroy-nightly.yml b/.github/workflows/benchmark-destroy-nightly.yml
index 70d0d17685..0d87da7776 100644
--- a/.github/workflows/benchmark-destroy-nightly.yml
+++ b/.github/workflows/benchmark-destroy-nightly.yml
@@ -29,11 +29,14 @@ jobs:
           tenant-id: ${{ secrets.BENCHMARK_ARM_TENANT_ID }}
           subscription-id: ${{ secrets.BENCHMARK_ARM_SUBSCRIPTION_ID }}
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/benchmark-nightly.yml b/.github/workflows/benchmark-nightly.yml
index 6c61d3bfc2..6ebf908062 100644
--- a/.github/workflows/benchmark-nightly.yml
+++ b/.github/workflows/benchmark-nightly.yml
@@ -48,11 +48,14 @@ jobs:
         with:
           terraform_version: '1.8.5'
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: pnpm
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/check-documentation-urls.yml b/.github/workflows/check-documentation-urls.yml
index 0a2796abe7..ac7ca21335 100644
--- a/.github/workflows/check-documentation-urls.yml
+++ b/.github/workflows/check-documentation-urls.yml
@@ -16,11 +16,14 @@ jobs:
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index e449891210..98037c520f 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -17,11 +17,14 @@ jobs:
       - name: Check out branch
         uses: actions/checkout@v4.1.1
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 4e77fbd580..f635550012 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -8,13 +8,14 @@ on:
     types: [submitted]
 
 concurrency:
-  group: chromatic-${{ github.event.pull_request.number || github.ref }}
+  group: chromatic-${{ github.event.pull_request.number || github.ref }}-${{github.event.review.state}}
   cancel-in-progress: true
 
 jobs:
   get-metadata:
     name: Get Metadata
     runs-on: ubuntu-latest
+    if: github.event.review.state == 'approved'
     steps:
       - name: Check out current commit
         uses: actions/checkout@v4
@@ -54,11 +55,16 @@ jobs:
       - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: 0
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Publish to Chromatic
diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index b6972e1932..6c74f9ff6c 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -7,30 +7,35 @@ on:
 
 jobs:
   install-and-build:
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2204
+    env:
+      NODE_OPTIONS: '--max-old-space-size=4096'
 
     timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v4.1.1
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: useblacksmith/setup-node@v5
         with:
           node-version: 20.x
-          cache: pnpm
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
-        uses: rharkor/caching-for-turbo@v1.5
+        uses: useblacksmith/caching-for-turbo@v1
 
       - name: Build
         run: pnpm build
 
       - name: Cache build artifacts
-        uses: actions/cache/save@v4.0.0
+        uses: useblacksmith/cache/save@v5
         with:
           path: ./packages/**/dist
           key: ${{ github.sha }}-base:build
@@ -48,6 +53,7 @@ jobs:
       cacheKey: ${{ github.sha }}-base:build
       collectCoverage: ${{ matrix.node-version == '20.x' }}
       ignoreTurboCache: ${{ matrix.node-version == '20.x' }}
+      skipFrontendTests: ${{ matrix.node-version != '20.x' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.github/workflows/ci-postgres-mysql.yml b/.github/workflows/ci-postgres-mysql.yml
index f6e5e773cb..bd66409add 100644
--- a/.github/workflows/ci-postgres-mysql.yml
+++ b/.github/workflows/ci-postgres-mysql.yml
@@ -23,11 +23,16 @@ jobs:
     if: github.event_name != 'pull_request_review' || startsWith(github.event.pull_request.base.ref, 'release/')
     steps:
       - uses: actions/checkout@v4.1.1
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
@@ -52,11 +57,16 @@ jobs:
       DB_SQLITE_POOL_SIZE: 4
     steps:
       - uses: actions/checkout@v4.1.1
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
@@ -81,11 +91,16 @@ jobs:
       DB_MYSQLDB_PASSWORD: password
     steps:
       - uses: actions/checkout@v4.1.1
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
@@ -118,11 +133,16 @@ jobs:
       DB_POSTGRESDB_POOL_SIZE: 1 # Detect connection pooling deadlocks
     steps:
       - uses: actions/checkout@v4.1.1
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index 1ce7427098..203b65a8c6 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -9,23 +9,28 @@ on:
 jobs:
   install-and-build:
     name: Install & Build
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2204
+    env:
+      NODE_OPTIONS: '--max-old-space-size=4096'
     steps:
       - uses: actions/checkout@v4.1.1
         with:
           ref: refs/pull/${{ github.event.pull_request.number }}/merge
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: useblacksmith/setup-node@v5
         with:
           node-version: 20.x
-          cache: pnpm
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
-        uses: rharkor/caching-for-turbo@v1.5
+        uses: useblacksmith/caching-for-turbo@v1
 
       - name: Build
         run: pnpm build
@@ -37,7 +42,7 @@ jobs:
         run: pnpm typecheck
 
       - name: Cache build artifacts
-        uses: actions/cache/save@v4.0.0
+        uses: useblacksmith/cache/save@v5
         with:
           path: ./packages/**/dist
           key: ${{ github.sha }}-base:build
diff --git a/.github/workflows/docker-base-image.yml b/.github/workflows/docker-base-image.yml
index c32160e763..c2b5c9b6e6 100644
--- a/.github/workflows/docker-base-image.yml
+++ b/.github/workflows/docker-base-image.yml
@@ -20,26 +20,28 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: ./docker/images/n8n-base/Dockerfile
diff --git a/.github/workflows/docker-images-benchmark.yml b/.github/workflows/docker-images-benchmark.yml
index b0aa6e997d..d4bf2f98a0 100644
--- a/.github/workflows/docker-images-benchmark.yml
+++ b/.github/workflows/docker-images-benchmark.yml
@@ -19,20 +19,22 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: ./packages/@n8n/benchmark/Dockerfile
diff --git a/.github/workflows/docker-images-custom.yml b/.github/workflows/docker-images-custom.yml
new file mode 100644
index 0000000000..dfc9d77a03
--- /dev/null
+++ b/.github/workflows/docker-images-custom.yml
@@ -0,0 +1,83 @@
+name: Docker Custom Image CI
+run-name: Build ${{ inputs.branch }} - ${{ inputs.user }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'GitHub branch to create image off.'
+        required: true
+      tag:
+        description: 'Name of the docker tag to create.'
+        required: true
+      merge-master:
+        description: 'Merge with master.'
+        type: boolean
+        required: true
+        default: false
+      user:
+        description: ''
+        required: false
+        default: 'none'
+      start-url:
+        description: 'URL to call after workflow is kicked off.'
+        required: false
+        default: ''
+      success-url:
+        description: 'URL to call after Docker Image got built successfully.'
+        required: false
+        default: ''
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Call Start URL - optionally
+        if: ${{ github.event.inputs.start-url != '' }}
+        run: curl -v -X POST -d 'url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' ${{github.event.inputs.start-url}} || echo ""
+        shell: bash
+
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: Merge Master - optionally
+        if: github.event.inputs.merge-master
+        run: git remote add upstream https://github.com/n8n-io/n8n.git -f; git merge upstream/master --allow-unrelated-histories || echo ""
+        shell: bash
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.3.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.8.0
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image to GHCR
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
+        with:
+          context: .
+          file: ./docker/images/n8n-custom/Dockerfile
+          build-args: |
+            N8N_RELEASE_TYPE=development
+          platforms: linux/amd64
+          provenance: false
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ghcr.io/${{ github.repository_owner }}/n8n:${{ inputs.tag }}
+
+      - name: Call Success URL - optionally
+        if: ${{ github.event.inputs.success-url != '' }}
+        run: curl -v ${{github.event.inputs.success-url}} || echo ""
+        shell: bash
diff --git a/.github/workflows/docker-images-nightly.yml b/.github/workflows/docker-images-nightly.yml
index b6831b6399..dbdde44078 100644
--- a/.github/workflows/docker-images-nightly.yml
+++ b/.github/workflows/docker-images-nightly.yml
@@ -1,74 +1,40 @@
 name: Docker Nightly Image CI
-run-name: Build ${{ inputs.branch }} - ${{ inputs.user }}
 
 on:
   schedule:
-    - cron: '0 1 * * *'
+    - cron: '0 0 * * *'
   workflow_dispatch:
-    inputs:
-      branch:
-        description: 'GitHub branch to create image off.'
-        required: true
-        default: 'master'
-      tag:
-        description: 'Name of the docker tag to create.'
-        required: true
-        default: 'nightly'
-      merge-master:
-        description: 'Merge with master.'
-        type: boolean
-        required: true
-        default: false
-      user:
-        description: ''
-        required: false
-        default: 'schedule'
-      start-url:
-        description: 'URL to call after workflow is kicked off.'
-        required: false
-        default: ''
-      success-url:
-        description: 'URL to call after Docker Image got built successfully.'
-        required: false
-        default: ''
-
-env:
-  N8N_TAG: ${{ inputs.tag || 'nightly' }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Call Start URL - optionally
-        run: |
-          [[ "${{github.event.inputs.start-url}}" != "" ]] && curl -v -X POST -d 'url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' ${{github.event.inputs.start-url}} || echo ""
-        shell: bash
-
       - name: Checkout
         uses: actions/checkout@v4.1.1
-        with:
-          ref: ${{ github.event.inputs.branch || 'master' }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Merge Master - optionally
-        run: |
-          [[ "${{github.event.inputs.merge-master}}" == "true" ]] && git remote add upstream https://github.com/n8n-io/n8n.git -f; git merge upstream/master --allow-unrelated-histories || echo ""
-        shell: bash
-
-      - name: Build and push to DockerHub
-        uses: docker/build-push-action@v5.1.0
+      - name: Build and push image to GHCR and DockerHub
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: ./docker/images/n8n-custom/Dockerfile
@@ -79,24 +45,6 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: ${{ secrets.DOCKER_USERNAME }}/n8n:${{ env.N8N_TAG }}
-
-      - name: Login to GitHub Container Registry
-        if: env.N8N_TAG == 'nightly'
-        uses: docker/login-action@v3.0.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Push image to GHCR
-        if: env.N8N_TAG == 'nightly'
-        run: |
-          docker buildx imagetools create \
-            --tag ghcr.io/${{ github.repository_owner }}/n8n:nightly \
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/n8n:nightly
             ${{ secrets.DOCKER_USERNAME }}/n8n:nightly
-
-      - name: Call Success URL - optionally
-        run: |
-          [[ "${{github.event.inputs.success-url}}" != "" ]] && curl -v ${{github.event.inputs.success-url}} || echo ""
-        shell: bash
diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml
index b55d6728d2..8231896145 100644
--- a/.github/workflows/e2e-reusable.yml
+++ b/.github/workflows/e2e-reusable.yml
@@ -41,11 +41,6 @@ on:
         description: 'PR number to run tests for.'
         required: false
         type: number
-      node_view_version:
-        description: 'Node View version to run tests with.'
-        required: false
-        default: '1'
-        type: string
     secrets:
       CYPRESS_RECORD_KEY:
         description: 'Cypress record key.'
@@ -165,7 +160,7 @@ jobs:
           spec: '${{ inputs.spec }}'
         env:
           NODE_OPTIONS: --dns-result-order=ipv4first
-          CYPRESS_NODE_VIEW_VERSION: ${{ inputs.node_view_version }}
+          CYPRESS_NODE_VIEW_VERSION: 2
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           E2E_TESTS: true
diff --git a/.github/workflows/e2e-tests-pr.yml b/.github/workflows/e2e-tests-pr.yml
index 047ce2d13a..b244ea86ae 100644
--- a/.github/workflows/e2e-tests-pr.yml
+++ b/.github/workflows/e2e-tests-pr.yml
@@ -5,13 +5,14 @@ on:
     types: [submitted]
 
 concurrency:
-  group: e2e-${{ github.event.pull_request.number || github.ref }}
+  group: e2e-${{ github.event.pull_request.number || github.ref }}-${{github.event.review.state}}
   cancel-in-progress: true
 
 jobs:
   get-metadata:
     name: Get Metadata
     runs-on: ubuntu-latest
+    if: github.event.review.state == 'approved'
     steps:
       - name: Check out current commit
         uses: actions/checkout@v4
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 2f63f61bc6..e7400adecb 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -27,11 +27,6 @@ on:
         description: 'URL to call after workflow is done.'
         required: false
         default: ''
-      node_view_version:
-        description: 'Node View version to run tests with.'
-        required: false
-        default: '1'
-        type: string
 
 jobs:
   calls-start-url:
@@ -51,7 +46,6 @@ jobs:
       branch: ${{ github.event.inputs.branch || 'master' }}
       user: ${{ github.event.inputs.user || 'PR User' }}
       spec: ${{ github.event.inputs.spec || 'e2e/*' }}
-      node_view_version: ${{ github.event.inputs.node_view_version || '1' }}
     secrets:
       CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
 
diff --git a/.github/workflows/linting-reusable.yml b/.github/workflows/linting-reusable.yml
index ed8d234940..a68cb4ebbb 100644
--- a/.github/workflows/linting-reusable.yml
+++ b/.github/workflows/linting-reusable.yml
@@ -17,23 +17,28 @@ on:
 jobs:
   lint:
     name: Lint
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2204
+    env:
+      NODE_OPTIONS: '--max-old-space-size=4096'
     steps:
       - uses: actions/checkout@v4.1.1
         with:
           ref: ${{ inputs.ref }}
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: useblacksmith/setup-node@v5
         with:
           node-version: 20.x
-          cache: pnpm
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
-        uses: rharkor/caching-for-turbo@v1.5
+        uses: useblacksmith/caching-for-turbo@v1
 
       - name: Build
         if: ${{ inputs.cacheKey == '' }}
@@ -41,10 +46,11 @@ jobs:
 
       - name: Restore cached build artifacts
         if: ${{ inputs.cacheKey != '' }}
-        uses: actions/cache/restore@v4.0.0
+        uses: useblacksmith/cache/restore@v5
         with:
           path: ./packages/**/dist
           key: ${{ inputs.cacheKey }}
+          fail-on-cache-miss: true
 
       - name: Lint Backend
         run: pnpm lint:backend
diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
index 03572e541c..dff2ce4bc8 100644
--- a/.github/workflows/release-create-pr.yml
+++ b/.github/workflows/release-create-pr.yml
@@ -35,13 +35,17 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.inputs.base-branch }}
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
 
       - run: npm install --prefix=.github/scripts --no-package-lock
 
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - name: Bump package versions
         run: |
           echo "NEXT_RELEASE=$(node .github/scripts/bump-versions.mjs)" >> $GITHUB_ENV
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 9196a7fccb..e8f8a44ee7 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -25,11 +25,15 @@ jobs:
         with:
           fetch-depth: 0
 
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Set release version in env
@@ -73,26 +77,28 @@ jobs:
           fetch-depth: 0
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: ./docker/images/n8n
           build-args: |
@@ -159,6 +165,14 @@ jobs:
           version: ${{ needs.publish-to-npm.outputs.release }}
           sourcemaps: packages/cli/dist packages/core/dist packages/nodes-base/dist packages/@n8n/n8n-nodes-langchain/dist
 
+      - name: Create a task runner release
+        uses: getsentry/action-release@v1.7.0
+        continue-on-error: true
+        with:
+          projects: ${{ secrets.SENTRY_TASK_RUNNER_PROJECT }}
+          version: ${{ needs.publish-to-npm.outputs.release }}
+          sourcemaps: packages/core/dist packages/workflow/dist packages/@n8n/task-runner/dist
+
   trigger-release-note:
     name: Trigger a release note
     needs: [publish-to-npm, create-github-release]
diff --git a/.github/workflows/release-push-to-channel.yml b/.github/workflows/release-push-to-channel.yml
index 3eda6d4ebb..74219e51c4 100644
--- a/.github/workflows/release-push-to-channel.yml
+++ b/.github/workflows/release-push-to-channel.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: actions/setup-node@v4.0.2
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
       - run: |
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: docker/login-action@v3.0.0
+      - uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: docker/login-action@v3.0.0
+      - uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 2df829f7c6..661a0ffd9d 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -22,11 +22,16 @@ jobs:
       !contains(github.event.pull_request.labels.*.name, 'community')
     steps:
       - uses: actions/checkout@v4.1.1
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
@@ -48,11 +53,16 @@ jobs:
     timeout-minutes: 10
     steps:
       - uses: actions/checkout@v4.1.1
-      - run: corepack enable
-      - uses: actions/setup-node@v4.0.2
+
+      - uses: actions/setup-node@v4.2.0
         with:
           node-version: 20.x
-          cache: 'pnpm'
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
+
       - run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
diff --git a/.github/workflows/units-tests-dispatch.yml b/.github/workflows/units-tests-dispatch.yml
index 5ad63f000e..72a9db5b6a 100644
--- a/.github/workflows/units-tests-dispatch.yml
+++ b/.github/workflows/units-tests-dispatch.yml
@@ -12,6 +12,11 @@ on:
         description: 'PR number to run tests for.'
         required: false
         type: number
+      skipFrontendTests:
+        description: 'Skip Frontend tests'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   prepare:
@@ -37,3 +42,4 @@ jobs:
     uses: ./.github/workflows/units-tests-reusable.yml
     with:
       ref: ${{ needs.prepare.outputs.branch }}
+      skipFrontendTests: ${{ inputs.skipFrontendTests }}
diff --git a/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml
index 62eca74b15..fbb071900a 100644
--- a/.github/workflows/units-tests-reusable.yml
+++ b/.github/workflows/units-tests-reusable.yml
@@ -26,6 +26,10 @@ on:
         required: false
         default: false
         type: boolean
+      skipFrontendTests:
+        required: false
+        default: false
+        type: boolean
     secrets:
       CODECOV_TOKEN:
         description: 'Codecov upload token.'
@@ -34,7 +38,7 @@ on:
 jobs:
   unit-test:
     name: Unit tests
-    runs-on: ubuntu-latest
+    runs-on: blacksmith-2vcpu-ubuntu-2204
     env:
       TURBO_FORCE: ${{ inputs.ignoreTurboCache }}
       COVERAGE_ENABLED: ${{ inputs.collectCoverage }}
@@ -43,18 +47,21 @@ jobs:
         with:
           ref: ${{ inputs.ref }}
 
-      - run: corepack enable
       - name: Use Node.js ${{ inputs.nodeVersion }}
-        uses: actions/setup-node@v4.0.2
+        uses: useblacksmith/setup-node@v5
         with:
           node-version: ${{ inputs.nodeVersion }}
-          cache: pnpm
+
+      - name: Setup corepack and pnpm
+        run: |
+          npm i -g corepack@0.31
+          corepack enable
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
-        uses: rharkor/caching-for-turbo@v1.5
+        uses: useblacksmith/caching-for-turbo@v1
 
       - name: Build
         if: ${{ inputs.cacheKey == '' }}
@@ -62,10 +69,11 @@ jobs:
 
       - name: Restore cached build artifacts
         if: ${{ inputs.cacheKey != '' }}
-        uses: actions/cache/restore@v4.0.0
+        uses: useblacksmith/cache/restore@v5
         with:
           path: ./packages/**/dist
           key: ${{ inputs.cacheKey }}
+          fail-on-cache-miss: true
 
       - name: Test Backend
         run: pnpm test:backend
@@ -74,6 +82,7 @@ jobs:
         run: pnpm test:nodes
 
       - name: Test Frontend
+        if: ${{ !inputs.skipFrontendTests }}
         run: pnpm test:frontend
 
       - name: Upload coverage to Codecov
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b094f30ff..70c513f5b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,199 @@
-## [1.74.1](https://github.com/n8n-io/n8n/compare/n8n@1.74.0...n8n@1.74.1) (2025-01-09)
+# [1.78.0](https://github.com/n8n-io/n8n/compare/n8n@1.77.0...n8n@1.78.0) (2025-02-06)
 
 
 ### Bug Fixes
 
-* **editor:** Fix parameter input validation ([#12532](https://github.com/n8n-io/n8n/issues/12532)) ([6f757f1](https://github.com/n8n-io/n8n/commit/6f757f10bd9102394d2a0b6bbc795f90444f66d2))
+* **AI Agent Node:** Ignore SSL errors option for SQLAgent ([#13052](https://github.com/n8n-io/n8n/issues/13052)) ([a90529f](https://github.com/n8n-io/n8n/commit/a90529fd51ca88bc9640d24490dbeb2023c98e30))
+* **Code Node:** Do not validate code within comments ([#12938](https://github.com/n8n-io/n8n/issues/12938)) ([cdfa225](https://github.com/n8n-io/n8n/commit/cdfa22593b69cf647c2a798d6571a9bbbd11c1b2))
+* **core:** "Respond to Webhook" should work with workflows with waiting nodes ([#12806](https://github.com/n8n-io/n8n/issues/12806)) ([e8635f2](https://github.com/n8n-io/n8n/commit/e8635f257433748f4d7d2c4b0ae794de6bff5b28))
+* **core:** Do not emit `workflow-post-execute` event for waiting executions ([#13065](https://github.com/n8n-io/n8n/issues/13065)) ([1593b6c](https://github.com/n8n-io/n8n/commit/1593b6cb4112ab2a85ca93c4eaec7d5f088895b1))
+* **core:** Do not enable strict type validation by default for resource mapper ([#13037](https://github.com/n8n-io/n8n/issues/13037)) ([fdcff90](https://github.com/n8n-io/n8n/commit/fdcff9082b97314f8b04579ab6fa81c724916320))
+* **core:** Fix empty node execution stack ([#12945](https://github.com/n8n-io/n8n/issues/12945)) ([7031569](https://github.com/n8n-io/n8n/commit/7031569a028bcc85558fcb614f8143d68a7f81f0))
+* **core:** Only use new resource mapper type validation when it is enabled ([#13099](https://github.com/n8n-io/n8n/issues/13099)) ([a37c8e8](https://github.com/n8n-io/n8n/commit/a37c8e8fb86aaa3244ac13500ffa0e7c0d809a6f))
+* **editor:** Actually enforce the version and don't break for old values in local storage ([#13025](https://github.com/n8n-io/n8n/issues/13025)) ([884a7e2](https://github.com/n8n-io/n8n/commit/884a7e23f84258756d8dcdd2dfe933bdedf61adc))
+* **editor:** Add telemetry to source control feature ([#13016](https://github.com/n8n-io/n8n/issues/13016)) ([18eaa54](https://github.com/n8n-io/n8n/commit/18eaa5423dfc9348374c2cff4ae0e6f152268fbb))
+* **editor:** Allow switch to `Fixed` for boolean and number parameters with invalid expressions ([#12948](https://github.com/n8n-io/n8n/issues/12948)) ([118be24](https://github.com/n8n-io/n8n/commit/118be24d25f001525ced03d9426a6129fa5a2053))
+* **editor:** Allow to re-open sub-connection node creator if already active ([#13041](https://github.com/n8n-io/n8n/issues/13041)) ([16d59e9](https://github.com/n8n-io/n8n/commit/16d59e98edc427bf68edbce4cd2174a44d6dcfb1))
+* **editor:** Code node overwrites code when switching nodes after edits ([#13078](https://github.com/n8n-io/n8n/issues/13078)) ([00e3ebc](https://github.com/n8n-io/n8n/commit/00e3ebc9e2e0b8cc2d88b678c3a2a21602dac010))
+* **editor:** Fix execution running status listener for chat messages ([#12951](https://github.com/n8n-io/n8n/issues/12951)) ([4d55a29](https://github.com/n8n-io/n8n/commit/4d55a294600dc2c86f6f7019da923b66a4b9de7e))
+* **editor:** Fix position of connector buttons when the line is straight ([#13034](https://github.com/n8n-io/n8n/issues/13034)) ([3a908ac](https://github.com/n8n-io/n8n/commit/3a908aca17f0bc1cf5fb5eb8813cc94f27f0bcdf))
+* **editor:** Fix showing and hiding canvas edge toolbar when hovering ([#13009](https://github.com/n8n-io/n8n/issues/13009)) ([ac7bc4f](https://github.com/n8n-io/n8n/commit/ac7bc4f1911f913233eeeae5d229432fdff332c4))
+* **editor:** Make AI transform node read only in executions view ([#12970](https://github.com/n8n-io/n8n/issues/12970)) ([ce1deb8](https://github.com/n8n-io/n8n/commit/ce1deb8aea528eef996fc774d0fff1dc61df5843))
+* **editor:** Prevent infinite loop in expressions crashing the browser ([#12732](https://github.com/n8n-io/n8n/issues/12732)) ([8c2dbcf](https://github.com/n8n-io/n8n/commit/8c2dbcfeced70a0a84137773269cc6db2928d174))
+* **editor:** Refine push modal layout ([#12886](https://github.com/n8n-io/n8n/issues/12886)) ([212a5bf](https://github.com/n8n-io/n8n/commit/212a5bf23eb11cc3296e7a8d002a4b7727d5193c))
+* **editor:** SchemaView renders duplicate structures properly ([#12943](https://github.com/n8n-io/n8n/issues/12943)) ([0d8a544](https://github.com/n8n-io/n8n/commit/0d8a544975f72724db931778d7e3ace8a12b6cfc))
+* **editor:** Update node issues when opening execution ([#12972](https://github.com/n8n-io/n8n/issues/12972)) ([1a91523](https://github.com/n8n-io/n8n/commit/1a915239c6571d7744023c6df6242dabe97c912e))
+* **editor:** Use correct connection index when connecting adjancent nodes after deleting a node ([#12973](https://github.com/n8n-io/n8n/issues/12973)) ([c7a15d5](https://github.com/n8n-io/n8n/commit/c7a15d5980d181a865f8e2ec6a5f70d0681dcf56))
+* **GitHub Node:** Don't truncate filenames retrieved from GitHub ([#12923](https://github.com/n8n-io/n8n/issues/12923)) ([7e18447](https://github.com/n8n-io/n8n/commit/7e1844757fe0d544e8881d229d16af95ed53fb21))
+* **Google Cloud Firestore Node:** Fix potential prototype pollution vulnerability ([#13035](https://github.com/n8n-io/n8n/issues/13035)) ([f150f79](https://github.com/n8n-io/n8n/commit/f150f79ad6c7d43e036688b1de8d6c2c8140aca9))
+* Increment runIndex in WorkflowToolV2 tool executions to avoid reusing out of date inputs ([#13008](https://github.com/n8n-io/n8n/issues/13008)) ([cc907fb](https://github.com/n8n-io/n8n/commit/cc907fbca9aa00fe07dd54a2fcac8983f2321ad1))
+* Sync partial execution version of FE and BE, also allow enforcing a specific version ([#12840](https://github.com/n8n-io/n8n/issues/12840)) ([a155043](https://github.com/n8n-io/n8n/commit/a15504329bac582225185705566297d9cc27bf73))
+* **Wise Node:** Use ISO formatting for timestamps ([#10288](https://github.com/n8n-io/n8n/issues/10288)) ([1a2d39a](https://github.com/n8n-io/n8n/commit/1a2d39a158c9a61bdaf11124b09ae70de65ebbf1))
+
+
+### Features
+
+* Add reusable frontend `composables` package ([#13077](https://github.com/n8n-io/n8n/issues/13077)) ([ef87da4](https://github.com/n8n-io/n8n/commit/ef87da4c193a08e089e48044906a4f5ce9959a22))
+* Add support for client credentials with Azure Log monitor ([#13038](https://github.com/n8n-io/n8n/issues/13038)) ([2c2d631](https://github.com/n8n-io/n8n/commit/2c2d63157b7866f1a68cc45c5823e29570ccff77))
+* Allow multi API creation via the UI ([#12845](https://github.com/n8n-io/n8n/issues/12845)) ([ad3250c](https://github.com/n8n-io/n8n/commit/ad3250ceb0df84379917e684d54d4100e3bf44f5))
+* Allow setting API keys expiration ([#12954](https://github.com/n8n-io/n8n/issues/12954)) ([9bcbc2c](https://github.com/n8n-io/n8n/commit/9bcbc2c2ccbb88537e9b7554c92b631118d870f1))
+* **core:** Add sorting to GET `/workflows` endpoint ([#13029](https://github.com/n8n-io/n8n/issues/13029)) ([b60011a](https://github.com/n8n-io/n8n/commit/b60011a1808d47f32ab84e685dba0e915e82df8f))
+* **core:** Enable usage as a tool for more nodes ([#12930](https://github.com/n8n-io/n8n/issues/12930)) ([9deb759](https://github.com/n8n-io/n8n/commit/9deb75916e4eb63b899ba79b40cbd24b69a752db))
+* **core:** Handle Declarative nodes more like regular nodes ([#13007](https://github.com/n8n-io/n8n/issues/13007)) ([a65a9e6](https://github.com/n8n-io/n8n/commit/a65a9e631b13bbe70ad64727fb1109ae7cd014eb))
+* **Discord Node:** New sendAndWait operation ([#12894](https://github.com/n8n-io/n8n/issues/12894)) ([d47bfdd](https://github.com/n8n-io/n8n/commit/d47bfddd656367454b51da39cf87dbfb2bd59eb2))
+* **editor:** Display schema preview for unexecuted nodes ([#12901](https://github.com/n8n-io/n8n/issues/12901)) ([0063bbb](https://github.com/n8n-io/n8n/commit/0063bbb30b45b3af92aff4c0f76b905d50a71a2d))
+* **editor:** Easy $fromAI Button for AI Tools ([#12587](https://github.com/n8n-io/n8n/issues/12587)) ([2177376](https://github.com/n8n-io/n8n/commit/21773764d37c37a6464a3885d3fa548a5feb4fd8))
+* **editor:** Show fixed collection parameter issues in UI ([#12899](https://github.com/n8n-io/n8n/issues/12899)) ([12d686c](https://github.com/n8n-io/n8n/commit/12d686ce52694f4c0b88f92a744451c1b0c66dec))
+* **Facebook Graph API Node:** Update node to support API v22.0 ([#13024](https://github.com/n8n-io/n8n/issues/13024)) ([0bc0fc6](https://github.com/n8n-io/n8n/commit/0bc0fc6c1226688c29bf5f8f0ba7e8f244e16fbc))
+* **HTTP Request Tool Node:** Relax binary data detection ([#13048](https://github.com/n8n-io/n8n/issues/13048)) ([b67a003](https://github.com/n8n-io/n8n/commit/b67a003e0b154d4e8c04392bec1c7b28171b5908))
+* Human in the loop section ([#12883](https://github.com/n8n-io/n8n/issues/12883)) ([9590e5d](https://github.com/n8n-io/n8n/commit/9590e5d58b8964de9ce901bf07b537926d18b6b7))
+* **n8n Form Node:** Add Hidden Fields ([#12803](https://github.com/n8n-io/n8n/issues/12803)) ([0da1114](https://github.com/n8n-io/n8n/commit/0da1114981978e371b216bdabc0c3bbdceeefa09))
+* **n8n Form Node:** Respond with Text ([#12979](https://github.com/n8n-io/n8n/issues/12979)) ([182fc15](https://github.com/n8n-io/n8n/commit/182fc150bec62e9a5e2801d6c403e4a6bd35f728))
+* **OpenAI Chat Model Node, OpenAI Node:** Include o3 models in model selection ([#13005](https://github.com/n8n-io/n8n/issues/13005)) ([37d152c](https://github.com/n8n-io/n8n/commit/37d152c148cafbe493c22e07f5d55ff24fcb0ca4))
+* **Summarize Node:** Preserves original field data type ([#13069](https://github.com/n8n-io/n8n/issues/13069)) ([be5e49d](https://github.com/n8n-io/n8n/commit/be5e49d56c09d65c9768e948471626cfd3606c0c))
+
+
+
+# [1.77.0](https://github.com/n8n-io/n8n/compare/n8n@1.76.0...n8n@1.77.0) (2025-01-29)
+
+
+### Bug Fixes
+
+* **core:** Account for pre-execution failure in scaling mode ([#12815](https://github.com/n8n-io/n8n/issues/12815)) ([b4d27c4](https://github.com/n8n-io/n8n/commit/b4d27c49e32bfacbd2690bf1c07194562f6a4a61))
+* **core:** Display the last activated plan name when multiple are activated ([#12835](https://github.com/n8n-io/n8n/issues/12835)) ([03365f0](https://github.com/n8n-io/n8n/commit/03365f096d3d5c8e3a6537f37cda412959705346))
+* **core:** Fix possible corruption of OAuth2 credential ([#12880](https://github.com/n8n-io/n8n/issues/12880)) ([ac84ea1](https://github.com/n8n-io/n8n/commit/ac84ea14452cbcec95f14073e8e70427169e6a7f))
+* **core:** Fix usage of external libs in task runner ([#12788](https://github.com/n8n-io/n8n/issues/12788)) ([3d9d5bf](https://github.com/n8n-io/n8n/commit/3d9d5bf9d58f3c49830d42a140d6c8c6b59952dc))
+* **core:** Handle max stalled count error better ([#12824](https://github.com/n8n-io/n8n/issues/12824)) ([eabf160](https://github.com/n8n-io/n8n/commit/eabf1609577cd94a6bad5020c34378d840a13bc0))
+* **core:** Improve error handling in credential decryption and parsing ([#12868](https://github.com/n8n-io/n8n/issues/12868)) ([0c86bf2](https://github.com/n8n-io/n8n/commit/0c86bf2b3761bb93fd3cedba7a483ae5d97bd332))
+* **core:** Renew license on startup for instances with detached floating entitlements ([#12884](https://github.com/n8n-io/n8n/issues/12884)) ([f32eef8](https://github.com/n8n-io/n8n/commit/f32eef85bd066ee9b54d110355c6b80124d67437))
+* **core:** Update execution entity and execution data in transaction ([#12756](https://github.com/n8n-io/n8n/issues/12756)) ([1f43181](https://github.com/n8n-io/n8n/commit/1f4318136011bffaad04527790a9eba79effce35))
+* **core:** Validate credential data before encryption ([#12885](https://github.com/n8n-io/n8n/issues/12885)) ([3d27a14](https://github.com/n8n-io/n8n/commit/3d27a1498702206b738cf978d037191306cec42b))
+* **editor:** Add notice when user hits the limit for execution metadata item length ([#12676](https://github.com/n8n-io/n8n/issues/12676)) ([02df25c](https://github.com/n8n-io/n8n/commit/02df25c450a0a384a32d0815d8a2faec7562a8ae))
+* **editor:** Don't send run data for full manual executions ([#12687](https://github.com/n8n-io/n8n/issues/12687)) ([9139dc3](https://github.com/n8n-io/n8n/commit/9139dc3c2916186648fb5bf63d14fcb90773eb1c))
+* **editor:** Fix sub-execution links in empty output tables ([#12781](https://github.com/n8n-io/n8n/issues/12781)) ([114ed88](https://github.com/n8n-io/n8n/commit/114ed88368d137443b9c6605d4fe11b02053549d))
+* **editor:** Fix workflow move project select filtering ([#12764](https://github.com/n8n-io/n8n/issues/12764)) ([358d284](https://github.com/n8n-io/n8n/commit/358d2843e5e468071d6764419169811e93138c35))
+* **editor:** Focus executions iframe when n8n is ready to delegate keyboard events ([#12741](https://github.com/n8n-io/n8n/issues/12741)) ([d506218](https://github.com/n8n-io/n8n/commit/d5062189dbca02dfdf485fc220cc2a7b05e3e6cc))
+* **editor:** Handle large payloads in the AI Assistant requests better ([#12747](https://github.com/n8n-io/n8n/issues/12747)) ([eb4dea1](https://github.com/n8n-io/n8n/commit/eb4dea1ca891bb7ac07c8bbbae8803de080c4623))
+* **editor:** Hide Set up Template button for empty workflows ([#12808](https://github.com/n8n-io/n8n/issues/12808)) ([36e615b](https://github.com/n8n-io/n8n/commit/36e615b28f395623457bbb9bf4ab6fd69102b6ea))
+* **editor:** Load appropriate credentials in canvas V2 for new workflow ([#12722](https://github.com/n8n-io/n8n/issues/12722)) ([2020dc5](https://github.com/n8n-io/n8n/commit/2020dc502feae6cae827dfbcc40ffed89bcc334a))
+* **editor:** Properly set active project in new canvas ([#12810](https://github.com/n8n-io/n8n/issues/12810)) ([648c6f9](https://github.com/n8n-io/n8n/commit/648c6f9315b16b885e04716e7e0035a73b358fb0))
+* **editor:** Render inline SVGs correctly on the external secrets settings page ([#12802](https://github.com/n8n-io/n8n/issues/12802)) ([5820ade](https://github.com/n8n-io/n8n/commit/5820ade1e4b9d638c9b6369aef369d6dc9320da6))
+* **editor:** Show input selector when node has error ([#12813](https://github.com/n8n-io/n8n/issues/12813)) ([5b760e7](https://github.com/n8n-io/n8n/commit/5b760e7f7fc612b10307b4871e24b549f5d9d420))
+* **editor:** Show mappings by default in sub-node NDVs when the root node isn't executed ([#12642](https://github.com/n8n-io/n8n/issues/12642)) ([fb662dd](https://github.com/n8n-io/n8n/commit/fb662dd95cae3bc51d05d05e32e772d05adafa1e))
+* **Postgres PGVector Store Node:** Release postgres connections back to the pool ([#12723](https://github.com/n8n-io/n8n/issues/12723)) ([663dfb4](https://github.com/n8n-io/n8n/commit/663dfb48defd944f88f0ecc4f3347ea4f8a7c831))
+
+
+### Features
+
+* Add DeepSeek Chat Model node ([#12873](https://github.com/n8n-io/n8n/issues/12873)) ([9918afa](https://github.com/n8n-io/n8n/commit/9918afa51b16116abb73692a66df84e48128f406))
+* Add OpenRouter node ([#12882](https://github.com/n8n-io/n8n/issues/12882)) ([dc85b02](https://github.com/n8n-io/n8n/commit/dc85b022d111d1e8b038ca1a9f6a1041f19cf2b0))
+* Add timeout options to sendAndWait operations ([#12753](https://github.com/n8n-io/n8n/issues/12753)) ([3e9f24d](https://github.com/n8n-io/n8n/commit/3e9f24ddf462349145d89fe183313c95512c699b))
+* **API:** Add route for schema static files ([#12770](https://github.com/n8n-io/n8n/issues/12770)) ([d981b56](https://github.com/n8n-io/n8n/commit/d981b5659a26f92b11e5d0cd5570504fd683626c))
+* **core:** Explicitly report external hook failures ([#12830](https://github.com/n8n-io/n8n/issues/12830)) ([a24e442](https://github.com/n8n-io/n8n/commit/a24e4420bb9023f808acd756d125dffaea325968))
+* **core:** Rename two task runner env vars ([#12763](https://github.com/n8n-io/n8n/issues/12763)) ([60187ca](https://github.com/n8n-io/n8n/commit/60187cab9bc9d21aa6ba710d772c068324e429f1))
+* **editor:** Add evaluation workflow and enhance workflow selector with pinned data support ([#12773](https://github.com/n8n-io/n8n/issues/12773)) ([be967eb](https://github.com/n8n-io/n8n/commit/be967ebec07fab223513f93f50bcc389b9a4c548))
+* **editor:** Always keep at least one executing node indicator in the workflow ([#12829](https://github.com/n8n-io/n8n/issues/12829)) ([c25c613](https://github.com/n8n-io/n8n/commit/c25c613a04a6773fa4014d9a0d290e443bcabbe0))
+* **Google Chat Node:** Updates ([#12827](https://github.com/n8n-io/n8n/issues/12827)) ([e146ad0](https://github.com/n8n-io/n8n/commit/e146ad021a0be22cf51bafa3c015d03550e03d97))
+* **Microsoft Outlook Node:** New operation sendAndWait ([#12795](https://github.com/n8n-io/n8n/issues/12795)) ([f4bf55f](https://github.com/n8n-io/n8n/commit/f4bf55f0d8278ff954344cf6397c10d8261b39a4))
+* **n8n Form Node:** Add read-only/custom HTML form elements ([#12760](https://github.com/n8n-io/n8n/issues/12760)) ([ba8aa39](https://github.com/n8n-io/n8n/commit/ba8aa3921613c590caaac627fbb9837ccaf87783))
+* **Send Email Node:** New operation sendAndWait ([#12775](https://github.com/n8n-io/n8n/issues/12775)) ([a197fbb](https://github.com/n8n-io/n8n/commit/a197fbb21b5642843d8bc3e657049aca99e0729d))
+* **Summarize Node:** Turns error when field not found in items into warning ([#11889](https://github.com/n8n-io/n8n/issues/11889)) ([d7dda3f](https://github.com/n8n-io/n8n/commit/d7dda3f5de52925e554455f9f10e51bd173ea856))
+* **Telegram Node:** New operation sendAndWait ([#12771](https://github.com/n8n-io/n8n/issues/12771)) ([2c58d47](https://github.com/n8n-io/n8n/commit/2c58d47f8eee1f865ecc1eeb89aa20c69c28abae))
+
+
+
+# [1.76.0](https://github.com/n8n-io/n8n/compare/n8n@1.75.0...n8n@1.76.0) (2025-01-22)
+
+
+### Bug Fixes
+
+* **core:** Align saving behavior in `workflowExecuteAfter` hooks ([#12731](https://github.com/n8n-io/n8n/issues/12731)) ([9d76210](https://github.com/n8n-io/n8n/commit/9d76210a570e025d01d1f6596667abf40fbd8d12))
+* **core:** AugmentObject should handle the constructor property correctly ([#12744](https://github.com/n8n-io/n8n/issues/12744)) ([36bc164](https://github.com/n8n-io/n8n/commit/36bc164da486f2e2d05091b457b8eea6521ca22e))
+* **core:** Fix keyboard shortcuts for non-ansi layouts ([#12672](https://github.com/n8n-io/n8n/issues/12672)) ([4c8193f](https://github.com/n8n-io/n8n/commit/4c8193fedc2e3967c9a06c0652483128df509653))
+* **core:** Fix license CLI commands showing incorrect renewal setting ([#12759](https://github.com/n8n-io/n8n/issues/12759)) ([024ada8](https://github.com/n8n-io/n8n/commit/024ada822c1bc40958e594bb08707cf77d3397ec))
+* **core:** Fix license initialization failure on startup ([#12737](https://github.com/n8n-io/n8n/issues/12737)) ([ac2f647](https://github.com/n8n-io/n8n/commit/ac2f6476c114f51fafb9b7b66e41e0c87f4a1bf6))
+* **core:** Recover successful data-less executions ([#12720](https://github.com/n8n-io/n8n/issues/12720)) ([a39b8bd](https://github.com/n8n-io/n8n/commit/a39b8bd32be50c8323e415f820b25b4bcb81d960))
+* **core:** Remove run data of utility nodes for partial executions v2 ([#12673](https://github.com/n8n-io/n8n/issues/12673)) ([b66a9dc](https://github.com/n8n-io/n8n/commit/b66a9dc8fb6f7b19122cacbb7e2f86b4c921c3fb))
+* **core:** Sync `hookFunctionsSave` and `hookFunctionsSaveWorker` ([#12740](https://github.com/n8n-io/n8n/issues/12740)) ([d410b8f](https://github.com/n8n-io/n8n/commit/d410b8f5a7e99658e1e8dcb2e02901bd01ce9c59))
+* **core:** Update isDocker check to return true on kubernetes/containerd ([#12603](https://github.com/n8n-io/n8n/issues/12603)) ([c55dac6](https://github.com/n8n-io/n8n/commit/c55dac66ed97a2317d4c696c3b505790ec5d72fe))
+* **editor:** Add unicode code points to expression language for emoji ([#12633](https://github.com/n8n-io/n8n/issues/12633)) ([819ebd0](https://github.com/n8n-io/n8n/commit/819ebd058d1d60b3663d92b4a652728da7134a3b))
+* **editor:** Correct missing whitespace in JSON output ([#12677](https://github.com/n8n-io/n8n/issues/12677)) ([b098b19](https://github.com/n8n-io/n8n/commit/b098b19c7f0e3a9848c3fcfa012999050f2d3c7a))
+* **editor:** Defer crypto.randomUUID call in CodeNodeEditor ([#12630](https://github.com/n8n-io/n8n/issues/12630)) ([58f6532](https://github.com/n8n-io/n8n/commit/58f6532630bacd288d3c0a79b40150f465898419))
+* **editor:** Fix Code node bug erasing and overwriting code when switching between nodes ([#12637](https://github.com/n8n-io/n8n/issues/12637)) ([02d953d](https://github.com/n8n-io/n8n/commit/02d953db34ec4e44977a8ca908628b62cca82fde))
+* **editor:** Fix execution list hover & selection colour in dark mode ([#12628](https://github.com/n8n-io/n8n/issues/12628)) ([95c40c0](https://github.com/n8n-io/n8n/commit/95c40c02cb8fef77cf633cf5aec08e98746cff36))
+* **editor:** Fix JsonEditor with expressions ([#12739](https://github.com/n8n-io/n8n/issues/12739)) ([56c93ca](https://github.com/n8n-io/n8n/commit/56c93caae026738c1c0bebb4187b238e34a330f6))
+* **editor:** Fix navbar height flickering during load ([#12738](https://github.com/n8n-io/n8n/issues/12738)) ([a96b3f0](https://github.com/n8n-io/n8n/commit/a96b3f0091798a52bb33107b919b5d8287ba7506))
+* **editor:** Open chat when executing agent node in canvas v2  ([#12617](https://github.com/n8n-io/n8n/issues/12617)) ([457edd9](https://github.com/n8n-io/n8n/commit/457edd99bb853d8ccf3014605d5823933f3c0bc6))
+* **editor:** Partial execution of a workflow with manual chat trigger ([#12662](https://github.com/n8n-io/n8n/issues/12662)) ([2f81b29](https://github.com/n8n-io/n8n/commit/2f81b29d341535b512df0aa01b25a91d109f113f))
+* **editor:** Show connector label above the line when it's straight ([#12622](https://github.com/n8n-io/n8n/issues/12622)) ([c97bd48](https://github.com/n8n-io/n8n/commit/c97bd48a77643b9c2a5d7218e21b957af15cee0b))
+* **editor:** Show run workflow button when chat trigger has pinned data ([#12616](https://github.com/n8n-io/n8n/issues/12616)) ([da8aafc](https://github.com/n8n-io/n8n/commit/da8aafc0e3a1b5d862f0723d0d53d2c38bcaebc3))
+* **editor:** Update workflow re-initialization to use query parameter ([#12650](https://github.com/n8n-io/n8n/issues/12650)) ([982131a](https://github.com/n8n-io/n8n/commit/982131a75a32f741c120156826c303989aac189c))
+* **Execute Workflow Node:** Pass binary data to sub-workflow ([#12635](https://github.com/n8n-io/n8n/issues/12635)) ([e9c152e](https://github.com/n8n-io/n8n/commit/e9c152e369a4c2762bd8e6ad17eaa704bb3771bb))
+* **Google Gemini Chat Model Node:** Add base URL support for Google Gemini Chat API ([#12643](https://github.com/n8n-io/n8n/issues/12643)) ([14f4bc7](https://github.com/n8n-io/n8n/commit/14f4bc769027789513808b4000444edf99dc5d1c))
+* **GraphQL Node:** Change default request format to json instead of graphql ([#11346](https://github.com/n8n-io/n8n/issues/11346)) ([c7c122f](https://github.com/n8n-io/n8n/commit/c7c122f9173df824cc1b5ab864333bffd0d31f82))
+* **Jira Software Node:** Get custom fields(RLC) in update operation for server deployment type ([#12719](https://github.com/n8n-io/n8n/issues/12719)) ([353df79](https://github.com/n8n-io/n8n/commit/353df7941117e20547cd4f3fc514979a54619720))
+* **n8n Form Node:** Remove the ability to change the formatting of dates ([#12666](https://github.com/n8n-io/n8n/issues/12666)) ([14904ff](https://github.com/n8n-io/n8n/commit/14904ff77951fef23eb789a43947492a4cd3fa20))
+* **OpenAI Chat Model Node:** Fix loading of custom models when using custom credential URL ([#12634](https://github.com/n8n-io/n8n/issues/12634)) ([7cc553e](https://github.com/n8n-io/n8n/commit/7cc553e3b277a16682bfca1ea08cb98178e38580))
+* **OpenAI Chat Model Node:** Restore default model value ([#12745](https://github.com/n8n-io/n8n/issues/12745)) ([d1b6692](https://github.com/n8n-io/n8n/commit/d1b6692736182fa2eab768ba3ad0adb8504ebbbd))
+* **Postgres Chat Memory Node:** Do not terminate the connection pool ([#12674](https://github.com/n8n-io/n8n/issues/12674)) ([e7f00bc](https://github.com/n8n-io/n8n/commit/e7f00bcb7f2dce66ca07a9322d50f96356c1a43d))
+* **Postgres Node:** Allow using composite key in upsert queries ([#12639](https://github.com/n8n-io/n8n/issues/12639)) ([83ce3a9](https://github.com/n8n-io/n8n/commit/83ce3a90963ba76601234f4314363a8ccc310f0f))
+* **Wait Node:** Fix for hasNextPage in waiting forms ([#12636](https://github.com/n8n-io/n8n/issues/12636)) ([652b8d1](https://github.com/n8n-io/n8n/commit/652b8d170b9624d47b5f2d8d679c165cc14ea548))
+
+
+### Features
+
+* Add credential only node for Microsoft Azure Monitor ([#12645](https://github.com/n8n-io/n8n/issues/12645)) ([6ef8882](https://github.com/n8n-io/n8n/commit/6ef8882a108c672ab097c9dd1c590d4e9e7f3bcc))
+* Add Miro credential only node ([#12746](https://github.com/n8n-io/n8n/issues/12746)) ([5b29086](https://github.com/n8n-io/n8n/commit/5b29086e2f9b7f638fac4440711f673438e57492))
+* Add SSM endpoint to AWS credentials ([#12212](https://github.com/n8n-io/n8n/issues/12212)) ([565c7b8](https://github.com/n8n-io/n8n/commit/565c7b8b9cfd3e10f6a2c60add96fea4c4d95d33))
+* **core:** Enable task runner by default ([#12726](https://github.com/n8n-io/n8n/issues/12726)) ([9e2a01a](https://github.com/n8n-io/n8n/commit/9e2a01aeaf36766a1cf7a1d9a4d6e02f45739bd3))
+* **editor:** Force final canvas v2 migration and remove switcher from UI ([#12717](https://github.com/n8n-io/n8n/issues/12717)) ([29335b9](https://github.com/n8n-io/n8n/commit/29335b9b6acf97c817bea70688e8a2786fbd8889))
+* **editor:** VariablesView Reskin - Add Filters for missing values ([#12611](https://github.com/n8n-io/n8n/issues/12611)) ([1eeb788](https://github.com/n8n-io/n8n/commit/1eeb788d327287d21eab7ad6f2156453ab7642c7))
+* **Jira Software Node:** Personal Access Token credential type ([#11038](https://github.com/n8n-io/n8n/issues/11038)) ([1c7a38f](https://github.com/n8n-io/n8n/commit/1c7a38f6bab108daa47401cd98c185590bf299a8))
+* **n8n Form Trigger Node:** Form Improvements ([#12590](https://github.com/n8n-io/n8n/issues/12590)) ([f167578](https://github.com/n8n-io/n8n/commit/f167578b3251e553a4d000e731e1bb60348916ad))
+* Synchronize deletions when pulling from source control ([#12170](https://github.com/n8n-io/n8n/issues/12170)) ([967ee4b](https://github.com/n8n-io/n8n/commit/967ee4b89b94b92fc3955c56bf4c9cca0bd64eac))
+
+
+
+# [1.75.0](https://github.com/n8n-io/n8n/compare/n8n@1.74.0...n8n@1.75.0) (2025-01-15)
+
+
+### Bug Fixes
+
+* **core:** AugmentObject should check for own propeties correctly ([#12534](https://github.com/n8n-io/n8n/issues/12534)) ([0cdf393](https://github.com/n8n-io/n8n/commit/0cdf39374305e6bbcedb047db7d3756168e6e89e))
+* **core:** Disallow code generation in task runner ([#12522](https://github.com/n8n-io/n8n/issues/12522)) ([35b6180](https://github.com/n8n-io/n8n/commit/35b618098b7d23e272bf77b55c172dbe531c821f))
+* **core:** Fix node exclusion on the frontend types ([#12544](https://github.com/n8n-io/n8n/issues/12544)) ([b2cbed9](https://github.com/n8n-io/n8n/commit/b2cbed9865888f6f3bc528984d4091d86a88f0d6))
+* **core:** Fix orchestration flow with expired license ([#12444](https://github.com/n8n-io/n8n/issues/12444)) ([ecff3b7](https://github.com/n8n-io/n8n/commit/ecff3b732a028d7225bfbed4ffc65dc20c4ed608))
+* **core:** Fix Sentry error reporting on task runners ([#12495](https://github.com/n8n-io/n8n/issues/12495)) ([88c0838](https://github.com/n8n-io/n8n/commit/88c0838dd72f11646bdb3586223d6c16631cccab))
+* **core:** Improve cyclic dependency check in the DI container ([#12600](https://github.com/n8n-io/n8n/issues/12600)) ([c3c4a20](https://github.com/n8n-io/n8n/commit/c3c4a200024fb08afb9380357d1490c6707c5ec3))
+* **core:** Only show personal credentials in the personal space ([#12433](https://github.com/n8n-io/n8n/issues/12433)) ([8a42d55](https://github.com/n8n-io/n8n/commit/8a42d55d91f4a37fff5669d52d52428b3a4ddd44))
+* **core:** Prefix package name in `supportedNodes` on generated types as well ([#12514](https://github.com/n8n-io/n8n/issues/12514)) ([4a1a999](https://github.com/n8n-io/n8n/commit/4a1a9993624c92dd81f5418f9268cb93878069ab))
+* **core:** Prevent prototype pollution in task runner ([#12588](https://github.com/n8n-io/n8n/issues/12588)) ([bdf266c](https://github.com/n8n-io/n8n/commit/bdf266cf55032d05641b20dce8804412dc93b6d5))
+* **core:** Prevent prototype pollution of internal classes in task runner ([#12610](https://github.com/n8n-io/n8n/issues/12610)) ([eceee7f](https://github.com/n8n-io/n8n/commit/eceee7f3f8899d200b1c5720087cc494eec22e6a))
+* **core:** Use timing safe function to compare runner auth tokens ([#12485](https://github.com/n8n-io/n8n/issues/12485)) ([8fab98f](https://github.com/n8n-io/n8n/commit/8fab98f3f1f767d05825d24cbf155d56375fdb3e))
+* **core:** Validate values which are intentionally 0 ([#12382](https://github.com/n8n-io/n8n/issues/12382)) ([562506e](https://github.com/n8n-io/n8n/commit/562506e92aeb26423145801bff80037e5ce2ac46))
+* Don't break oauth credentials when updating them and allow fixing broken oauth credentials by repeating the authorization flow ([#12563](https://github.com/n8n-io/n8n/issues/12563)) ([73897c7](https://github.com/n8n-io/n8n/commit/73897c7662a432834eb6f9d0f9ace8d986c1acb5))
+* **editor:** Don't show toolsUnused notice if run had errors ([#12529](https://github.com/n8n-io/n8n/issues/12529)) ([3ec5b28](https://github.com/n8n-io/n8n/commit/3ec5b2850c47057032e61c2acdbdfc1dcdd931f7))
+* **editor:** Ensure proper "AI Template" URL construction in node creator ([#12566](https://github.com/n8n-io/n8n/issues/12566)) ([13bf69f](https://github.com/n8n-io/n8n/commit/13bf69f75c67bc37a37013e776525768676a4b88))
+* **editor:** Fix NDV resize handle and scrollbar overlapping ([#12509](https://github.com/n8n-io/n8n/issues/12509)) ([c28f302](https://github.com/n8n-io/n8n/commit/c28f302c2f863bd7aa73ad52e5d040f927e33220))
+* **editor:** Fix parameter input validation ([#12532](https://github.com/n8n-io/n8n/issues/12532)) ([6711cbc](https://github.com/n8n-io/n8n/commit/6711cbcc641a2fc70f5c15a7e2dcc640a3f98b66))
+* **editor:** Fix selection rectangle context menu on new canvas ([#12584](https://github.com/n8n-io/n8n/issues/12584)) ([c8e3c53](https://github.com/n8n-io/n8n/commit/c8e3c5399efde93486c1dd5c373cb2c5ff8a0691))
+* **editor:** Fix the `openselectivenodecreator` custom action on new canvas ([#12580](https://github.com/n8n-io/n8n/issues/12580)) ([2110e9a](https://github.com/n8n-io/n8n/commit/2110e9a0513b8c36beb85302e0d38a2658ea5d6e))
+* **editor:** Fix workflow initilisation for test definition routes & add unit tests ([#12507](https://github.com/n8n-io/n8n/issues/12507)) ([2775f61](https://github.com/n8n-io/n8n/commit/2775f617ae5c267c0a1ce7a54d05d4077cdbc0f7))
+* **editor:** Make clicking item in RLC work the first time on small screens ([#12585](https://github.com/n8n-io/n8n/issues/12585)) ([479933f](https://github.com/n8n-io/n8n/commit/479933fbd5c88e783827960e018abb979de8a039))
+* **editor:** Make sure code editors work correctly in fullscreen ([#12597](https://github.com/n8n-io/n8n/issues/12597)) ([aa1f3a7](https://github.com/n8n-io/n8n/commit/aa1f3a7d989883d55df3777775b8d7d336f6e3b7))
+* **editor:** Override selected nodes on single click without Meta/Ctrl key ([#12549](https://github.com/n8n-io/n8n/issues/12549)) ([02c2d5e](https://github.com/n8n-io/n8n/commit/02c2d5e71d15b9292fddd585f47bd8334da468c5))
+* **editor:** Show NDV errors when opening existing nodes with errors ([#12567](https://github.com/n8n-io/n8n/issues/12567)) ([bee7267](https://github.com/n8n-io/n8n/commit/bee7267fe38ab12a79fa4ec0e775f45d98d48aa5))
+* **editor:** Swap Activate/Deactivate texts in FloatingToolbar ([#12526](https://github.com/n8n-io/n8n/issues/12526)) ([44679b4](https://github.com/n8n-io/n8n/commit/44679b42aa1e14bc7069bee47d0a91ca84b1dba4))
+* **editor:** Update filter and feedback for source control ([#12504](https://github.com/n8n-io/n8n/issues/12504)) ([865fc21](https://github.com/n8n-io/n8n/commit/865fc21276727e8d88ccee0355147904b81c4421))
+* **editor:** Update selected node when navigating via flowing nodes ([#12581](https://github.com/n8n-io/n8n/issues/12581)) ([88659d8](https://github.com/n8n-io/n8n/commit/88659d8a2901786c894902e19466f395bcdaab8e))
+* **Google Calendar Node:** Updates and fixes ([#10715](https://github.com/n8n-io/n8n/issues/10715)) ([7227a29](https://github.com/n8n-io/n8n/commit/7227a29845fd178ced4d281597c62e7a03245456))
+* **Spotify Node:** Fix issue with null values breaking the response ([#12080](https://github.com/n8n-io/n8n/issues/12080)) ([a56a462](https://github.com/n8n-io/n8n/commit/a56a46259d257003c813103578260d625b3f17dd))
+
+
+### Features
+
+* **editor:** Make node credential select searchable ([#12497](https://github.com/n8n-io/n8n/issues/12497)) ([91277c4](https://github.com/n8n-io/n8n/commit/91277c44f1cf3f334b3b50d47d7dcc79b11c7c63))
+* **editor:** Persist sidebar collapsed status preference ([#12505](https://github.com/n8n-io/n8n/issues/12505)) ([dba7d46](https://github.com/n8n-io/n8n/commit/dba7d46f3ec91d26a597a50dede7b6ca292c728f))
 
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9ed101af7d..5e495fda9c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -85,7 +85,7 @@ This automatically sets up file-links between modules which depend on each other
 
 We recommend enabling [Node.js corepack](https://nodejs.org/docs/latest-v16.x/api/corepack.html) with `corepack enable`.
 
-With Node.js v16.17 or newer, you can install the latest version of pnpm: `corepack prepare pnpm@latest --activate`. If you use an older version install at least version 7.18 of pnpm via: `corepack prepare pnpm@7.18.0 --activate`.
+With Node.js v16.17 or newer, you can install the latest version of pnpm: `corepack prepare pnpm@latest --activate`. If you use an older version install at least version 9.15 of pnpm via: `corepack prepare pnpm@9.15.5 --activate`.
 
 **IMPORTANT**: If you have installed Node.js via homebrew, you'll need to run `brew install corepack`, since homebrew explicitly removes `npm` and `corepack` from [the `node` formula](https://github.com/Homebrew/homebrew-core/blob/master/Formula/node.rb#L66).
 
diff --git a/codecov.yml b/codecov.yml
index 362ebcb760..dfcd2b0d9c 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -46,6 +46,7 @@ component_management:
         - packages/@n8n/codemirror-lang/**
         - packages/design-system/**
         - packages/editor-ui/**
+        - packages/frontend/**
     - component_id: nodes_packages
       name: Nodes
       paths:
diff --git a/cypress/composables/modals/credential-modal.ts b/cypress/composables/modals/credential-modal.ts
index 53ba0c3a28..4e6533300a 100644
--- a/cypress/composables/modals/credential-modal.ts
+++ b/cypress/composables/modals/credential-modal.ts
@@ -2,6 +2,8 @@
  * Getters
  */
 
+import { clearNotifications } from '../../pages/notifications';
+
 export function getCredentialConnectionParameterInputs() {
 	return cy.getByTestId('credential-connection-parameter');
 }
@@ -55,5 +57,6 @@ export function setCredentialValues(values: Record<string, string>, save = true)
 	if (save) {
 		saveCredential();
 		closeCredentialModal();
+		clearNotifications();
 	}
 }
diff --git a/cypress/composables/ndv.ts b/cypress/composables/ndv.ts
index 90146ab374..c70e0b20e8 100644
--- a/cypress/composables/ndv.ts
+++ b/cypress/composables/ndv.ts
@@ -2,7 +2,11 @@
  * Getters
  */
 
-import { getVisibleSelect } from '../utils/popper';
+import { getVisiblePopper, getVisibleSelect } from '../utils/popper';
+
+export function getNdvContainer() {
+	return cy.getByTestId('ndv');
+}
 
 export function getCredentialSelect(eq = 0) {
 	return cy.getByTestId('node-credentials-select').eq(eq);
@@ -36,6 +40,18 @@ export function getOutputPanel() {
 	return cy.getByTestId('output-panel');
 }
 
+export function getFixedCollection(collectionName: string) {
+	return cy.getByTestId(`fixed-collection-${collectionName}`);
+}
+
+export function getResourceLocator(paramName: string) {
+	return cy.getByTestId(`resource-locator-${paramName}`);
+}
+
+export function getResourceLocatorInput(paramName: string) {
+	return getResourceLocator(paramName).find('[data-test-id="rlc-input-container"]');
+}
+
 export function getOutputPanelDataContainer() {
 	return getOutputPanel().getByTestId('ndv-data-container');
 }
@@ -84,6 +100,30 @@ export function getOutputPanelRelatedExecutionLink() {
 	return getOutputPanel().getByTestId('related-execution-link');
 }
 
+export function getNodeOutputHint() {
+	return cy.getByTestId('ndv-output-run-node-hint');
+}
+
+export function getWorkflowCards() {
+	return cy.getByTestId('resources-list-item');
+}
+
+export function getWorkflowCard(workflowName: string) {
+	return getWorkflowCards().contains(workflowName).parents('[data-test-id="resources-list-item"]');
+}
+
+export function getWorkflowCardContent(workflowName: string) {
+	return getWorkflowCard(workflowName).findChildByTestId('card-content');
+}
+
+export function getNodeRunInfoStale() {
+	return cy.getByTestId('node-run-info-stale');
+}
+
+export function getNodeOutputErrorMessage() {
+	return getOutputPanel().findChildByTestId('node-error-message');
+}
+
 /**
  * Actions
  */
@@ -110,12 +150,20 @@ export function clickExecuteNode() {
 	getExecuteNodeButton().click();
 }
 
+export function clickResourceLocatorInput(paramName: string) {
+	getResourceLocatorInput(paramName).click();
+}
+
 export function setParameterInputByName(name: string, value: string) {
 	getParameterInputByName(name).clear().type(value);
 }
 
-export function toggleParameterCheckboxInputByName(name: string) {
-	getParameterInputByName(name).find('input[type="checkbox"]').realClick();
+export function checkParameterCheckboxInputByName(name: string) {
+	getParameterInputByName(name).find('input[type="checkbox"]').check({ force: true });
+}
+
+export function uncheckParameterCheckboxInputByName(name: string) {
+	getParameterInputByName(name).find('input[type="checkbox"]').uncheck({ force: true });
 }
 
 export function setParameterSelectByContent(name: string, content: string) {
@@ -127,3 +175,86 @@ export function changeOutputRunSelector(runName: string) {
 	getOutputRunSelector().click();
 	getVisibleSelect().find('.el-select-dropdown__item').contains(runName).click();
 }
+
+export function addItemToFixedCollection(collectionName: string) {
+	getFixedCollection(collectionName).getByTestId('fixed-collection-add').click();
+}
+
+export function typeIntoFixedCollectionItem(collectionName: string, index: number, value: string) {
+	getFixedCollection(collectionName).within(() =>
+		cy.getByTestId('parameter-input').eq(index).type(value),
+	);
+}
+
+export function selectResourceLocatorItem(
+	resourceLocator: string,
+	index: number,
+	expectedText: string,
+) {
+	clickResourceLocatorInput(resourceLocator);
+
+	getVisiblePopper().findChildByTestId('rlc-item').eq(0).should('exist');
+	getVisiblePopper()
+		.findChildByTestId('rlc-item')
+		.eq(index)
+		.find('span')
+		.should('contain.text', expectedText)
+		.click();
+}
+
+export function clickWorkflowCardContent(workflowName: string) {
+	getWorkflowCardContent(workflowName).click();
+}
+
+export function assertNodeOutputHintExists() {
+	getNodeOutputHint().should('exist');
+}
+
+export function assertNodeOutputErrorMessageExists() {
+	return getNodeOutputErrorMessage().should('exist');
+}
+
+// Note that this only validates the expectedContent is *included* in the output table
+export function assertOutputTableContent(expectedContent: unknown[][]) {
+	for (const [i, row] of expectedContent.entries()) {
+		for (const [j, value] of row.entries()) {
+			// + 1 to skip header
+			getOutputTbodyCell(1 + i, j).should('have.text', value);
+		}
+	}
+}
+
+export function populateMapperFields(fields: ReadonlyArray<[string, string]>) {
+	for (const [name, value] of fields) {
+		getParameterInputByName(name).type(value);
+
+		// Click on a parent to dismiss the pop up which hides the field below.
+		getParameterInputByName(name).parent().parent().parent().parent().click('topLeft');
+	}
+}
+
+/**
+ * Populate multiValue fixedCollections. Only supports fixedCollections for which all fields can be defined via keyboard typing
+ *
+ * @param items - 2D array of items to populate, i.e. [["myField1", "String"], ["myField2", "Number"]]
+ * @param collectionName - name of the fixedCollection to populate
+ * @param offset - amount of 'parameter-input's before start, e.g. from a controlling dropdown that makes the fields appear
+ * @returns
+ */
+export function populateFixedCollection<T extends readonly string[]>(
+	items: readonly T[],
+	collectionName: string,
+	offset: number = 0,
+) {
+	if (items.length === 0) return;
+	const n = items[0].length;
+	for (const [i, params] of items.entries()) {
+		addItemToFixedCollection(collectionName);
+		for (const [j, param] of params.entries()) {
+			getFixedCollection(collectionName)
+				.getByTestId('parameter-input')
+				.eq(offset + i * n + j)
+				.type(`${param}{downArrow}{enter}`);
+		}
+	}
+}
diff --git a/cypress/composables/webhooks.ts b/cypress/composables/webhooks.ts
new file mode 100644
index 0000000000..8ad5dc6861
--- /dev/null
+++ b/cypress/composables/webhooks.ts
@@ -0,0 +1,81 @@
+import { BACKEND_BASE_URL } from '../constants';
+import { NDV, WorkflowPage } from '../pages';
+import { getVisibleSelect } from '../utils';
+
+export const waitForWebhook = 500;
+
+export interface SimpleWebhookCallOptions {
+	method: string;
+	webhookPath: string;
+	responseCode?: number;
+	respondWith?: string;
+	executeNow?: boolean;
+	responseData?: string;
+	authentication?: string;
+}
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+export const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
+	const {
+		authentication,
+		method,
+		webhookPath,
+		responseCode,
+		respondWith,
+		responseData,
+		executeNow = true,
+	} = options;
+
+	workflowPage.actions.addInitialNodeToCanvas('Webhook');
+	workflowPage.actions.openNode('Webhook');
+
+	cy.getByTestId('parameter-input-httpMethod').click();
+	getVisibleSelect().find('.option-headline').contains(method).click();
+	cy.getByTestId('parameter-input-path')
+		.find('.parameter-input')
+		.find('input')
+		.clear()
+		.type(webhookPath);
+
+	if (authentication) {
+		cy.getByTestId('parameter-input-authentication').click();
+		getVisibleSelect().find('.option-headline').contains(authentication).click();
+	}
+
+	if (responseCode) {
+		cy.get('.param-options').click();
+		getVisibleSelect().contains('Response Code').click();
+		cy.get('.parameter-item-wrapper > .parameter-input-list-wrapper').children().click();
+		getVisibleSelect().contains('201').click();
+	}
+
+	if (respondWith) {
+		cy.getByTestId('parameter-input-responseMode').click();
+		getVisibleSelect().find('.option-headline').contains(respondWith).click();
+	}
+
+	if (responseData) {
+		cy.getByTestId('parameter-input-responseData').click();
+		getVisibleSelect().find('.option-headline').contains(responseData).click();
+	}
+
+	const callEndpoint = (fn: (response: Cypress.Response<unknown>) => void) => {
+		cy.request(method, `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then(fn);
+	};
+
+	if (executeNow) {
+		ndv.actions.execute();
+		cy.wait(waitForWebhook);
+
+		callEndpoint((response) => {
+			expect(response.status).to.eq(200);
+			ndv.getters.outputPanel().contains('headers');
+		});
+	}
+
+	return {
+		callEndpoint,
+	};
+};
diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index e8e402dd5f..7d783c1d3c 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -1,12 +1,14 @@
 import { getManualChatModal } from './modals/chat-modal';
 import { clickGetBackToCanvas, getParameterInputByName } from './ndv';
 import { ROUTES } from '../constants';
+import type { OpenContextMenuOptions } from '../types';
 
 /**
  * Types
  */
 
 export type EndpointType =
+	| 'main'
 	| 'ai_chain'
 	| 'ai_document'
 	| 'ai_embedding'
@@ -23,9 +25,75 @@ export type EndpointType =
  * Getters
  */
 
-export function getAddInputEndpointByType(nodeName: string, endpointType: EndpointType) {
-	return cy.get(
-		`.add-input-endpoint[data-jtk-scope-${endpointType}][data-endpoint-name="${nodeName}"]`,
+export function getCanvas() {
+	return cy.getByTestId('canvas');
+}
+
+export function getCanvasPane() {
+	return cy.ifCanvasVersion(
+		() => cy.getByTestId('node-view-background'),
+		() => getCanvas().find('.vue-flow__pane'),
+	);
+}
+
+export function getContextMenu() {
+	return cy.getByTestId('context-menu').find('.el-dropdown-menu');
+}
+
+export function getContextMenuAction(action: string) {
+	return cy.getByTestId(`context-menu-item-${action}`);
+}
+
+export function getInputPlusHandle(nodeName: string) {
+	return cy.ifCanvasVersion(
+		() => cy.get(`.add-input-endpoint[data-endpoint-name="${nodeName}"]`),
+		() =>
+			cy.get(
+				`[data-test-id="canvas-node-input-handle"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
+			),
+	);
+}
+
+export function getInputPlusHandleByType(nodeName: string, endpointType: EndpointType) {
+	return cy.ifCanvasVersion(
+		() =>
+			cy.get(
+				`.add-input-endpoint[data-jtk-scope-${endpointType}][data-endpoint-name="${nodeName}"]`,
+			),
+		() =>
+			cy.get(
+				`[data-test-id="canvas-node-input-handle"][data-connection-type="${endpointType}"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
+			),
+	);
+}
+
+export function getOutputHandle(nodeName: string) {
+	return cy.ifCanvasVersion(
+		() => cy.get(`.add-output-endpoint[data-endpoint-name="${nodeName}"]`),
+		() => cy.get(`[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"]`),
+	);
+}
+
+export function getOutputPlusHandle(nodeName: string) {
+	return cy.ifCanvasVersion(
+		() => cy.get(`.add-output-endpoint[data-endpoint-name="${nodeName}"]`),
+		() =>
+			cy.get(
+				`[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
+			),
+	);
+}
+
+export function getOutputPlusHandleByType(nodeName: string, endpointType: EndpointType) {
+	return cy.ifCanvasVersion(
+		() =>
+			cy.get(
+				`.add-output-endpoint[data-jtk-scope-${endpointType}][data-endpoint-name="${nodeName}"]`,
+			),
+		() =>
+			cy.get(
+				`[data-test-id="canvas-node-output-handle"][data-connection-type="${endpointType}"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
+			),
 	);
 }
 
@@ -33,8 +101,8 @@ export function getNodeCreatorItems() {
 	return cy.getByTestId('item-iterator-item');
 }
 
-export function getExecuteWorkflowButton() {
-	return cy.getByTestId('execute-workflow-button');
+export function getExecuteWorkflowButton(triggerNodeName?: string) {
+	return cy.getByTestId(`execute-workflow-button${triggerNodeName ? `-${triggerNodeName}` : ''}`);
 }
 
 export function getManualChatButton() {
@@ -52,6 +120,13 @@ export function getNodeByName(name: string) {
 	);
 }
 
+export function getNodeRenderedTypeByName(name: string) {
+	return cy.ifCanvasVersion(
+		() => getNodeByName(name),
+		() => getNodeByName(name).find('[data-canvas-node-render-type]'),
+	);
+}
+
 export function getWorkflowHistoryCloseButton() {
 	return cy.getByTestId('workflow-history-close-button');
 }
@@ -63,10 +138,24 @@ export function disableNode(name: string) {
 }
 
 export function getConnectionBySourceAndTarget(source: string, target: string) {
+	return cy.ifCanvasVersion(
+		() =>
+			cy
+				.get('.jtk-connector')
+				.filter(`[data-source-node="${source}"][data-target-node="${target}"]`)
+				.eq(0),
+		() =>
+			cy
+				.getByTestId('edge')
+				.filter(`[data-source-node-name="${source}"][data-target-node-name="${target}"]`)
+				.eq(0),
+	);
+}
+
+export function getConnectionLabelBySourceAndTarget(source: string, target: string) {
 	return cy
-		.get('.jtk-connector')
-		.filter(`[data-source-node="${source}"][data-target-node="${target}"]`)
-		.eq(0);
+		.getByTestId('edge-label')
+		.filter(`[data-source-node-name="${source}"][data-target-node-name="${target}"]`);
 }
 
 export function getNodeCreatorSearchBar() {
@@ -78,10 +167,7 @@ export function getNodeCreatorPlusButton() {
 }
 
 export function getCanvasNodes() {
-	return cy.ifCanvasVersion(
-		() => cy.getByTestId('canvas-node'),
-		() => cy.getByTestId('canvas-node').not('[data-node-type="n8n-nodes-internal.addNodes"]'),
-	);
+	return cy.getByTestId('canvas-node');
 }
 
 export function getCanvasNodeByName(nodeName: string) {
@@ -141,7 +227,7 @@ function connectNodeToParent(
 	parentNodeName: string,
 	exactMatch = false,
 ) {
-	getAddInputEndpointByType(parentNodeName, endpointType).click({ force: true });
+	getInputPlusHandleByType(parentNodeName, endpointType).click({ force: true });
 	if (exactMatch) {
 		getNodeCreatorItems()
 			.contains(new RegExp('^' + nodeName + '$', 'g'))
@@ -158,7 +244,19 @@ export function addSupplementalNodeToParent(
 	exactMatch = false,
 ) {
 	connectNodeToParent(nodeName, endpointType, parentNodeName, exactMatch);
-	getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+
+	cy.ifCanvasVersion(
+		() => {
+			getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+		},
+		() => {
+			if (endpointType === 'main') {
+				getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+			} else {
+				getConnectionBySourceAndTarget(nodeName, parentNodeName).should('exist');
+			}
+		},
+	);
 }
 
 export function addLanguageModelNodeToParent(
@@ -196,8 +294,8 @@ export function addRetrieverNodeToParent(nodeName: string, parentNodeName: strin
 	addSupplementalNodeToParent(nodeName, 'ai_retriever', parentNodeName);
 }
 
-export function clickExecuteWorkflowButton() {
-	getExecuteWorkflowButton().click();
+export function clickExecuteWorkflowButton(triggerNodeName?: string) {
+	getExecuteWorkflowButton(triggerNodeName).click();
 }
 
 export function clickManualChatButton() {
@@ -229,3 +327,34 @@ export function deleteNode(name: string) {
 	getCanvasNodeByName(name).first().click();
 	cy.get('body').type('{del}');
 }
+
+export function openContextMenu(
+	nodeName?: string,
+	{ method = 'right-click', anchor = 'center' }: OpenContextMenuOptions = {},
+) {
+	let target;
+	if (nodeName) {
+		target =
+			method === 'right-click' ? getNodeRenderedTypeByName(nodeName) : getNodeByName(nodeName);
+	} else {
+		target = getCanvasPane();
+	}
+
+	if (method === 'right-click') {
+		target.rightclick(nodeName ? anchor : 'topLeft', { force: true });
+	} else {
+		target.realHover();
+		target.find('[data-test-id="overflow-node-button"]').click({ force: true });
+	}
+
+	cy.ifCanvasVersion(
+		() => {},
+		() => {
+			getContextMenu().should('be.visible');
+		},
+	);
+}
+
+export function clickContextMenuAction(action: string) {
+	getContextMenuAction(action).click();
+}
diff --git a/cypress/composables/workflowsPage.ts b/cypress/composables/workflowsPage.ts
new file mode 100644
index 0000000000..c7bcf39888
--- /dev/null
+++ b/cypress/composables/workflowsPage.ts
@@ -0,0 +1,15 @@
+/**
+ * Getters
+ */
+
+export function getWorkflowsPageUrl() {
+	return '/home/workflows';
+}
+
+/**
+ * Actions
+ */
+
+export function visitWorkflowsPage() {
+	cy.visit(getWorkflowsPageUrl());
+}
diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index f54c2de9fa..2931897f03 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -1,16 +1,15 @@
+import { getCanvasNodes } from '../composables/workflow';
 import {
 	SCHEDULE_TRIGGER_NODE_NAME,
 	CODE_NODE_NAME,
 	SET_NODE_NAME,
-	EDIT_FIELDS_SET_NODE_NAME,
+	MANUAL_TRIGGER_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 } from '../constants';
 import { MessageBox as MessageBoxClass } from '../pages/modals/message-box';
 import { NDV } from '../pages/ndv';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
-// Suite-specific constants
-const CODE_NODE_NEW_NAME = 'Something else';
-
 const WorkflowPage = new WorkflowPageClass();
 const messageBox = new MessageBoxClass();
 const ndv = new NDV();
@@ -20,40 +19,6 @@ describe('Undo/Redo', () => {
 		WorkflowPage.actions.visit();
 	});
 
-	// FIXME: Canvas V2: Fix redo connections
-	it('should undo/redo adding node in the middle', () => {
-		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeBetweenNodes(
-			SCHEDULE_TRIGGER_NODE_NAME,
-			CODE_NODE_NAME,
-			SET_NODE_NAME,
-		);
-		WorkflowPage.actions.zoomToFit();
-		WorkflowPage.getters.canvasNodeByName('Code').then(($codeNode) => {
-			const cssLeft = parseInt($codeNode.css('left'));
-			const cssTop = parseInt($codeNode.css('top'));
-
-			WorkflowPage.actions.hitUndo();
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
-			WorkflowPage.getters.nodeConnections().should('have.length', 1);
-			WorkflowPage.actions.hitUndo();
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 1);
-			WorkflowPage.getters.nodeConnections().should('have.length', 0);
-			WorkflowPage.actions.hitRedo();
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
-			WorkflowPage.getters.nodeConnections().should('have.length', 1);
-			WorkflowPage.actions.hitRedo();
-			WorkflowPage.getters.canvasNodes().should('have.have.length', 3);
-			WorkflowPage.getters.nodeConnections().should('have.length', 2);
-			// Last node should be added back to original position
-			WorkflowPage.getters
-				.canvasNodeByName('Code')
-				.should('have.css', 'left', cssLeft + 'px')
-				.should('have.css', 'top', cssTop + 'px');
-		});
-	});
-
 	it('should undo/redo deleting node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
@@ -115,34 +80,60 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
-	// FIXME: Canvas V2: Fix moving of nodes via e2e tests
 	it('should undo/redo moving nodes', () => {
-		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters.canvasNodeByName(CODE_NODE_NAME).then(($node) => {
-			const initialPosition = $node.position();
-			cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], { clickToFinish: true });
 
-			WorkflowPage.getters.canvasNodeByName(CODE_NODE_NAME).then(($node) => {
-				const cssLeft = parseInt($node.css('left'));
-				const cssTop = parseInt($node.css('top'));
-				expect(cssLeft).to.be.greaterThan(initialPosition.left);
-				expect(cssTop).to.be.greaterThan(initialPosition.top);
-			});
+		WorkflowPage.actions.zoomToFit();
 
-			WorkflowPage.actions.hitUndo();
-			WorkflowPage.getters
-				.canvasNodeByName(CODE_NODE_NAME)
-				.should('have.css', 'left', `${initialPosition.left}px`)
-				.should('have.css', 'top', `${initialPosition.top}px`);
-			WorkflowPage.actions.hitRedo();
-			WorkflowPage.getters.canvasNodeByName(CODE_NODE_NAME).then(($node) => {
-				const cssLeft = parseInt($node.css('left'));
-				const cssTop = parseInt($node.css('top'));
-				expect(cssLeft).to.be.greaterThan(initialPosition.left);
-				expect(cssTop).to.be.greaterThan(initialPosition.top);
+		getCanvasNodes()
+			.last()
+			.then(($node) => {
+				const { x: x1, y: y1 } = $node[0].getBoundingClientRect();
+
+				cy.ifCanvasVersion(
+					() => {
+						cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], {
+							clickToFinish: true,
+						});
+					},
+					() => {
+						cy.drag(getCanvasNodes().last(), [50, 150], {
+							realMouse: true,
+							abs: true,
+						});
+					},
+				);
+
+				getCanvasNodes()
+					.last()
+					.then(($node) => {
+						const { x: x2, y: y2 } = $node[0].getBoundingClientRect();
+						expect(x2).to.be.greaterThan(x1);
+						expect(y2).to.be.greaterThan(y1);
+					});
+
+				WorkflowPage.actions.hitUndo();
+
+				getCanvasNodes()
+					.last()
+					.then(($node) => {
+						const { x: x3, y: y3 } = $node[0].getBoundingClientRect();
+						expect(x3).to.equal(x1);
+						expect(y3).to.equal(y1);
+					});
+
+				WorkflowPage.actions.hitRedo();
+
+				getCanvasNodes()
+					.last()
+					.then(($node) => {
+						const { x: x4, y: y4 } = $node[0].getBoundingClientRect();
+						expect(x4).to.be.greaterThan(x1);
+						expect(y4).to.be.greaterThan(y1);
+					});
 			});
-		});
 	});
 
 	it('should undo/redo deleting a connection using context menu', () => {
@@ -155,17 +146,6 @@ describe('Undo/Redo', () => {
 		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
-	// FIXME: Canvas V2: Fix disconnecting by moving
-	it('should undo/redo deleting a connection by moving it away', () => {
-		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag('.rect-input-endpoint.jtk-endpoint-connected', [0, -100]);
-		WorkflowPage.getters.nodeConnections().should('have.length', 0);
-		WorkflowPage.actions.hitUndo();
-		WorkflowPage.getters.nodeConnections().should('have.length', 1);
-		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters.nodeConnections().should('have.length', 0);
-	});
 
 	it('should undo/redo disabling a node using context menu', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
@@ -204,23 +184,6 @@ describe('Undo/Redo', () => {
 		WorkflowPage.getters.disabledNodes().should('have.length', 2);
 	});
 
-	// FIXME: Canvas V2: Fix undo renaming node
-	it('should undo/redo renaming node using keyboard shortcut', () => {
-		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters.canvasNodes().last().click();
-		cy.get('body').trigger('keydown', { key: 'F2' });
-		cy.get('.rename-prompt').should('be.visible');
-		cy.get('body').type(CODE_NODE_NEW_NAME);
-		cy.get('body').type('{enter}');
-		WorkflowPage.actions.hitUndo();
-		cy.get('body').type('{esc}');
-		WorkflowPage.getters.canvasNodeByName(CODE_NODE_NAME).should('exist');
-		WorkflowPage.actions.hitRedo();
-		cy.get('body').type('{esc}');
-		WorkflowPage.getters.canvasNodeByName(CODE_NODE_NEW_NAME).should('exist');
-	});
-
 	it('should undo/redo duplicating a node', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
@@ -243,77 +206,6 @@ describe('Undo/Redo', () => {
 		});
 	});
 
-	// FIXME: Canvas V2: Figure out why moving doesn't work from e2e
-	it('should undo/redo multiple steps', () => {
-		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		// WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.zoomToFit();
-
-		// Disable last node
-		WorkflowPage.getters.canvasNodes().last().click();
-		WorkflowPage.actions.hitDisableNodeShortcut();
-
-		// Move first one
-		WorkflowPage.actions
-			.getNodePosition(WorkflowPage.getters.canvasNodes().first())
-			.then((initialPosition) => {
-				WorkflowPage.getters.canvasNodes().first().click();
-				cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], {
-					clickToFinish: true,
-				});
-				WorkflowPage.getters
-					.canvasNodes()
-					.first()
-					.then(($node) => {
-						const cssLeft = parseInt($node.css('left'));
-						const cssTop = parseInt($node.css('top'));
-						expect(cssLeft).to.be.greaterThan(initialPosition.left);
-						expect(cssTop).to.be.greaterThan(initialPosition.top);
-					});
-
-				// Delete the set node
-				WorkflowPage.getters.canvasNodeByName(EDIT_FIELDS_SET_NODE_NAME).click().click();
-				cy.get('body').type('{backspace}');
-
-				// First undo: Should return deleted node
-				WorkflowPage.actions.hitUndo();
-				WorkflowPage.getters.canvasNodes().should('have.length', 4);
-				WorkflowPage.getters.nodeConnections().should('have.length', 3);
-				// Second undo: Should move first node to it's original position
-				WorkflowPage.actions.hitUndo();
-				WorkflowPage.getters
-					.canvasNodes()
-					.first()
-					.should('have.css', 'left', `${initialPosition.left}px`)
-					.should('have.css', 'top', `${initialPosition.top}px`);
-				// Third undo: Should enable last node
-				WorkflowPage.actions.hitUndo();
-				WorkflowPage.getters.disabledNodes().should('have.length', 0);
-
-				// First redo: Should disable last node
-				WorkflowPage.actions.hitRedo();
-				WorkflowPage.getters.disabledNodes().should('have.length', 1);
-				// Second redo: Should move the first node
-				WorkflowPage.actions.hitRedo();
-				WorkflowPage.getters
-					.canvasNodes()
-					.first()
-					.then(($node) => {
-						const cssLeft = parseInt($node.css('left'));
-						const cssTop = parseInt($node.css('top'));
-						expect(cssLeft).to.be.greaterThan(initialPosition.left);
-						expect(cssTop).to.be.greaterThan(initialPosition.top);
-					});
-				// Third redo: Should delete the Set node
-				WorkflowPage.actions.hitRedo();
-				WorkflowPage.getters.canvasNodes().should('have.length', 3);
-				WorkflowPage.getters.nodeConnections().should('have.length', 2);
-			});
-	});
-
 	it('should be able to copy and paste pinned data nodes in workflows with dynamic Switch node', () => {
 		cy.fixture('Test_workflow_form_switch.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index a762135a65..e35842293e 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -129,7 +129,7 @@ describe('Inline expression editor', () => {
 
 			// Run workflow
 			ndv.actions.close();
-			WorkflowPage.actions.executeNode('No Operation', { anchor: 'topLeft' });
+			WorkflowPage.actions.executeNode('No Operation, do nothing', { anchor: 'topLeft' });
 			WorkflowPage.actions.openNode('Hacker News');
 			WorkflowPage.actions.openInlineExpressionEditor();
 
diff --git a/cypress/e2e/12-canvas-actions.cy.ts b/cypress/e2e/12-canvas-actions.cy.ts
index e9244a1d12..f63c85dc49 100644
--- a/cypress/e2e/12-canvas-actions.cy.ts
+++ b/cypress/e2e/12-canvas-actions.cy.ts
@@ -4,9 +4,9 @@ import {
 	CODE_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 	EDIT_FIELDS_SET_NODE_NAME,
-	IF_NODE_NAME,
 	HTTP_REQUEST_NODE_NAME,
 } from './../constants';
+import { getCanvasPane } from '../composables/workflow';
 import { successToast } from '../pages/notifications';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
@@ -16,64 +16,12 @@ describe('Canvas Actions', () => {
 		WorkflowPage.actions.visit();
 	});
 
-	// FIXME: Canvas V2: Missing execute button if no nodes
-	it('should render canvas', () => {
-		WorkflowPage.getters.nodeViewRoot().should('be.visible');
-		WorkflowPage.getters.canvasPlusButton().should('be.visible');
-		WorkflowPage.getters.zoomToFitButton().should('be.visible');
-		WorkflowPage.getters.zoomInButton().should('be.visible');
-		WorkflowPage.getters.zoomOutButton().should('be.visible');
-		WorkflowPage.getters.executeWorkflowButton().should('be.visible');
-	});
-
-	// FIXME: Canvas V2: Fix changing of connection
-	it('should connect and disconnect a simple node', () => {
-		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
-		WorkflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
-		WorkflowPage.getters.nodeConnections().should('have.length', 1);
-
-		WorkflowPage.getters.nodeViewBackground().click(600, 400, { force: true });
-		WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
-
-		// Change connection from Set to Set1
-		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('input', EDIT_FIELDS_SET_NODE_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
-		);
-
-		WorkflowPage.getters
-			.getConnectionBetweenNodes(MANUAL_TRIGGER_NODE_DISPLAY_NAME, `${EDIT_FIELDS_SET_NODE_NAME}1`)
-			.should('be.visible');
-
-		WorkflowPage.getters.nodeConnections().should('have.length', 1);
-		// Disconnect Set1
-		cy.drag(
-			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
-			[-200, 100],
-		);
-		WorkflowPage.getters.nodeConnections().should('have.length', 0);
-	});
-
 	it('should add first step', () => {
 		WorkflowPage.getters.canvasPlusButton().should('be.visible');
 		WorkflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 1);
 	});
 
-	it('should add a node via plus endpoint drag', () => {
-		WorkflowPage.getters.canvasPlusButton().should('be.visible');
-		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME, true);
-
-		cy.drag(
-			WorkflowPage.getters.getEndpointSelector('plus', SCHEDULE_TRIGGER_NODE_NAME),
-			[100, 100],
-		);
-
-		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
-		WorkflowPage.actions.addNodeToCanvas(IF_NODE_NAME, false);
-		WorkflowPage.getters.nodeViewBackground().click({ force: true });
-	});
-
 	it('should add a connected node using plus endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodePlusEndpointByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
@@ -116,7 +64,7 @@ describe('Canvas Actions', () => {
 	it('should add disconnected node if nothing is selected', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		// Deselect nodes
-		WorkflowPage.getters.nodeView().click({ force: true });
+		getCanvasPane().click({ force: true });
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 2);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
@@ -166,15 +114,6 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
-	// FIXME: Canvas V2: Fix disconnecting of connection by dragging it
-	it('should delete a connection by moving it away from endpoint', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag(WorkflowPage.getters.getEndpointSelector('input', CODE_NODE_NAME), [0, -100]);
-		WorkflowPage.getters.nodeConnections().should('have.length', 0);
-	});
-
 	describe('Node hover actions', () => {
 		it('should execute node', () => {
 			WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
@@ -184,7 +123,11 @@ describe('Canvas Actions', () => {
 				.last()
 				.findChildByTestId('execute-node-button')
 				.click({ force: true });
+
+			successToast().should('have.length', 1);
+
 			WorkflowPage.actions.executeNode(CODE_NODE_NAME);
+
 			successToast().should('have.length', 2);
 			successToast().should('contain.text', 'Node executed successfully');
 		});
@@ -235,7 +178,6 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.selectedNodes().should('have.length', 0);
 	});
 
-	// FIXME: Canvas V2: Selection via arrow keys is broken
 	it('should select nodes using arrow keys', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
@@ -259,7 +201,6 @@ describe('Canvas Actions', () => {
 		);
 	});
 
-	// FIXME: Canvas V2: Selection via shift and arrow keys is broken
 	it('should select nodes using shift and arrow keys', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
@@ -268,31 +209,4 @@ describe('Canvas Actions', () => {
 		cy.get('body').type('{shift}', { release: false }).type('{leftArrow}');
 		WorkflowPage.getters.selectedNodes().should('have.length', 2);
 	});
-
-	// FIXME: Canvas V2: Fix select & deselect
-	it('should not break lasso selection when dragging node action buttons', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		WorkflowPage.getters
-			.canvasNodes()
-			.last()
-			.findChildByTestId('execute-node-button')
-			.as('executeNodeButton');
-		cy.drag('@executeNodeButton', [200, 200]);
-		WorkflowPage.actions.testLassoSelection([100, 100], [200, 200]);
-	});
-
-	// FIXME: Canvas V2: Fix select & deselect
-	it('should not break lasso selection with multiple clicks on node action buttons', () => {
-		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
-		WorkflowPage.actions.testLassoSelection([100, 100], [200, 200]);
-		WorkflowPage.getters.canvasNodes().last().as('lastNode');
-		cy.get('@lastNode').findChildByTestId('execute-node-button').as('executeNodeButton');
-		for (let i = 0; i < 20; i++) {
-			cy.get('@lastNode').realHover();
-			cy.get('@executeNodeButton').should('be.visible');
-			cy.get('@executeNodeButton').realTouch();
-			cy.getByTestId('execute-workflow-button').realHover();
-			WorkflowPage.actions.testLassoSelection([100, 100], [200, 200]);
-		}
-	});
 });
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index ecfb325de2..be423344fb 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -7,9 +7,17 @@ import {
 	SWITCH_NODE_NAME,
 	MERGE_NODE_NAME,
 } from './../constants';
+import {
+	clickContextMenuAction,
+	getCanvasNodeByName,
+	getCanvasNodes,
+	getConnectionBySourceAndTarget,
+	getConnectionLabelBySourceAndTarget,
+	getOutputPlusHandle,
+	openContextMenu,
+} from '../composables/workflow';
 import { NDV, WorkflowExecutionsTab } from '../pages';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
-import { isCanvasV2 } from '../utils/workflowUtils';
 
 const WorkflowPage = new WorkflowPageClass();
 const ExecutionsTab = new WorkflowExecutionsTab();
@@ -20,8 +28,6 @@ const ZOOM_IN_X2_FACTOR = 1.5625; // Zoom in factor after two clicks
 const ZOOM_OUT_X1_FACTOR = 0.8;
 const ZOOM_OUT_X2_FACTOR = 0.64;
 
-const PINCH_ZOOM_IN_FACTOR = 1.05702;
-const PINCH_ZOOM_OUT_FACTOR = 0.946058;
 const RENAME_NODE_NAME = 'Something else';
 const RENAME_NODE_NAME2 = 'Something different';
 
@@ -41,27 +47,52 @@ describe('Canvas Node Manipulation and Navigation', () => {
 
 		NDVDialog.actions.close();
 		for (let i = 0; i < desiredOutputs; i++) {
-			WorkflowPage.getters.canvasNodePlusEndpointByName(SWITCH_NODE_NAME, i).click({ force: true });
+			cy.ifCanvasVersion(
+				() => {
+					WorkflowPage.getters
+						.canvasNodePlusEndpointByName(SWITCH_NODE_NAME, i)
+						.click({ force: true });
+				},
+				() => {
+					getOutputPlusHandle(SWITCH_NODE_NAME).eq(0).click();
+				},
+			);
 			WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
 			WorkflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, false);
 			WorkflowPage.actions.zoomToFit();
 		}
 		WorkflowPage.getters.nodeViewBackground().click({ force: true });
-		WorkflowPage.getters.canvasNodePlusEndpointByName(`${EDIT_FIELDS_SET_NODE_NAME}3`).click();
+		cy.ifCanvasVersion(
+			() => {
+				WorkflowPage.getters.canvasNodePlusEndpointByName(`${EDIT_FIELDS_SET_NODE_NAME}3`).click();
+			},
+			() => {
+				getOutputPlusHandle(`${EDIT_FIELDS_SET_NODE_NAME}3`).click();
+			},
+		);
 		WorkflowPage.actions.addNodeToCanvas(SWITCH_NODE_NAME, false);
 		WorkflowPage.actions.saveWorkflowOnButtonClick();
 		cy.reload();
 		cy.waitForLoad();
 		// Make sure outputless switch was connected correctly
-		WorkflowPage.getters
-			.getConnectionBetweenNodes(`${EDIT_FIELDS_SET_NODE_NAME}3`, `${SWITCH_NODE_NAME}1`)
-			.should('exist');
+		cy.ifCanvasVersion(
+			() => {
+				WorkflowPage.getters
+					.getConnectionBetweenNodes(`${EDIT_FIELDS_SET_NODE_NAME}3`, `${SWITCH_NODE_NAME}1`)
+					.should('exist');
+			},
+			() => {
+				getConnectionBySourceAndTarget(
+					`${EDIT_FIELDS_SET_NODE_NAME}3`,
+					`${SWITCH_NODE_NAME}1`,
+				).should('exist');
+			},
+		);
 		// Make sure all connections are there after reload
 		for (let i = 0; i < desiredOutputs; i++) {
 			const setName = `${EDIT_FIELDS_SET_NODE_NAME}${i > 0 ? i : ''}`;
-			WorkflowPage.getters
-				.getConnectionBetweenNodes(`${SWITCH_NODE_NAME}`, setName)
-				.should('exist');
+
+			getConnectionBySourceAndTarget(`${SWITCH_NODE_NAME}`, setName).should('exist');
 		}
 	});
 
@@ -84,14 +115,29 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		);
 
 		// Connect Set1 and Set2 to merge
-		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('plus', EDIT_FIELDS_SET_NODE_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0),
-		);
-		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('plus', `${EDIT_FIELDS_SET_NODE_NAME}1`),
-			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1),
+		cy.ifCanvasVersion(
+			() => {
+				cy.draganddrop(
+					WorkflowPage.getters.getEndpointSelector('plus', EDIT_FIELDS_SET_NODE_NAME),
+					WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0),
+				);
+				cy.draganddrop(
+					WorkflowPage.getters.getEndpointSelector('plus', `${EDIT_FIELDS_SET_NODE_NAME}1`),
+					WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1),
+				);
+			},
+			() => {
+				cy.draganddrop(
+					WorkflowPage.getters.getEndpointSelector('output', EDIT_FIELDS_SET_NODE_NAME),
+					WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0),
+				);
+				cy.draganddrop(
+					WorkflowPage.getters.getEndpointSelector('output', `${EDIT_FIELDS_SET_NODE_NAME}1`),
+					WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1),
+				);
+			},
 		);
+
 		const checkConnections = () => {
 			WorkflowPage.getters
 				.getConnectionBetweenNodes(
@@ -117,10 +163,22 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.executeWorkflow();
 		WorkflowPage.getters.stopExecutionButton().should('not.exist');
 
+		// Make sure all connections are there after save & reload
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+		cy.reload();
+		cy.waitForLoad();
+		checkConnections();
+
+		WorkflowPage.actions.executeWorkflow();
+		WorkflowPage.getters.stopExecutionButton().should('not.exist');
+
 		// If the merged set nodes are connected and executed correctly, there should be 2 items in the output of merge node
 		cy.ifCanvasVersion(
 			() => cy.get('[data-label="2 items"]').should('be.visible'),
-			() => cy.getByTestId('canvas-node-output-handle').contains('2 items').should('be.visible'),
+			() =>
+				getConnectionLabelBySourceAndTarget(`${EDIT_FIELDS_SET_NODE_NAME}1`, MERGE_NODE_NAME)
+					.contains('2 items')
+					.should('be.visible'),
 		);
 	});
 
@@ -144,7 +202,10 @@ describe('Canvas Node Manipulation and Navigation', () => {
 
 		cy.ifCanvasVersion(
 			() => cy.get('.plus-draggable-endpoint').should('have.class', 'ep-success'),
-			() => cy.getByTestId('canvas-handle-plus').should('have.attr', 'data-plus-type', 'success'),
+			() =>
+				cy
+					.getByTestId('canvas-handle-plus-wrapper')
+					.should('have.attr', 'data-plus-type', 'success'),
 		);
 
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
@@ -212,8 +273,8 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.wait(500);
 		WorkflowPage.actions.selectAllFromContextMenu();
-		WorkflowPage.actions.openContextMenu();
-		WorkflowPage.actions.contextMenuAction('delete');
+		openContextMenu();
+		clickContextMenuAction('delete');
 		WorkflowPage.getters.canvasNodes().should('have.length', 0);
 	});
 
@@ -228,41 +289,43 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.wait(500);
 		WorkflowPage.actions.selectAllFromContextMenu();
-		WorkflowPage.actions.openContextMenu();
-		WorkflowPage.actions.contextMenuAction('delete');
+		openContextMenu();
+		clickContextMenuAction('delete');
 		WorkflowPage.getters.canvasNodes().should('have.length', 0);
 	});
 
-	// FIXME: Canvas V2: Figure out how to test moving of the node
 	it('should move node', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 
 		WorkflowPage.actions.zoomToFit();
-		WorkflowPage.getters
-			.canvasNodes()
+
+		getCanvasNodes()
 			.last()
 			.then(($node) => {
-				const { left, top } = $node.position();
+				const { x: x1, y: y1 } = $node[0].getBoundingClientRect();
 
-				if (isCanvasV2()) {
-					cy.drag('.vue-flow__node', [300, 300], {
-						realMouse: true,
-					});
-				} else {
-					cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], {
-						clickToFinish: true,
-					});
-				}
+				cy.ifCanvasVersion(
+					() => {
+						cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150], {
+							clickToFinish: true,
+						});
+					},
+					() => {
+						cy.drag(getCanvasNodes().last(), [50, 150], {
+							realMouse: true,
+							abs: true,
+						});
+					},
+				);
 
-				WorkflowPage.getters
-					.canvasNodes()
+				getCanvasNodes()
 					.last()
 					.then(($node) => {
-						const { left: newLeft, top: newTop } = $node.position();
-						expect(newLeft).to.be.greaterThan(left);
-						expect(newTop).to.be.greaterThan(top);
+						const { x: x2, y: y2 } = $node[0].getBoundingClientRect();
+						expect(x2).to.be.greaterThan(x1);
+						expect(y2).to.be.greaterThan(y1);
 					});
 			});
 	});
@@ -304,26 +367,6 @@ describe('Canvas Node Manipulation and Navigation', () => {
 			zoomAndCheck('zoomOut', ZOOM_OUT_X2_FACTOR);
 		});
 
-		it('should zoom using scroll or pinch gesture', () => {
-			WorkflowPage.actions.pinchToZoom(1, 'zoomIn');
-
-			// V2 Canvas is using the same zoom factor for both pinch and scroll
-			cy.ifCanvasVersion(
-				() => checkZoomLevel(PINCH_ZOOM_IN_FACTOR),
-				() => checkZoomLevel(ZOOM_IN_X1_FACTOR),
-			);
-
-			WorkflowPage.actions.pinchToZoom(1, 'zoomOut');
-			checkZoomLevel(1); // Zoom in 1x + Zoom out 1x should reset to default (=1)
-
-			WorkflowPage.actions.pinchToZoom(1, 'zoomOut');
-
-			cy.ifCanvasVersion(
-				() => checkZoomLevel(PINCH_ZOOM_OUT_FACTOR),
-				() => checkZoomLevel(ZOOM_OUT_X1_FACTOR),
-			);
-		});
-
 		it('should reset zoom', () => {
 			WorkflowPage.getters.resetZoomButton().should('not.exist');
 			WorkflowPage.getters.zoomInButton().click();
@@ -369,7 +412,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		WorkflowPage.getters.disabledNodes().should('have.length', 0);
 		WorkflowPage.actions.deselectAll();
-		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+		getCanvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		WorkflowPage.getters.disabledNodes().should('have.length', 1);
 		WorkflowPage.actions.hitSelectAll();
@@ -378,19 +421,19 @@ describe('Canvas Node Manipulation and Navigation', () => {
 
 		// Context menu
 		WorkflowPage.actions.hitSelectAll();
-		WorkflowPage.actions.openContextMenu();
+		openContextMenu();
 		WorkflowPage.actions.contextMenuAction('toggle_activation');
 		WorkflowPage.getters.disabledNodes().should('have.length', 0);
-		WorkflowPage.actions.openContextMenu();
+		openContextMenu();
 		WorkflowPage.actions.contextMenuAction('toggle_activation');
 		WorkflowPage.getters.disabledNodes().should('have.length', 2);
 		WorkflowPage.actions.deselectAll();
 		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
-		WorkflowPage.actions.openContextMenu();
+		openContextMenu();
 		WorkflowPage.actions.contextMenuAction('toggle_activation');
 		WorkflowPage.getters.disabledNodes().should('have.length', 1);
 		WorkflowPage.actions.hitSelectAll();
-		WorkflowPage.actions.openContextMenu();
+		openContextMenu();
 		WorkflowPage.actions.contextMenuAction('toggle_activation');
 		WorkflowPage.getters.disabledNodes().should('have.length', 2);
 	});
@@ -466,7 +509,7 @@ describe('Canvas Node Manipulation and Navigation', () => {
 		WorkflowPage.getters.canvasNodes().should('have.length', 2);
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
 	});
-	// FIXME: Canvas V2: Credentials should show issue on the first open
+
 	it('should remove unknown credentials on pasting workflow', () => {
 		cy.fixture('workflow-with-unknown-credentials.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
@@ -478,35 +521,4 @@ describe('Canvas Node Manipulation and Navigation', () => {
 			NDVDialog.actions.close();
 		});
 	});
-
-	// FIXME: Canvas V2: Unknown nodes should still render connection endpoints
-	it('should render connections correctly if unkown nodes are present', () => {
-		const unknownNodeName = 'Unknown node';
-		cy.createFixtureWorkflow('workflow-with-unknown-nodes.json', 'Unknown nodes');
-
-		WorkflowPage.getters.canvasNodeByName(`${unknownNodeName} 1`).should('exist');
-		WorkflowPage.getters.canvasNodeByName(`${unknownNodeName} 2`).should('exist');
-		WorkflowPage.actions.zoomToFit();
-
-		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('plus', `${unknownNodeName} 1`),
-			WorkflowPage.getters.getEndpointSelector('input', EDIT_FIELDS_SET_NODE_NAME),
-		);
-
-		cy.draganddrop(
-			WorkflowPage.getters.getEndpointSelector('plus', `${unknownNodeName} 2`),
-			WorkflowPage.getters.getEndpointSelector('input', `${EDIT_FIELDS_SET_NODE_NAME}1`),
-		);
-
-		WorkflowPage.actions.executeWorkflow();
-		cy.contains('Unrecognized node type').should('be.visible');
-
-		WorkflowPage.actions.deselectAll();
-		WorkflowPage.actions.deleteNodeFromContextMenu(`${unknownNodeName} 1`);
-		WorkflowPage.actions.deleteNodeFromContextMenu(`${unknownNodeName} 2`);
-
-		WorkflowPage.actions.executeWorkflow();
-
-		cy.contains('Unrecognized node type').should('not.exist');
-	});
 });
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index 2d3351f8aa..800f9e417a 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -1,6 +1,3 @@
-import { nanoid } from 'nanoid';
-
-import { simpleWebhookCall, waitForWebhook } from './16-webhook-node.cy';
 import {
 	HTTP_REQUEST_NODE_NAME,
 	MANUAL_TRIGGER_NODE_NAME,
@@ -109,36 +106,6 @@ describe('Data pinning', () => {
 		ndv.getters.outputTbodyCell(1, 0).should('include.text', 1);
 	});
 
-	it('Should be able to pin data from canvas (context menu or shortcut)', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
-		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
-		workflowPage.actions.openContextMenu(EDIT_FIELDS_SET_NODE_NAME, { method: 'overflow-button' });
-		workflowPage.getters
-			.contextMenuAction('toggle_pin')
-			.parent()
-			.should('have.class', 'is-disabled');
-
-		cy.get('body').type('{esc}');
-
-		// Unpin using context menu
-		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
-		ndv.actions.setPinnedData([{ test: 1 }]);
-		ndv.actions.close();
-		workflowPage.actions.pinNode(EDIT_FIELDS_SET_NODE_NAME);
-		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
-		ndv.getters.nodeOutputHint().should('exist');
-		ndv.actions.close();
-
-		// Unpin using shortcut
-		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
-		ndv.actions.setPinnedData([{ test: 1 }]);
-		ndv.actions.close();
-		workflowPage.getters.canvasNodeByName(EDIT_FIELDS_SET_NODE_NAME).click();
-		workflowPage.actions.hitPinNodeShortcut();
-		workflowPage.actions.openNode(EDIT_FIELDS_SET_NODE_NAME);
-		ndv.getters.nodeOutputHint().should('exist');
-	});
-
 	it('Should show an error when maximum pin data size is exceeded', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true, true);
@@ -217,32 +184,6 @@ describe('Data pinning', () => {
 		);
 	});
 
-	it('should show pinned data tooltip', () => {
-		const { callEndpoint } = simpleWebhookCall({
-			method: 'GET',
-			webhookPath: nanoid(),
-			executeNow: false,
-		});
-
-		ndv.actions.close();
-		workflowPage.actions.executeWorkflow();
-		cy.wait(waitForWebhook);
-
-		// hide other visible popper on workflow execute button
-		workflowPage.getters.canvasNodes().eq(0).click();
-
-		callEndpoint((response) => {
-			expect(response.status).to.eq(200);
-			getVisiblePopper().should('have.length', 1);
-			getVisiblePopper()
-				.eq(0)
-				.should(
-					'have.text',
-					'You can pin this output instead of waiting for a test event. Open node to do so.',
-				);
-		});
-	});
-
 	it('should not show pinned data tooltip', () => {
 		cy.createFixtureWorkflow('Pinned_webhook_node.json', 'Test');
 		workflowPage.actions.executeWorkflow();
diff --git a/cypress/e2e/16-form-trigger-node.cy.ts b/cypress/e2e/16-form-trigger-node.cy.ts
index ed901107ea..033753bc5c 100644
--- a/cypress/e2e/16-form-trigger-node.cy.ts
+++ b/cypress/e2e/16-form-trigger-node.cy.ts
@@ -62,12 +62,14 @@ describe('n8n Form Trigger', () => {
 		getVisibleSelect().contains('Dropdown').click();
 		cy.contains('button', 'Add Field Option').click();
 		cy.contains('label', 'Field Options')
+			.parent()
 			.parent()
 			.nextAll()
 			.find('[data-test-id="parameter-input-field"]')
 			.eq(0)
 			.type('Option 1');
 		cy.contains('label', 'Field Options')
+			.parent()
 			.parent()
 			.nextAll()
 			.find('[data-test-id="parameter-input-field"]')
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 3d6c1049a2..e0892a4a0b 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -1,5 +1,6 @@
 import { nanoid } from 'nanoid';
 
+import { simpleWebhookCall, waitForWebhook } from '../composables/webhooks';
 import { BACKEND_BASE_URL, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
 import { WorkflowPage, NDV, CredentialsModal } from '../pages';
 import { cowBase64 } from '../support/binaryTestFiles';
@@ -9,81 +10,6 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 const credentialsModal = new CredentialsModal();
 
-export const waitForWebhook = 500;
-
-interface SimpleWebhookCallOptions {
-	method: string;
-	webhookPath: string;
-	responseCode?: number;
-	respondWith?: string;
-	executeNow?: boolean;
-	responseData?: string;
-	authentication?: string;
-}
-
-export const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
-	const {
-		authentication,
-		method,
-		webhookPath,
-		responseCode,
-		respondWith,
-		responseData,
-		executeNow = true,
-	} = options;
-
-	workflowPage.actions.addInitialNodeToCanvas('Webhook');
-	workflowPage.actions.openNode('Webhook');
-
-	cy.getByTestId('parameter-input-httpMethod').click();
-	getVisibleSelect().find('.option-headline').contains(method).click();
-	cy.getByTestId('parameter-input-path')
-		.find('.parameter-input')
-		.find('input')
-		.clear()
-		.type(webhookPath);
-
-	if (authentication) {
-		cy.getByTestId('parameter-input-authentication').click();
-		getVisibleSelect().find('.option-headline').contains(authentication).click();
-	}
-
-	if (responseCode) {
-		cy.get('.param-options').click();
-		getVisibleSelect().contains('Response Code').click();
-		cy.get('.parameter-item-wrapper > .parameter-input-list-wrapper').children().click();
-		getVisibleSelect().contains('201').click();
-	}
-
-	if (respondWith) {
-		cy.getByTestId('parameter-input-responseMode').click();
-		getVisibleSelect().find('.option-headline').contains(respondWith).click();
-	}
-
-	if (responseData) {
-		cy.getByTestId('parameter-input-responseData').click();
-		getVisibleSelect().find('.option-headline').contains(responseData).click();
-	}
-
-	const callEndpoint = (cb: (response: Cypress.Response<unknown>) => void) => {
-		cy.request(method, `${BACKEND_BASE_URL}/webhook-test/${webhookPath}`).then(cb);
-	};
-
-	if (executeNow) {
-		ndv.actions.execute();
-		cy.wait(waitForWebhook);
-
-		callEndpoint((response) => {
-			expect(response.status).to.eq(200);
-			ndv.getters.outputPanel().contains('headers');
-		});
-	}
-
-	return {
-		callEndpoint,
-	};
-};
-
 describe('Webhook Trigger node', () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
@@ -250,7 +176,7 @@ describe('Webhook Trigger node', () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
@@ -293,7 +219,7 @@ describe('Webhook Trigger node', () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 30a990fb28..60eb474b07 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -297,10 +297,9 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
-		// Only the credential in this project (+ the 'Create new' option) should
-		// be in the dropdown
+		// Only the credential in this project should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 2);
+		getVisibleSelect().find('li').should('have.length', 1);
 	});
 
 	it('should only show credentials in their personal project for members', () => {
@@ -325,10 +324,9 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
-		// Only the own credential the shared one (+ the 'Create new' option)
-		// should be in the dropdown
+		// Only the own credential the shared one should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 3);
+		getVisibleSelect().find('li').should('have.length', 2);
 	});
 
 	it('should only show credentials in their personal project for members if the workflow was shared with them', () => {
@@ -355,10 +353,9 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		workflowsPage.getters.workflowCardContent(workflowName).click();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
-		// Only the own credential the shared one (+ the 'Create new' option)
-		// should be in the dropdown
+		// Only the own credential the shared one should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 2);
+		getVisibleSelect().find('li').should('have.length', 1);
 	});
 
 	it("should show all credentials from all personal projects the workflow's been shared into for the global owner", () => {
@@ -400,10 +397,9 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		workflowsPage.getters.workflowCardContent(workflowName).click();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
-		// Only the personal credentials of the workflow owner and the global owner
-		// should show up.
+		// Only the personal credentials of the workflow owner and the global owner should show up.
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 4);
+		getVisibleSelect().find('li').should('have.length', 3);
 	});
 
 	it('should show all personal credentials if the global owner owns the workflow', () => {
@@ -421,6 +417,6 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 
 		// Show all personal credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.have.length', 2);
+		getVisibleSelect().find('li').should('have.have.length', 1);
 	});
 });
diff --git a/cypress/e2e/1858-PAY-can-use-context-menu.ts b/cypress/e2e/1858-PAY-can-use-context-menu.ts
deleted file mode 100644
index 6727df4166..0000000000
--- a/cypress/e2e/1858-PAY-can-use-context-menu.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
-
-const WorkflowPage = new WorkflowPageClass();
-
-describe('PAY-1858 context menu', () => {
-	it('can use context menu on saved workflow', () => {
-		WorkflowPage.actions.visit();
-		cy.createFixtureWorkflow('Test_workflow_filter.json', 'test');
-
-		WorkflowPage.getters.canvasNodes().should('have.length', 5);
-		WorkflowPage.actions.deleteNodeFromContextMenu('Then');
-		WorkflowPage.getters.canvasNodes().should('have.length', 4);
-
-		WorkflowPage.actions.hitSaveWorkflow();
-
-		cy.reload();
-		WorkflowPage.getters.canvasNodes().should('have.length', 4);
-		WorkflowPage.actions.deleteNodeFromContextMenu('Code');
-		WorkflowPage.getters.canvasNodes().should('have.length', 3);
-	});
-});
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 5be2399253..7563cc4827 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -1,3 +1,11 @@
+import { clickGetBackToCanvas, getNdvContainer, getOutputTableRow } from '../composables/ndv';
+import {
+	clickExecuteWorkflowButton,
+	getExecuteWorkflowButton,
+	getNodeByName,
+	getZoomToFitButton,
+	openNode,
+} from '../composables/workflow';
 import { SCHEDULE_TRIGGER_NODE_NAME, EDIT_FIELDS_SET_NODE_NAME } from '../constants';
 import { NDV, WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
 import { clearNotifications, errorToast, successToast } from '../pages/notifications';
@@ -214,89 +222,37 @@ describe('Execution', () => {
 		workflowPage.getters.clearExecutionDataButton().should('not.exist');
 	});
 
-	// FIXME: Canvas V2: Webhook should show waiting state but it doesn't
-	it('should test webhook workflow stop', () => {
-		cy.createFixtureWorkflow('Webhook_wait_set.json');
+	it('should test workflow with specific trigger node', () => {
+		cy.createFixtureWorkflow('Two_schedule_triggers.json');
 
-		// Check workflow buttons
-		workflowPage.getters.executeWorkflowButton().should('be.visible');
-		workflowPage.getters.clearExecutionDataButton().should('not.exist');
-		workflowPage.getters.stopExecutionButton().should('not.exist');
-		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+		getZoomToFitButton().click();
+		getExecuteWorkflowButton('Trigger A').should('not.be.visible');
+		getExecuteWorkflowButton('Trigger B').should('not.be.visible');
 
-		// Execute the workflow
-		workflowPage.getters.zoomToFitButton().click();
-		workflowPage.getters.executeWorkflowButton().click();
+		// Execute the workflow from trigger A
+		getNodeByName('Trigger A').realHover();
+		getExecuteWorkflowButton('Trigger A').should('be.visible');
+		getExecuteWorkflowButton('Trigger B').should('not.be.visible');
+		clickExecuteWorkflowButton('Trigger A');
 
-		// Check workflow buttons
-		workflowPage.getters.executeWorkflowButton().get('.n8n-spinner').should('be.visible');
-		workflowPage.getters.clearExecutionDataButton().should('not.exist');
-		workflowPage.getters.stopExecutionButton().should('not.exist');
-		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('be.visible');
+		// Check the output
+		successToast().contains('Workflow executed successfully');
+		openNode('Edit Fields');
+		getOutputTableRow(1).should('include.text', 'Trigger A');
 
-		workflowPage.getters.canvasNodes().first().dblclick();
+		clickGetBackToCanvas();
+		getNdvContainer().should('not.be.visible');
 
-		ndv.getters.copyInput().click();
+		// Execute the workflow from trigger B
+		getNodeByName('Trigger B').realHover();
+		getExecuteWorkflowButton('Trigger A').should('not.be.visible');
+		getExecuteWorkflowButton('Trigger B').should('be.visible');
+		clickExecuteWorkflowButton('Trigger B');
 
-		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
-
-		ndv.getters.backToCanvas().click();
-
-		cy.readClipboard().then((url) => {
-			cy.request({
-				method: 'GET',
-				url,
-			}).then((resp) => {
-				expect(resp.status).to.eq(200);
-			});
-		});
-
-		successToast().should('be.visible');
-		clearNotifications();
-
-		workflowPage.getters.stopExecutionButton().click();
-		// Check canvas nodes after 1st step (workflow passed the manual trigger node
-		workflowPage.getters
-			.canvasNodeByName('Webhook')
-			.within(() => cy.get('.fa-check'))
-			.should('exist');
-		workflowPage.getters
-			.canvasNodeByName('Wait')
-			.within(() => cy.get('.fa-check').should('not.exist'));
-		workflowPage.getters
-			.canvasNodeByName('Wait')
-			.within(() => cy.get('.fa-sync-alt'))
-			.should('exist');
-		workflowPage.getters
-			.canvasNodeByName('Set')
-			.within(() => cy.get('.fa-check').should('not.exist'));
-
-		// Check canvas nodes after workflow stopped
-		workflowPage.getters
-			.canvasNodeByName('Webhook')
-			.within(() => cy.get('.fa-check'))
-			.should('exist');
-
-		if (isCanvasV2()) {
-			workflowPage.getters
-				.canvasNodeByName('Wait')
-				.within(() => cy.get('.fa-sync-alt').should('not.exist'));
-		} else {
-			workflowPage.getters
-				.canvasNodeByName('Wait')
-				.within(() => cy.get('.fa-sync-alt').should('not.be.visible'));
-		}
-
-		workflowPage.getters
-			.canvasNodeByName('Set')
-			.within(() => cy.get('.fa-check').should('not.exist'));
-
-		successToast().should('be.visible');
-
-		// Clear execution data
-		workflowPage.getters.clearExecutionDataButton().should('be.visible');
-		workflowPage.getters.clearExecutionDataButton().click();
-		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		// Check the output
+		successToast().contains('Workflow executed successfully');
+		openNode('Edit Fields');
+		getOutputTableRow(1).should('include.text', 'Trigger B');
 	});
 
 	describe('execution preview', () => {
@@ -312,8 +268,11 @@ describe('Execution', () => {
 		});
 	});
 
-	// FIXME: Canvas V2: Missing pinned states for `edge-label-wrapper`
-	describe('connections should be colored differently for pinned data', () => {
+	/**
+	 * @TODO New Canvas: Different classes for pinned states on edges and nodes
+	 */
+	// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+	describe.skip('connections should be colored differently for pinned data', () => {
 		beforeEach(() => {
 			cy.createFixtureWorkflow('Schedule_pinned.json');
 			workflowPage.actions.deselectAll();
@@ -634,45 +593,4 @@ describe('Execution', () => {
 
 		errorToast().should('contain', 'Problem in node ‘Telegram‘');
 	});
-
-	it('should not show pinned data in production execution', () => {
-		cy.createFixtureWorkflow('Execution-pinned-data-check.json');
-
-		workflowPage.getters.zoomToFitButton().click();
-		cy.intercept('PATCH', '/rest/workflows/*').as('workflowActivate');
-		workflowPage.getters.activatorSwitch().click();
-
-		cy.wait('@workflowActivate');
-		cy.get('body').type('{esc}');
-		workflowPage.actions.openNode('Webhook');
-
-		cy.contains('label', 'Production URL').should('be.visible').click();
-		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
-		cy.get('.webhook-url').click();
-		ndv.getters.backToCanvas().click();
-
-		cy.readClipboard().then((url) => {
-			cy.request({
-				method: 'GET',
-				url,
-			}).then((resp) => {
-				expect(resp.status).to.eq(200);
-			});
-		});
-
-		cy.intercept('GET', '/rest/executions/*').as('getExecution');
-		executionsTab.actions.switchToExecutionsTab();
-
-		cy.wait('@getExecution');
-		executionsTab.getters
-			.workflowExecutionPreviewIframe()
-			.should('be.visible')
-			.its('0.contentDocument.body')
-			.should('not.be.empty')
-
-			.then(cy.wrap)
-			.find('.connection-run-items-label')
-			.filter(':contains("5 items")')
-			.should('have.length', 2);
-	});
 });
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index cda01c71a3..260d5f63a0 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -31,7 +31,7 @@ function createNotionCredential() {
 	workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME);
 	workflowPage.actions.openNode(NOTION_NODE_NAME);
 	workflowPage.getters.nodeCredentialsSelect().click();
-	getVisibleSelect().find('li').last().click();
+	workflowPage.getters.nodeCredentialsCreateOption().click();
 	credentialsModal.actions.fillCredentialsForm();
 	cy.get('body').type('{esc}');
 	workflowPage.actions.deleteNode(NOTION_NODE_NAME);
@@ -79,7 +79,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
@@ -99,7 +99,7 @@ describe('Credentials', () => {
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add oAuth credentials
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
@@ -107,14 +107,13 @@ describe('Credentials', () => {
 		cy.get('.el-message-box').find('button').contains('Close').click();
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add Service account credentials
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		// Both (+ the 'Create new' option) should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length.greaterThan', 2);
+		getVisibleSelect().find('li').should('have.length', 3);
 	});
 
 	it('should correctly render required and optional credentials', () => {
@@ -130,13 +129,13 @@ describe('Credentials', () => {
 		workflowPage.getters.nodeCredentialsSelect().should('have.length', 2);
 
 		workflowPage.getters.nodeCredentialsSelect().first().click();
-		getVisibleSelect().find('li').contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().first().click();
 		// This one should show auth type selector
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		cy.get('body').type('{esc}');
 
 		workflowPage.getters.nodeCredentialsSelect().last().click();
-		getVisibleSelect().find('li').contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().last().click();
 		// This one should not show auth type selector
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 	});
@@ -148,7 +147,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters
@@ -164,7 +163,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -189,7 +188,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
@@ -232,7 +231,7 @@ describe('Credentials', () => {
 		cy.getByTestId('credential-select').click();
 		cy.contains('Adalo API').click();
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
@@ -296,7 +295,7 @@ describe('Credentials', () => {
 
 		workflowPage.getters.nodeCredentialsSelect().should('exist');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -325,7 +324,7 @@ describe('Credentials', () => {
 		workflowPage.actions.addNodeToCanvas('Slack', true, true, 'Get a channel');
 		workflowPage.getters.nodeCredentialsSelect().should('exist');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
 		nodeDetailsView.getters.copyInput().should('not.exist');
 	});
diff --git a/cypress/e2e/21-community-nodes.cy.ts b/cypress/e2e/21-community-nodes.cy.ts
index 17f82ec573..283c08d557 100644
--- a/cypress/e2e/21-community-nodes.cy.ts
+++ b/cypress/e2e/21-community-nodes.cy.ts
@@ -89,7 +89,7 @@ describe('Community and custom nodes in canvas', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('E2E Node with native n8n credential', true, true);
 		workflowPage.getters.nodeCredentialsLabel().click();
-		cy.contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.editCredentialModal().should('contain.text', 'Notion API');
 	});
@@ -98,7 +98,7 @@ describe('Community and custom nodes in canvas', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('E2E Node with custom credential', true, true);
 		workflowPage.getters.nodeCredentialsLabel().click();
-		cy.contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.editCredentialModal().should('contain.text', 'Custom E2E Credential');
 	});
diff --git a/cypress/e2e/2106-ADO-pinned-data-execution-preview.cy.ts b/cypress/e2e/2106-ADO-pinned-data-execution-preview.cy.ts
deleted file mode 100644
index e26a7acb82..0000000000
--- a/cypress/e2e/2106-ADO-pinned-data-execution-preview.cy.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
-
-const workflowPage = new WorkflowPageClass();
-const executionsTab = new WorkflowExecutionsTab();
-
-describe('ADO-2106 connections should be colored correctly for pinned data in executions preview', () => {
-	beforeEach(() => {
-		workflowPage.actions.visit();
-	});
-
-	beforeEach(() => {
-		cy.createFixtureWorkflow('Webhook_set_pinned.json');
-		workflowPage.actions.deselectAll();
-		workflowPage.getters.zoomToFitButton().click();
-
-		workflowPage.getters.getConnectionBetweenNodes('Webhook', 'Set').should('have.class', 'pinned');
-	});
-
-	it('should color connections for pinned data nodes for manual executions', () => {
-		workflowPage.actions.executeWorkflow();
-
-		executionsTab.actions.switchToExecutionsTab();
-
-		executionsTab.getters.successfulExecutionListItems().should('have.length', 1);
-
-		executionsTab.getters
-			.workflowExecutionPreviewIframe()
-			.should('be.visible')
-			.its('0.contentDocument.body')
-			.should('not.be.empty')
-
-			.then(cy.wrap)
-			.find('.jtk-connector[data-source-node="Webhook"][data-target-node="Set"]')
-			.should('have.class', 'success')
-			.should('have.class', 'has-run')
-			.should('have.class', 'pinned');
-	});
-});
diff --git a/cypress/e2e/2111-ado-support-pinned-data-in-expressions.cy.ts b/cypress/e2e/2111-ado-support-pinned-data-in-expressions.cy.ts
deleted file mode 100644
index 6d2da55b32..0000000000
--- a/cypress/e2e/2111-ado-support-pinned-data-in-expressions.cy.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { WorkflowPage, NDV } from '../pages';
-
-const workflowPage = new WorkflowPage();
-const ndv = new NDV();
-
-describe('ADO-2111 expressions should support pinned data', () => {
-	beforeEach(() => {
-		workflowPage.actions.visit();
-	});
-
-	it('supports pinned data in expressions unexecuted and executed parent nodes', () => {
-		cy.createFixtureWorkflow('Test_workflow_pinned_data_in_expressions.json', 'Expressions');
-
-		// test previous node unexecuted
-		workflowPage.actions.openNode('NotPinnedWithExpressions');
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(0)
-			.should('include.text', 'Joe\nJoe\nJoan\nJoan\nJoe\nJoan\n\nJoe\nJoan\n\nJoe');
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(1)
-			.should('contain.text', '0,0\nJoe\n\nJoe\n\nJoe\n\nJoe\nJoe');
-
-		// test can resolve correctly based on item
-		ndv.actions.switchInputMode('Table');
-
-		ndv.getters.inputTableRow(2).realHover();
-		cy.wait(50);
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(0)
-			.should('include.text', 'Joe\nJoe\nJoan\nJoan\nJoe\nJoan\n\nJoe\nJoan\n\nJoe');
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(1)
-			.should('contain.text', '0,1\nJoan\n\nJoan\n\nJoan\n\nJoan\nJoan');
-
-		// test previous node executed
-		ndv.actions.execute();
-		ndv.getters.inputTableRow(1).realHover();
-		cy.wait(50);
-
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(0)
-			.should('include.text', 'Joe\nJoe\nJoan\nJoan\nJoe\nJoan\n\nJoe\nJoan\n\nJoe');
-
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(1)
-			.should('contain.text', '0,0\nJoe\n\nJoe\n\nJoe\n\nJoe\nJoe');
-
-		ndv.getters.inputTableRow(2).realHover();
-		cy.wait(50);
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(0)
-			.should('include.text', 'Joe\nJoe\nJoan\nJoan\nJoe\nJoan\n\nJoe\nJoan\n\nJoe');
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(1)
-			.should('contain.text', '0,1\nJoan\n\nJoan\n\nJoan\n\nJoan\nJoan');
-
-		// check it resolved correctly on the backend
-		ndv.getters
-			.outputTbodyCell(1, 0)
-			.should('contain.text', 'Joe\\nJoe\\nJoan\\nJoan\\nJoe\\nJoan\\n\\nJoe\\nJoan\\n\\nJoe');
-
-		ndv.getters
-			.outputTbodyCell(2, 0)
-			.should('contain.text', 'Joe\\nJoe\\nJoan\\nJoan\\nJoe\\nJoan\\n\\nJoe\\nJoan\\n\\nJoe');
-
-		ndv.getters
-			.outputTbodyCell(1, 1)
-			.should('contain.text', '0,0\\nJoe\\n\\nJoe\\n\\nJoe\\n\\nJoe\\nJoe');
-
-		ndv.getters
-			.outputTbodyCell(2, 1)
-			.should('contain.text', '0,1\\nJoan\\n\\nJoan\\n\\nJoan\\n\\nJoan\\nJoan');
-	});
-
-	it('resets expressions after node is unpinned', () => {
-		cy.createFixtureWorkflow('Test_workflow_pinned_data_in_expressions.json', 'Expressions');
-
-		// test previous node unexecuted
-		workflowPage.actions.openNode('NotPinnedWithExpressions');
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(0)
-			.should('include.text', 'Joe\nJoe\nJoan\nJoan\nJoe\nJoan\n\nJoe\nJoan\n\nJoe');
-		ndv.getters
-			.parameterExpressionPreview('value')
-			.eq(1)
-			.should('contain.text', '0,0\nJoe\n\nJoe\n\nJoe\n\nJoe\nJoe');
-
-		ndv.actions.close();
-
-		// unpin pinned node
-		workflowPage.getters
-			.canvasNodeByName('PinnedSet')
-			.eq(0)
-			.find('.node-pin-data-icon')
-			.should('exist');
-		workflowPage.getters.canvasNodeByName('PinnedSet').eq(0).click();
-		workflowPage.actions.hitPinNodeShortcut();
-		workflowPage.getters
-			.canvasNodeByName('PinnedSet')
-			.eq(0)
-			.find('.node-pin-data-icon')
-			.should('not.exist');
-
-		workflowPage.actions.openNode('NotPinnedWithExpressions');
-		ndv.getters.nodeParameters().find('parameter-expression-preview-value').should('not.exist');
-
-		ndv.getters.parameterInput('value').eq(0).click();
-		ndv.getters
-			.inlineExpressionEditorOutput()
-			.should(
-				'have.text',
-				'[Execute node ‘PinnedSet’ for preview][Execute node ‘PinnedSet’ for preview][Execute node ‘PinnedSet’ for preview][Execute node ‘PinnedSet’ for preview][Execute node ‘PinnedSet’ for preview][Execute node ‘PinnedSet’ for preview][Execute previous nodes for preview][Execute previous nodes for preview][undefined]',
-			);
-
-		// close open expression
-		ndv.getters.inputLabel().eq(0).click();
-
-		ndv.getters.parameterInput('value').eq(1).click();
-		ndv.getters
-			.inlineExpressionEditorOutput()
-			.should(
-				'have.text',
-				'0,0[Execute node ‘PinnedSet’ for preview][Execute node ‘PinnedSet’ for preview][Execute previous nodes for preview][Execute previous nodes for preview][Execute previous nodes for preview]',
-			);
-	});
-});
diff --git a/cypress/e2e/23-variables.cy.ts b/cypress/e2e/23-variables.cy.ts
index c481f25128..a0af3c09ac 100644
--- a/cypress/e2e/23-variables.cy.ts
+++ b/cypress/e2e/23-variables.cy.ts
@@ -65,8 +65,11 @@ describe('Variables', () => {
 			const editingRow = variablesPage.getters.variablesEditableRows().eq(0);
 			variablesPage.actions.setRowValue(editingRow, 'key', key);
 			variablesPage.actions.setRowValue(editingRow, 'value', value);
-			editingRow.should('contain', 'This field may contain only letters');
-			variablesPage.getters.editableRowSaveButton(editingRow).should('be.disabled');
+			variablesPage.actions.saveRowEditing(editingRow);
+			variablesPage.getters
+				.variablesEditableRows()
+				.eq(0)
+				.should('contain', 'This field may contain only letters');
 			variablesPage.actions.cancelRowEditing(editingRow);
 
 			variablesPage.getters.variablesRows().should('have.length', 3);
diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index 49257a8a12..ccae14f6c9 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -118,6 +118,15 @@ describe('NDV', () => {
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
 
+		// Start from linked state
+		ndv.getters.outputLinkRun().then(($el) => {
+			const classList = Array.from($el[0].classList);
+			if (!classList.includes('linked')) {
+				ndv.actions.toggleOutputRunLinking();
+				ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
+			}
+		});
+
 		ndv.getters
 			.inputRunSelector()
 			.should('exist')
@@ -243,38 +252,38 @@ describe('NDV', () => {
 		// biome-ignore format:
 		const PINNED_DATA = [
 			{
-				"id": "abc",
-				"historyId": "def",
-				"messages": [
+				id: 'abc',
+				historyId: 'def',
+				messages: [
 					{
-						"id": "abc"
-					}
-				]
+						id: 'abc',
+					},
+				],
 			},
 			{
-				"id": "abc",
-				"historyId": "def",
-				"messages": [
+				id: 'abc',
+				historyId: 'def',
+				messages: [
 					{
-						"id": "abc"
+						id: 'abc',
 					},
 					{
-						"id": "abc"
+						id: 'abc',
 					},
 					{
-						"id": "abc"
-					}
-				]
+						id: 'abc',
+					},
+				],
 			},
 			{
-				"id": "abc",
-				"historyId": "def",
-				"messages": [
+				id: 'abc',
+				historyId: 'def',
+				messages: [
 					{
-						"id": "abc"
-					}
-				]
-			}
+						id: 'abc',
+					},
+				],
+			},
 		];
 		workflowPage.actions.openNode('Get thread details1');
 		ndv.actions.pastePinnedData(PINNED_DATA);
diff --git a/cypress/e2e/25-stickies.cy.ts b/cypress/e2e/25-stickies.cy.ts
index 14c176f17b..da8d6c2674 100644
--- a/cypress/e2e/25-stickies.cy.ts
+++ b/cypress/e2e/25-stickies.cy.ts
@@ -3,24 +3,6 @@ import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const workflowPage = new WorkflowPageClass();
 
-function checkStickiesStyle(
-	top: number,
-	left: number,
-	height: number,
-	width: number,
-	zIndex?: number,
-) {
-	workflowPage.getters.stickies().should(($el) => {
-		expect($el).to.have.css('top', `${top}px`);
-		expect($el).to.have.css('left', `${left}px`);
-		expect($el).to.have.css('height', `${height}px`);
-		expect($el).to.have.css('width', `${width}px`);
-		if (zIndex) {
-			expect($el).to.have.css('z-index', `${zIndex}`);
-		}
-	});
-}
-
 describe('Canvas Actions', () => {
 	beforeEach(() => {
 		workflowPage.actions.visit();
@@ -51,191 +33,8 @@ describe('Canvas Actions', () => {
 			.contains('Guide')
 			.should('have.attr', 'href');
 	});
-
-	it('drags sticky around to top left corner', () => {
-		// used to caliberate move sticky function
-		addDefaultSticky();
-		moveSticky({ top: 0, left: 0 });
-	});
-
-	it('drags sticky around and position/size are saved correctly', () => {
-		addDefaultSticky();
-		moveSticky({ top: 500, left: 500 });
-
-		workflowPage.actions.saveWorkflowOnButtonClick();
-		cy.wait('@createWorkflow');
-
-		cy.reload();
-		cy.waitForLoad();
-
-		stickyShouldBePositionedCorrectly({ top: 500, left: 500 });
-	});
-
-	it('deletes sticky', () => {
-		workflowPage.actions.addSticky();
-		workflowPage.getters.stickies().should('have.length', 1);
-
-		workflowPage.actions.deleteSticky();
-
-		workflowPage.getters.stickies().should('have.length', 0);
-	});
-
-	it('edits sticky and updates content as markdown', () => {
-		workflowPage.actions.addSticky();
-
-		workflowPage.getters
-			.stickies()
-			.should('have.text', 'I’m a note\nDouble click to edit me. Guide\n');
-
-		workflowPage.getters.stickies().dblclick();
-		workflowPage.actions.editSticky('# hello world \n ## text text');
-		workflowPage.getters.stickies().find('h1').should('have.text', 'hello world');
-		workflowPage.getters.stickies().find('h2').should('have.text', 'text text');
-	});
-
-	it('expands/shrinks sticky from the right edge', () => {
-		addDefaultSticky();
-
-		moveSticky({ top: 200, left: 200 });
-
-		cy.drag('[data-test-id="sticky"] [data-dir="right"]', [100, 100]);
-		checkStickiesStyle(100, 20, 160, 346);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="right"]', [-50, -50]);
-		checkStickiesStyle(100, 20, 160, 302);
-	});
-
-	it('expands/shrinks sticky from the left edge', () => {
-		addDefaultSticky();
-
-		moveSticky({ left: 600, top: 200 });
-		cy.drag('[data-test-id="sticky"] [data-dir="left"]', [100, 100]);
-		checkStickiesStyle(100, 510, 160, 150);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="left"]', [-50, -50]);
-		checkStickiesStyle(100, 466, 160, 194);
-	});
-
-	it('expands/shrinks sticky from the top edge', () => {
-		workflowPage.actions.addSticky();
-		cy.drag('[data-test-id="sticky"]', [100, 100]); // move away from canvas button
-		checkStickiesStyle(300, 620, 160, 240);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="top"]', [100, 100]);
-		checkStickiesStyle(380, 620, 80, 240);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="top"]', [-50, -50]);
-		checkStickiesStyle(324, 620, 136, 240);
-	});
-
-	it('expands/shrinks sticky from the bottom edge', () => {
-		workflowPage.actions.addSticky();
-		cy.drag('[data-test-id="sticky"]', [100, 100]); // move away from canvas button
-		checkStickiesStyle(300, 620, 160, 240);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="bottom"]', [100, 100]);
-		checkStickiesStyle(300, 620, 254, 240);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="bottom"]', [-50, -50]);
-		checkStickiesStyle(300, 620, 198, 240);
-	});
-
-	it('expands/shrinks sticky from the bottom right edge', () => {
-		workflowPage.actions.addSticky();
-		cy.drag('[data-test-id="sticky"]', [-100, -100]); // move away from canvas button
-		checkStickiesStyle(100, 420, 160, 240);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="bottomRight"]', [100, 100]);
-		checkStickiesStyle(100, 420, 254, 346);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="bottomRight"]', [-50, -50]);
-		checkStickiesStyle(100, 420, 198, 302);
-	});
-
-	it('expands/shrinks sticky from the top right edge', () => {
-		addDefaultSticky();
-
-		cy.drag('[data-test-id="sticky"] [data-dir="topRight"]', [100, 100]);
-		checkStickiesStyle(360, 400, 80, 346);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="topRight"]', [-50, -50]);
-		checkStickiesStyle(304, 400, 136, 302);
-	});
-
-	it('expands/shrinks sticky from the top left edge, and reach min height/width', () => {
-		addDefaultSticky();
-
-		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [100, 100]);
-		checkStickiesStyle(360, 490, 80, 150);
-
-		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-150, -150]);
-		checkStickiesStyle(204, 346, 236, 294);
-	});
-
-	it('sets sticky behind node', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
-		addDefaultSticky();
-
-		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-150, -150]);
-		checkStickiesStyle(124, 256, 316, 384, -121);
-
-		workflowPage.getters
-			.canvasNodes()
-			.eq(0)
-			.should(($el) => {
-				expect($el).to.have.css('z-index', 'auto');
-			});
-
-		workflowPage.actions.addSticky();
-		workflowPage.getters
-			.stickies()
-			.eq(0)
-			.should(($el) => {
-				expect($el).to.have.css('z-index', '-121');
-			});
-		workflowPage.getters
-			.stickies()
-			.eq(1)
-			.should(($el) => {
-				expect($el).to.have.css('z-index', '-38');
-			});
-
-		cy.drag('[data-test-id="sticky"] [data-dir="topLeft"]', [-200, -200], { index: 1 });
-		workflowPage.getters
-			.stickies()
-			.eq(0)
-			.should(($el) => {
-				expect($el).to.have.css('z-index', '-121');
-			});
-
-		workflowPage.getters
-			.stickies()
-			.eq(1)
-			.should(($el) => {
-				expect($el).to.have.css('z-index', '-158');
-			});
-	});
-
-	it('Empty sticky should not error when activating workflow', () => {
-		workflowPage.actions.addSticky();
-
-		workflowPage.getters.stickies().should('have.length', 1);
-
-		workflowPage.getters.stickies().dblclick();
-
-		workflowPage.actions.clearSticky();
-
-		workflowPage.actions.addNodeToCanvas('Schedule Trigger');
-
-		workflowPage.actions.activateWorkflow();
-	});
 });
 
-type Position = {
-	top: number;
-	left: number;
-};
-
 function shouldHaveOneSticky() {
 	workflowPage.getters.stickies().should('have.length', 1);
 }
@@ -263,17 +62,3 @@ function addDefaultSticky() {
 	shouldHaveDefaultSize();
 	shouldBeInDefaultLocation();
 }
-
-function stickyShouldBePositionedCorrectly(position: Position) {
-	const yOffset = -100;
-	const xOffset = -180;
-	workflowPage.getters.stickies().should(($el) => {
-		expect($el).to.have.css('top', `${yOffset + position.top}px`);
-		expect($el).to.have.css('left', `${xOffset + position.left}px`);
-	});
-}
-
-function moveSticky(target: Position) {
-	cy.drag('[data-test-id="sticky"]', [target.left, target.top], { abs: true });
-	stickyShouldBePositionedCorrectly(target);
-}
diff --git a/cypress/e2e/30-editor-after-route-changes.cy.ts b/cypress/e2e/30-editor-after-route-changes.cy.ts
index 307c4a9537..89c64e1156 100644
--- a/cypress/e2e/30-editor-after-route-changes.cy.ts
+++ b/cypress/e2e/30-editor-after-route-changes.cy.ts
@@ -1,86 +1,7 @@
 import { getWorkflowHistoryCloseButton } from '../composables/workflow';
-import {
-	CODE_NODE_NAME,
-	EDIT_FIELDS_SET_NODE_NAME,
-	IF_NODE_NAME,
-	SCHEDULE_TRIGGER_NODE_NAME,
-} from '../constants';
-import { WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
+import { WorkflowPage as WorkflowPageClass } from '../pages';
 
 const workflowPage = new WorkflowPageClass();
-const executionsTab = new WorkflowExecutionsTab();
-
-const createNewWorkflowAndActivate = () => {
-	workflowPage.actions.visit();
-	workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
-	workflowPage.actions.saveWorkflowOnButtonClick();
-	workflowPage.actions.activateWorkflow();
-	cy.get('.el-notification .el-notification--error').should('not.exist');
-};
-
-const editWorkflowAndDeactivate = () => {
-	workflowPage.getters.canvasNodePlusEndpointByName(SCHEDULE_TRIGGER_NODE_NAME).click();
-	workflowPage.getters.nodeCreatorSearchBar().should('be.visible');
-	workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, false);
-	cy.get('.jtk-connector').should('have.length', 1);
-	workflowPage.actions.saveWorkflowOnButtonClick();
-	workflowPage.getters.activatorSwitch().click();
-	workflowPage.actions.zoomToFit();
-	cy.get('.el-notification .el-notification--error').should('not.exist');
-};
-
-const editWorkflowMoreAndActivate = () => {
-	cy.drag(workflowPage.getters.getEndpointSelector('plus', EDIT_FIELDS_SET_NODE_NAME), [200, 200], {
-		realMouse: true,
-	});
-	workflowPage.getters.nodeCreatorSearchBar().should('be.visible');
-
-	workflowPage.actions.addNodeToCanvas(CODE_NODE_NAME, false);
-	workflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
-	cy.get('.jtk-connector').should('have.length', 2);
-	workflowPage.actions.zoomToFit();
-	workflowPage.actions.saveWorkflowOnButtonClick();
-
-	workflowPage.actions.addNodeToCanvas(IF_NODE_NAME);
-	workflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
-	cy.get('.jtk-connector').should('have.length', 2);
-
-	const position = {
-		top: 0,
-		left: 0,
-	};
-	workflowPage.getters
-		.canvasNodeByName(IF_NODE_NAME)
-		.click()
-		.then(($element) => {
-			position.top = $element.position().top;
-			position.left = $element.position().left;
-		});
-
-	cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 200], { clickToFinish: true });
-	workflowPage.getters
-		.canvasNodes()
-		.last()
-		.then(($element) => {
-			const finalPosition = {
-				top: $element.position().top,
-				left: $element.position().left,
-			};
-
-			expect(finalPosition.top).to.be.greaterThan(position.top);
-			expect(finalPosition.left).to.be.greaterThan(position.left);
-		});
-
-	cy.draganddrop(
-		workflowPage.getters.getEndpointSelector('output', CODE_NODE_NAME),
-		workflowPage.getters.getEndpointSelector('input', IF_NODE_NAME),
-	);
-	cy.get('.jtk-connector').should('have.length', 3);
-
-	workflowPage.actions.saveWorkflowOnButtonClick();
-	workflowPage.getters.activatorSwitch().click();
-	cy.get('.el-notification .el-notification--error').should('not.exist');
-};
 
 const switchBetweenEditorAndHistory = () => {
 	workflowPage.getters.workflowHistoryButton().click();
@@ -116,62 +37,6 @@ const zoomInAndCheckNodes = () => {
 	workflowPage.getters.canvasNodes().last().should('not.be.visible');
 };
 
-describe('Editor actions should work', () => {
-	beforeEach(() => {
-		cy.enableFeature('debugInEditor');
-		cy.enableFeature('workflowHistory');
-		cy.signinAsOwner();
-		createNewWorkflowAndActivate();
-	});
-
-	it('after switching between Editor and Executions', () => {
-		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
-
-		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions']);
-		cy.wait(500);
-		executionsTab.actions.switchToEditorTab();
-		editWorkflowAndDeactivate();
-		editWorkflowMoreAndActivate();
-	});
-
-	it('after switching between Editor and Debug', () => {
-		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
-		cy.intercept('GET', '/rest/executions/*').as('getExecution');
-		cy.intercept('POST', '/rest/workflows/**/run?**').as('postWorkflowRun');
-
-		editWorkflowAndDeactivate();
-		workflowPage.actions.executeWorkflow();
-		cy.wait(['@postWorkflowRun']);
-
-		executionsTab.actions.switchToExecutionsTab();
-		cy.wait(['@getExecutions']);
-
-		executionsTab.getters.executionListItems().should('have.length', 1).first().click();
-		cy.wait(['@getExecution']);
-
-		executionsTab.getters.executionDebugButton().should('have.text', 'Copy to editor').click();
-		editWorkflowMoreAndActivate();
-	});
-
-	it('after switching between Editor and Workflow history', () => {
-		cy.intercept('GET', '/rest/workflow-history/workflow/*/version/*').as('getVersion');
-		cy.intercept('GET', '/rest/workflow-history/workflow/*').as('getHistory');
-
-		editWorkflowAndDeactivate();
-		workflowPage.getters.workflowHistoryButton().click();
-		cy.wait(['@getHistory']);
-		cy.wait(['@getVersion']);
-
-		cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
-		getWorkflowHistoryCloseButton().click();
-		cy.wait(['@workflowGet']);
-		cy.wait(1000);
-
-		editWorkflowMoreAndActivate();
-	});
-});
-
 describe('Editor zoom should work after route changes', () => {
 	beforeEach(() => {
 		cy.enableFeature('debugInEditor');
diff --git a/cypress/e2e/30-langchain.cy.ts b/cypress/e2e/30-langchain.cy.ts
index 96a03be961..2d0076bc11 100644
--- a/cypress/e2e/30-langchain.cy.ts
+++ b/cypress/e2e/30-langchain.cy.ts
@@ -28,7 +28,7 @@ import {
 	clickGetBackToCanvas,
 	getRunDataInfoCallout,
 	getOutputPanelTable,
-	toggleParameterCheckboxInputByName,
+	checkParameterCheckboxInputByName,
 } from '../composables/ndv';
 import {
 	addLanguageModelNodeToParent,
@@ -38,8 +38,6 @@ import {
 	addToolNodeToParent,
 	clickExecuteWorkflowButton,
 	clickManualChatButton,
-	disableNode,
-	getExecuteWorkflowButton,
 	navigateToNewWorkflowPage,
 	getNodes,
 	openNode,
@@ -73,31 +71,10 @@ describe('Langchain Integration', () => {
 		getManualChatModal().should('not.exist');
 	});
 
-	it('should disable test workflow button', () => {
-		addNodeToCanvas('Schedule Trigger', true);
-		addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true);
-
-		clickGetBackToCanvas();
-
-		addNodeToCanvas(AGENT_NODE_NAME, true, true);
-		clickGetBackToCanvas();
-
-		addLanguageModelNodeToParent(
-			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
-			AGENT_NODE_NAME,
-			true,
-		);
-		clickGetBackToCanvas();
-
-		disableNode('Schedule Trigger');
-
-		getExecuteWorkflowButton().should('be.disabled');
-	});
-
 	it('should add nodes to all Agent node input types', () => {
 		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
 		addNodeToCanvas(AGENT_NODE_NAME, true, true);
-		toggleParameterCheckboxInputByName('hasOutputParser');
+		checkParameterCheckboxInputByName('hasOutputParser');
 		clickGetBackToCanvas();
 
 		addLanguageModelNodeToParent(
@@ -368,58 +345,6 @@ describe('Langchain Integration', () => {
 		getConnectionBySourceAndTarget(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME).should('exist');
 		getNodes().should('have.length', 3);
 	});
-	it('should render runItems for sub-nodes and allow switching between them', () => {
-		const workflowPage = new WorkflowPage();
-		const ndv = new NDV();
-
-		cy.visit(workflowPage.url);
-		cy.createFixtureWorkflow('In_memory_vector_store_fake_embeddings.json');
-		workflowPage.actions.zoomToFit();
-
-		workflowPage.actions.executeNode('Populate VS');
-		cy.get('[data-label="25 items"]').should('exist');
-
-		const assertInputOutputText = (text: string, assertion: 'exist' | 'not.exist') => {
-			ndv.getters.outputPanel().contains(text).should(assertion);
-			ndv.getters.inputPanel().contains(text).should(assertion);
-		};
-
-		workflowPage.actions.openNode('Character Text Splitter');
-		ndv.getters.outputRunSelector().should('exist');
-		ndv.getters.inputRunSelector().should('exist');
-		ndv.getters.inputRunSelector().find('input').should('include.value', '3 of 3');
-		ndv.getters.outputRunSelector().find('input').should('include.value', '3 of 3');
-		assertInputOutputText('Kyiv', 'exist');
-		assertInputOutputText('Berlin', 'not.exist');
-		assertInputOutputText('Prague', 'not.exist');
-
-		ndv.actions.changeOutputRunSelector('2 of 3');
-		assertInputOutputText('Berlin', 'exist');
-		assertInputOutputText('Kyiv', 'not.exist');
-		assertInputOutputText('Prague', 'not.exist');
-
-		ndv.actions.changeOutputRunSelector('1 of 3');
-		assertInputOutputText('Prague', 'exist');
-		assertInputOutputText('Berlin', 'not.exist');
-		assertInputOutputText('Kyiv', 'not.exist');
-
-		ndv.actions.toggleInputRunLinking();
-		ndv.actions.changeOutputRunSelector('2 of 3');
-		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 3');
-		ndv.getters.outputRunSelector().find('input').should('include.value', '2 of 3');
-		ndv.getters.inputPanel().contains('Prague').should('exist');
-		ndv.getters.inputPanel().contains('Berlin').should('not.exist');
-
-		ndv.getters.outputPanel().contains('Berlin').should('exist');
-		ndv.getters.outputPanel().contains('Prague').should('not.exist');
-
-		ndv.actions.toggleInputRunLinking();
-		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 3');
-		ndv.getters.outputRunSelector().find('input').should('include.value', '1 of 3');
-		assertInputOutputText('Prague', 'exist');
-		assertInputOutputText('Berlin', 'not.exist');
-		assertInputOutputText('Kyiv', 'not.exist');
-	});
 
 	it('should show tool info notice if no existing tools were used during execution', () => {
 		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
@@ -518,4 +443,29 @@ describe('Langchain Integration', () => {
 
 		getRunDataInfoCallout().should('not.exist');
 	});
+
+	it('should execute up to Node 1 when using partial execution', () => {
+		const workflowPage = new WorkflowPage();
+		const ndv = new NDV();
+
+		cy.visit(workflowPage.url);
+		cy.createFixtureWorkflow('Test_workflow_chat_partial_execution.json');
+		workflowPage.actions.zoomToFit();
+
+		getManualChatModal().should('not.exist');
+		openNode('Node 1');
+		ndv.actions.execute();
+
+		getManualChatModal().should('exist');
+		sendManualChatMessage('Test');
+
+		getManualChatMessages().should('contain', 'this_my_field_1');
+		cy.getByTestId('refresh-session-button').click();
+		cy.get('button').contains('Reset').click();
+		getManualChatMessages().should('not.exist');
+
+		sendManualChatMessage('Another test');
+		getManualChatMessages().should('contain', 'this_my_field_3');
+		getManualChatMessages().should('contain', 'this_my_field_4');
+	});
 });
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index efd18bca74..b506040c87 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -1,3 +1,5 @@
+import { setCredentialValues } from '../composables/modals/credential-modal';
+import { clickCreateNewCredential, selectResourceLocatorItem } from '../composables/ndv';
 import * as projects from '../composables/projects';
 import {
 	INSTANCE_ADMIN,
@@ -11,18 +13,16 @@ import {
 	WorkflowPage,
 	CredentialsModal,
 	CredentialsPage,
-	WorkflowExecutionsTab,
 	NDV,
 	MainSidebar,
 } from '../pages';
 import { clearNotifications, successToast } from '../pages/notifications';
-import { getVisibleDropdown, getVisibleModalOverlay, getVisibleSelect } from '../utils';
+import { getVisibleSelect } from '../utils';
 
 const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
 const credentialsPage = new CredentialsPage();
 const credentialsModal = new CredentialsModal();
-const executionsTab = new WorkflowExecutionsTab();
 const ndv = new NDV();
 const mainSidebar = new MainSidebar();
 
@@ -36,207 +36,6 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		cy.changeQuota('maxTeamProjects', -1);
 	});
 
-	it('should handle workflows and credentials and menu items', () => {
-		cy.signinAsAdmin();
-		cy.visit(workflowsPage.url);
-		workflowsPage.getters.workflowCards().should('not.have.length');
-
-		workflowsPage.getters.newWorkflowButtonCard().click();
-
-		cy.intercept('POST', '/rest/workflows').as('workflowSave');
-		workflowPage.actions.saveWorkflowOnButtonClick();
-
-		cy.wait('@workflowSave').then((interception) => {
-			expect(interception.request.body).not.to.have.property('projectId');
-		});
-
-		projects.getHomeButton().click();
-		projects.getProjectTabs().should('have.length', 3);
-
-		projects.getProjectTabCredentials().click();
-		credentialsPage.getters.credentialCards().should('not.have.length');
-
-		credentialsPage.getters.emptyListCreateCredentialButton().click();
-		credentialsModal.getters.newCredentialModal().should('be.visible');
-		credentialsModal.getters.newCredentialTypeSelect().should('be.visible');
-		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
-		credentialsModal.getters.newCredentialTypeButton().click();
-		credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
-		credentialsModal.actions.setName('My awesome Notion account');
-
-		cy.intercept('POST', '/rest/credentials').as('credentialSave');
-		credentialsModal.actions.save();
-		cy.wait('@credentialSave').then((interception) => {
-			expect(interception.request.body).not.to.have.property('projectId');
-		});
-
-		credentialsModal.actions.close();
-		credentialsPage.getters.credentialCards().should('have.length', 1);
-		credentialsPage.getters
-			.credentialCards()
-			.first()
-			.find('.n8n-node-icon img')
-			.should('be.visible');
-
-		projects.getProjectTabWorkflows().click();
-		workflowsPage.getters.workflowCards().should('have.length', 1);
-
-		projects.getMenuItems().should('not.have.length');
-
-		cy.intercept('POST', '/rest/projects').as('projectCreate');
-		projects.getAddProjectButton().click();
-		cy.wait('@projectCreate');
-		projects.getMenuItems().should('have.length', 1);
-		projects.getProjectTabs().should('have.length', 3);
-
-		cy.get('input[name="name"]').type('Development');
-		projects.addProjectMember(INSTANCE_MEMBERS[0].email);
-
-		cy.intercept('PATCH', '/rest/projects/*').as('projectSettingsSave');
-		projects.getProjectSettingsSaveButton().click();
-		cy.wait('@projectSettingsSave').then((interception) => {
-			expect(interception.request.body).to.have.property('name').and.to.equal('Development');
-			expect(interception.request.body).to.have.property('relations').to.have.lengthOf(2);
-		});
-
-		projects.getMenuItems().first().click();
-		workflowsPage.getters.workflowCards().should('not.have.length');
-		projects.getProjectTabs().should('have.length', 4);
-
-		workflowsPage.getters.newWorkflowButtonCard().click();
-
-		cy.intercept('POST', '/rest/workflows').as('workflowSave');
-		workflowPage.actions.saveWorkflowOnButtonClick();
-
-		cy.wait('@workflowSave').then((interception) => {
-			expect(interception.request.body).to.have.property('projectId');
-		});
-
-		projects.getMenuItems().first().click();
-
-		projects.getProjectTabCredentials().click();
-		credentialsPage.getters.credentialCards().should('not.have.length');
-
-		credentialsPage.getters.emptyListCreateCredentialButton().click();
-		credentialsModal.getters.newCredentialModal().should('be.visible');
-		credentialsModal.getters.newCredentialTypeSelect().should('be.visible');
-		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
-		credentialsModal.getters.newCredentialTypeButton().click();
-		credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
-		credentialsModal.actions.setName('My awesome Notion account');
-
-		cy.intercept('POST', '/rest/credentials').as('credentialSave');
-		credentialsModal.actions.save();
-		cy.wait('@credentialSave').then((interception) => {
-			expect(interception.request.body).to.have.property('projectId');
-		});
-		credentialsModal.actions.close();
-
-		projects.getAddProjectButton().click();
-		projects.getMenuItems().should('have.length', 2);
-
-		let projectId: string;
-		projects.getMenuItems().first().click();
-		cy.intercept('GET', '/rest/credentials*').as('credentialsList');
-		projects.getProjectTabCredentials().click();
-		cy.wait('@credentialsList').then((interception) => {
-			const url = new URL(interception.request.url);
-			const queryParams = new URLSearchParams(url.search);
-			const filter = queryParams.get('filter');
-			expect(filter).to.be.a('string').and.to.contain('projectId');
-
-			if (filter) {
-				projectId = JSON.parse(filter).projectId;
-			}
-		});
-
-		projects.getMenuItems().last().click();
-		cy.intercept('GET', '/rest/credentials*').as('credentialsListProjectId');
-		projects.getProjectTabCredentials().click();
-		cy.wait('@credentialsListProjectId').then((interception) => {
-			const url = new URL(interception.request.url);
-			const queryParams = new URLSearchParams(url.search);
-			const filter = queryParams.get('filter');
-			expect(filter).to.be.a('string').and.to.contain('projectId');
-
-			if (filter) {
-				expect(JSON.parse(filter).projectId).not.to.equal(projectId);
-			}
-		});
-
-		projects.getHomeButton().click();
-		workflowsPage.getters.workflowCards().should('have.length', 2);
-
-		cy.intercept('GET', '/rest/credentials*').as('credentialsListUnfiltered');
-		projects.getProjectTabCredentials().click();
-		cy.wait('@credentialsListUnfiltered').then((interception) => {
-			expect(interception.request.url).not.to.contain('filter');
-		});
-
-		let menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Overview")[class*=active_]').should('exist');
-
-		projects.getMenuItems().first().click();
-
-		menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Development")[class*=active_]').should('exist');
-
-		cy.intercept('GET', '/rest/workflows/*').as('loadWorkflow');
-		workflowsPage.getters.workflowCards().first().findChildByTestId('card-content').click();
-
-		cy.wait('@loadWorkflow');
-		menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Development")[class*=active_]').should('exist');
-
-		cy.intercept('GET', '/rest/executions*').as('loadExecutions');
-		executionsTab.actions.switchToExecutionsTab();
-
-		cy.wait('@loadExecutions');
-		menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Development")[class*=active_]').should('exist');
-
-		executionsTab.actions.switchToEditorTab();
-
-		menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Development")[class*=active_]').should('exist');
-
-		cy.getByTestId('menu-item').filter(':contains("Variables")').click();
-		cy.getByTestId('unavailable-resources-list').should('be.visible');
-
-		menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Variables")[class*=active_]').should('exist');
-
-		projects.getHomeButton().click();
-		menuItems = cy.getByTestId('menu-item');
-
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Overview")[class*=active_]').should('exist');
-
-		workflowsPage.getters.workflowCards().should('have.length', 2).first().click();
-
-		cy.wait('@loadWorkflow');
-		cy.getByTestId('execute-workflow-button').should('be.visible');
-
-		menuItems = cy.getByTestId('menu-item');
-		menuItems.filter(':contains("Overview")[class*=active_]').should('not.exist');
-
-		menuItems = cy.getByTestId('menu-item');
-		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Development")[class*=active_]').should('exist');
-	});
-
 	it('should not show project add button and projects to a member if not invited to any project', () => {
 		cy.signinAsMember(1);
 		cy.visit(workflowsPage.url);
@@ -245,26 +44,6 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		projects.getMenuItems().should('not.exist');
 	});
 
-	it('should not show viewer role if not licensed', () => {
-		cy.signinAsOwner();
-		cy.visit(workflowsPage.url);
-
-		projects.getMenuItems().first().click();
-		projects.getProjectTabSettings().click();
-
-		cy.get(
-			`[data-test-id="user-list-item-${INSTANCE_MEMBERS[0].email}"] [data-test-id="projects-settings-user-role-select"]`,
-		).click();
-
-		cy.get('.el-select-dropdown__item.is-disabled')
-			.should('contain.text', 'Viewer')
-			.get('span:contains("Upgrade")')
-			.filter(':visible')
-			.click();
-
-		getVisibleModalOverlay().should('contain.text', 'Upgrade to unlock additional roles');
-	});
-
 	describe('when starting from scratch', () => {
 		beforeEach(() => {
 			cy.resetDatabase();
@@ -275,7 +54,11 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			cy.changeQuota('maxTeamProjects', -1);
 		});
 
-		it('should filter credentials by project ID when creating new workflow or hard reloading an opened workflow', () => {
+		/**
+		 * @TODO: New Canvas - Fix this test
+		 */
+		// eslint-disable-next-line n8n-local-rules/no-skipped-tests
+		it.skip('should filter credentials by project ID when creating new workflow or hard reloading an opened workflow', () => {
 			cy.signinAsOwner();
 			cy.visit(workflowsPage.url);
 
@@ -367,7 +150,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 1');
 			ndv.getters.backToCanvas().click();
@@ -382,7 +165,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 1');
 			ndv.getters.backToCanvas().click();
@@ -396,7 +179,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 2');
 			ndv.getters.backToCanvas().click();
@@ -407,7 +190,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 2');
 			ndv.getters.backToCanvas().click();
@@ -425,7 +208,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account personal project');
 			ndv.getters.backToCanvas().click();
@@ -436,7 +219,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account personal project');
 		});
@@ -754,80 +537,64 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			ndv.getters.credentialInput().find('input').should('be.enabled');
 		});
 
-		it('should handle viewer role', () => {
-			cy.enableFeature('projectRole:viewer');
+		it('should create sub-workflow and credential in the sub-workflow in the same project', () => {
 			cy.signinAsOwner();
 			cy.visit(workflowsPage.url);
 
-			projects.createProject('Development');
-			projects.addProjectMember(INSTANCE_MEMBERS[0].email, 'Viewer');
-			projects.getProjectSettingsSaveButton().click();
-
+			projects.createProject('Dev');
 			projects.getProjectTabWorkflows().click();
 			workflowsPage.getters.newWorkflowButtonCard().click();
-			projects.createWorkflow('Test_workflow_4_executions_view.json', 'WF with random error');
-			executionsTab.actions.createManualExecutions(2);
-			executionsTab.actions.toggleNodeEnabled('Error');
-			executionsTab.actions.createManualExecutions(2);
-			workflowPage.actions.saveWorkflowUsingKeyboardShortcut();
+			workflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			workflowPage.actions.saveWorkflowOnButtonClick();
+			workflowPage.actions.addNodeToCanvas('Execute Workflow', true, true);
 
-			projects.getMenuItems().first().click();
-			projects.getProjectTabCredentials().click();
-			credentialsPage.getters.emptyListCreateCredentialButton().click();
-			projects.createCredential('Notion API');
+			cy.window().then((win) => {
+				cy.stub(win, 'open').callsFake((url) => {
+					cy.visit(url);
+				});
+			});
 
-			mainSidebar.actions.openUserMenu();
-			cy.getByTestId('user-menu-item-logout').click();
+			selectResourceLocatorItem('workflowId', 0, 'Create a');
 
-			cy.get('input[name="email"]').type(INSTANCE_MEMBERS[0].email);
-			cy.get('input[name="password"]').type(INSTANCE_MEMBERS[0].password);
-			cy.getByTestId('form-submit-button').click();
+			cy.get('body').type('{esc}');
+			workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
+			clickCreateNewCredential();
+			setCredentialValues({
+				apiKey: 'abc123',
+			});
+			ndv.actions.close();
+			workflowPage.actions.saveWorkflowOnButtonClick();
 
 			projects.getMenuItems().last().click();
-			projects.getProjectTabExecutions().click();
-			cy.getByTestId('global-execution-list-item').first().find('td:last button').click();
-			getVisibleDropdown()
-				.find('li')
-				.filter(':contains("Retry")')
-				.should('have.class', 'is-disabled');
-			getVisibleDropdown()
-				.find('li')
-				.filter(':contains("Delete")')
-				.should('have.class', 'is-disabled');
+			workflowsPage.getters.workflowCards().should('have.length', 2);
 
-			projects.getMenuItems().first().click();
-			cy.getByTestId('workflow-card-name').should('be.visible').first().click();
-			workflowPage.getters.nodeViewRoot().should('be.visible');
-			workflowPage.getters.executeWorkflowButton().should('not.exist');
-			workflowPage.getters.nodeCreatorPlusButton().should('not.exist');
-			workflowPage.getters.canvasNodes().should('have.length', 3).last().click();
-			cy.get('body').type('{backspace}');
-			workflowPage.getters.canvasNodes().should('have.length', 3).last().rightclick();
-			getVisibleDropdown()
-				.find('li')
-				.should('be.visible')
-				.filter(
-					':contains("Open"), :contains("Copy"), :contains("Select all"), :contains("Clear selection")',
-				)
-				.should('not.have.class', 'is-disabled');
-			cy.get('body').type('{esc}');
-
-			executionsTab.actions.switchToExecutionsTab();
-			cy.getByTestId('retry-execution-button')
-				.should('be.visible')
-				.find('.is-disabled')
-				.should('exist');
-			cy.get('button:contains("Debug")').should('be.disabled');
-			cy.get('button[title="Retry execution"]').should('be.disabled');
-			cy.get('button[title="Delete this execution"]').should('be.disabled');
-
-			projects.getMenuItems().first().click();
 			projects.getProjectTabCredentials().click();
-			credentialsPage.getters.credentialCards().filter(':contains("Notion")').click();
-			cy.getByTestId('node-credentials-config-container')
-				.should('be.visible')
-				.find('input')
-				.should('not.have.length');
+			credentialsPage.getters.credentialCards().should('have.length', 1);
+		});
+
+		it('should create credential from workflow in the correct project after editor page refresh', () => {
+			cy.signinAsOwner();
+			cy.visit(workflowsPage.url);
+
+			projects.createProject('Dev');
+			projects.getProjectTabWorkflows().click();
+			workflowsPage.getters.newWorkflowButtonCard().click();
+			workflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+			workflowPage.actions.saveWorkflowOnButtonClick();
+
+			cy.reload();
+
+			workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
+			clickCreateNewCredential();
+			setCredentialValues({
+				apiKey: 'abc123',
+			});
+			ndv.actions.close();
+			workflowPage.actions.saveWorkflowOnButtonClick();
+
+			projects.getMenuItems().last().click();
+			projects.getProjectTabCredentials().click();
+			credentialsPage.getters.credentialCards().should('have.length', 1);
 		});
 	});
 
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 5e32d5568c..5636179166 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -76,11 +76,21 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.canvasAddButton().click();
 		WorkflowPage.actions.addNodeToCanvas('Manual', false);
 
-		nodeCreatorFeature.getters.canvasAddButton().should('not.be.visible');
-		nodeCreatorFeature.getters.nodeCreator().should('not.exist');
+		cy.ifCanvasVersion(
+			() => {
+				nodeCreatorFeature.getters.canvasAddButton().should('not.be.visible');
+				nodeCreatorFeature.getters.nodeCreator().should('not.exist');
+				// TODO: Replace once we have canvas feature utils
+				cy.get('div').contains('Add first step').should('be.hidden');
+			},
+			() => {
+				nodeCreatorFeature.getters.canvasAddButton().should('not.exist');
+				nodeCreatorFeature.getters.nodeCreator().should('not.exist');
+				// TODO: Replace once we have canvas feature utils
+				cy.get('div').contains('Add first step').should('not.exist');
+			},
+		);
 
-		// TODO: Replace once we have canvas feature utils
-		cy.get('div').contains('Add first step').should('be.hidden');
 		nodeCreatorFeature.actions.openNodeCreator();
 		nodeCreatorFeature.getters.nodeCreator().contains('What happens next?').should('be.visible');
 
@@ -125,7 +135,6 @@ describe('Node Creator', () => {
 			'OpenThesaurus',
 			'Spontit',
 			'Vonage',
-			'Send Email',
 			'Toggl Trigger',
 		];
 		const doubleActionNode = 'OpenWeatherMap';
@@ -346,7 +355,15 @@ describe('Node Creator', () => {
 
 	it('should correctly append a No Op node when Loop Over Items node is added (from connection)', () => {
 		WorkflowPage.actions.addNodeToCanvas('Manual');
-		cy.get('.plus-endpoint').should('be.visible').click();
+
+		cy.ifCanvasVersion(
+			() => {
+				cy.get('.plus-endpoint').click();
+			},
+			() => {
+				cy.getByTestId('canvas-handle-plus').click();
+			},
+		);
 
 		nodeCreatorFeature.getters.searchBar().find('input').type('Loop Over Items');
 		nodeCreatorFeature.getters.getCreatorItem('Loop Over Items').click();
@@ -531,7 +548,7 @@ describe('Node Creator', () => {
 			vectorStores.each((_i, vectorStore) => {
 				nodeCreatorFeature.getters.getCreatorItem(vectorStore).click();
 				actions.forEach((action) => {
-					nodeCreatorFeature.getters.getCreatorItem(action).should('be.visible');
+					nodeCreatorFeature.getters.getCreatorItem(action).should('be.visible').realHover();
 				});
 				cy.realPress('ArrowLeft');
 			});
@@ -554,4 +571,13 @@ describe('Node Creator', () => {
 
 		addVectorStoreToolToParent('In-Memory Vector Store', AGENT_NODE_NAME);
 	});
+
+	it('should insert node to canvas with sendAndWait operation selected', () => {
+		nodeCreatorFeature.getters.canvasAddButton().click();
+		WorkflowPage.actions.addNodeToCanvas('Manual', false);
+		nodeCreatorFeature.actions.openNodeCreator();
+		cy.contains('Human in the loop').click();
+		nodeCreatorFeature.getters.getCreatorItem('Slack').click();
+		cy.contains('Send and Wait for Response').should('exist');
+	});
 });
diff --git a/cypress/e2e/45-ai-assistant.cy.ts b/cypress/e2e/45-ai-assistant.cy.ts
index 9d33811363..157c656b46 100644
--- a/cypress/e2e/45-ai-assistant.cy.ts
+++ b/cypress/e2e/45-ai-assistant.cy.ts
@@ -5,7 +5,6 @@ import { GMAIL_NODE_NAME, SCHEDULE_TRIGGER_NODE_NAME } from '../constants';
 import { CredentialsModal, CredentialsPage, NDV, WorkflowPage } from '../pages';
 import { AIAssistant } from '../pages/features/ai-assistant';
 import { NodeCreator } from '../pages/features/node-creator';
-import { getVisibleSelect } from '../utils';
 
 const wf = new WorkflowPage();
 const ndv = new NDV();
@@ -434,7 +433,7 @@ describe('AI Assistant Credential Help', () => {
 		wf.actions.addNodeToCanvas('Slack', true, true, 'Get a channel');
 		wf.getters.nodeCredentialsSelect().should('exist');
 		wf.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		wf.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
 		ndv.getters.copyInput().should('not.exist');
 		credentialsModal.getters.oauthConnectButton().should('have.length', 1);
@@ -467,7 +466,7 @@ describe('AI Assistant Credential Help', () => {
 		wf.actions.addNodeToCanvas('Microsoft Outlook', true, true, 'Get a calendar');
 		wf.getters.nodeCredentialsSelect().should('exist');
 		wf.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		wf.getters.nodeCredentialsCreateOption().click();
 		ndv.getters.copyInput().should('not.exist');
 		credentialsModal.getters.oauthConnectButton().should('have.length', 1);
 		credentialsModal.getters.credentialInputs().should('have.length', 1);
diff --git a/cypress/e2e/45-workflow-selector-parameter.cy.ts b/cypress/e2e/45-workflow-selector-parameter.cy.ts
index 38df9a29b8..40e5ca2488 100644
--- a/cypress/e2e/45-workflow-selector-parameter.cy.ts
+++ b/cypress/e2e/45-workflow-selector-parameter.cy.ts
@@ -17,7 +17,7 @@ describe('Workflow Selector Parameter', () => {
 		workflowPage.actions.visit();
 		workflowPage.actions.addInitialNodeToCanvas(EXECUTE_WORKFLOW_NODE_NAME, {
 			keepNdvOpen: true,
-			action: 'Call Another Workflow',
+			action: 'Execute A Sub Workflow',
 		});
 	});
 	it('should render sub-workflows list', () => {
@@ -86,6 +86,8 @@ describe('Workflow Selector Parameter', () => {
 			cy.stub(win, 'open').as('windowOpen');
 		});
 
+		cy.intercept('POST', '/rest/workflows*').as('createSubworkflow');
+
 		ndv.getters.resourceLocator('workflowId').should('be.visible');
 		ndv.getters.resourceLocatorInput('workflowId').click();
 
@@ -94,14 +96,24 @@ describe('Workflow Selector Parameter', () => {
 			.findChildByTestId('rlc-item')
 			.eq(0)
 			.find('span')
-			.should('have.text', 'Create a new sub-workflow');
+			.should('contain.text', 'Create a'); // Due to some inconsistency we're sometimes in a project and sometimes not, this covers both cases
 
 		getVisiblePopper().findChildByTestId('rlc-item').eq(0).click();
 
-		const SAMPLE_SUBWORKFLOW_TEMPLATE_ID = 'VMiAxXa3lCAizGB5f7dVZQSFfg3FtHkdTKvLuupqBls=';
-		cy.get('@windowOpen').should(
-			'be.calledWith',
-			`/workflows/onboarding/${SAMPLE_SUBWORKFLOW_TEMPLATE_ID}?sampleSubWorkflows=0`,
-		);
+		cy.wait('@createSubworkflow').then((interception) => {
+			expect(interception.request.body).to.have.property('name').that.includes('Sub-Workflow');
+			expect(interception.request.body.nodes).to.be.an('array');
+			expect(interception.request.body.nodes).to.have.length(2);
+			expect(interception.request.body.nodes[0]).to.have.property(
+				'name',
+				'When Executed by Another Workflow',
+			);
+			expect(interception.request.body.nodes[1]).to.have.property(
+				'name',
+				'Replace me with your logic',
+			);
+		});
+
+		cy.get('@windowOpen').should('be.calledWithMatch', /\/workflow\/.+/);
 	});
 });
diff --git a/cypress/e2e/47-subworkflow-debugging.cy.ts b/cypress/e2e/47-subworkflow-debugging.cy.ts
index 725b6b32c4..77aaa4d7f6 100644
--- a/cypress/e2e/47-subworkflow-debugging.cy.ts
+++ b/cypress/e2e/47-subworkflow-debugging.cy.ts
@@ -1,9 +1,3 @@
-import {
-	getExecutionPreviewOutputPanelRelatedExecutionLink,
-	getExecutionsSidebar,
-	getWorkflowExecutionPreviewIframe,
-	openExecutionPreviewNode,
-} from '../composables/executions';
 import {
 	changeOutputRunSelector,
 	getOutputPanelItemsCount,
@@ -103,38 +97,4 @@ describe('Subworkflow debugging', () => {
 			getOutputTbodyCell(1, 2).should('include.text', 'Terry.Dach@hotmail.com');
 		});
 	});
-
-	it('can inspect parent executions', () => {
-		cy.url().then((workflowUrl) => {
-			openNode('Execute Workflow with param');
-
-			getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
-			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
-			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
-
-			// ensure workflow executed and waited on output
-			getOutputTableHeaders().should('have.length', 2);
-			getOutputTbodyCell(1, 0).should('have.text', 'world Natalie Moore');
-
-			// cypress cannot handle new tabs so removing it
-			getOutputPanelRelatedExecutionLink().invoke('removeAttr', 'target').click();
-
-			getExecutionsSidebar().should('be.visible');
-			getWorkflowExecutionPreviewIframe().should('be.visible');
-			openExecutionPreviewNode('Execute Workflow Trigger');
-
-			getExecutionPreviewOutputPanelRelatedExecutionLink().should(
-				'include.text',
-				'View parent execution',
-			);
-
-			getExecutionPreviewOutputPanelRelatedExecutionLink()
-				.invoke('removeAttr', 'target')
-				.click({ force: true });
-
-			cy.url().then((currentUrl) => {
-				expect(currentUrl === workflowUrl);
-			});
-		});
-	});
 });
diff --git a/cypress/e2e/48-subworkflow-inputs.cy.ts b/cypress/e2e/48-subworkflow-inputs.cy.ts
index 0e2755b9f0..716d253b8c 100644
--- a/cypress/e2e/48-subworkflow-inputs.cy.ts
+++ b/cypress/e2e/48-subworkflow-inputs.cy.ts
@@ -1,60 +1,227 @@
-import { clickGetBackToCanvas, getOutputTableHeaders } from '../composables/ndv';
 import {
+	addItemToFixedCollection,
+	assertNodeOutputHintExists,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+	getExecuteNodeButton,
+	getOutputTableHeaders,
+	getParameterInputByName,
+	populateFixedCollection,
+	selectResourceLocatorItem,
+	typeIntoFixedCollectionItem,
+	clickWorkflowCardContent,
+	assertOutputTableContent,
+	populateMapperFields,
+	getNodeRunInfoStale,
+	assertNodeOutputErrorMessageExists,
+	checkParameterCheckboxInputByName,
+	uncheckParameterCheckboxInputByName,
+} from '../composables/ndv';
+import {
+	clickExecuteWorkflowButton,
 	clickZoomToFit,
 	navigateToNewWorkflowPage,
 	openNode,
 	pasteWorkflow,
 	saveWorkflowOnButtonClick,
 } from '../composables/workflow';
+import { visitWorkflowsPage } from '../composables/workflowsPage';
 import SUB_WORKFLOW_INPUTS from '../fixtures/Test_Subworkflow-Inputs.json';
-import { NDV, WorkflowsPage, WorkflowPage } from '../pages';
 import { errorToast, successToast } from '../pages/notifications';
 import { getVisiblePopper } from '../utils';
 
-const ndv = new NDV();
-const workflowsPage = new WorkflowsPage();
-const workflow = new WorkflowPage();
-
 const DEFAULT_WORKFLOW_NAME = 'My workflow';
 const DEFAULT_SUBWORKFLOW_NAME_1 = 'My Sub-Workflow 1';
 const DEFAULT_SUBWORKFLOW_NAME_2 = 'My Sub-Workflow 2';
 
-type FieldRow = readonly string[];
-
-const exampleFields = [
+const EXAMPLE_FIELDS = [
 	['aNumber', 'Number'],
 	['aString', 'String'],
 	['aArray', 'Array'],
 	['aObject', 'Object'],
 	['aAny', 'Allow Any Type'],
-	// bool last since it's not an inputField so we'll skip it for some cases
+	// bool last because it's a switch instead of a normal inputField so we'll skip it for some cases
 	['aBool', 'Boolean'],
 ] as const;
 
-/**
- * Populate multiValue fixedCollections. Only supports fixedCollections for which all fields can be defined via keyboard typing
- *
- * @param items - 2D array of items to populate, i.e. [["myField1", "String"], [""]
- * @param collectionName - name of the fixedCollection to populate
- * @param offset - amount of 'parameter-input's before the fixedCollection under test
- * @returns
- */
-function populateFixedCollection(
-	items: readonly FieldRow[],
-	collectionName: string,
-	offset: number,
-) {
-	if (items.length === 0) return;
-	const n = items[0].length;
-	for (const [i, params] of items.entries()) {
-		ndv.actions.addItemToFixedCollection(collectionName);
-		for (const [j, param] of params.entries()) {
-			ndv.getters
-				.fixedCollectionParameter(collectionName)
-				.getByTestId('parameter-input')
-				.eq(offset + i * n + j)
-				.type(`${param}{downArrow}{enter}`);
-		}
+type TypeField = 'Allow Any Type' | 'String' | 'Number' | 'Boolean' | 'Array' | 'Object';
+
+describe('Sub-workflow creation and typed usage', () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+		pasteWorkflow(SUB_WORKFLOW_INPUTS);
+		saveWorkflowOnButtonClick();
+		clickZoomToFit();
+
+		openNode('Execute Workflow');
+
+		// Prevent sub-workflow from opening in new window
+		cy.window().then((win) => {
+			cy.stub(win, 'open').callsFake((url) => {
+				cy.visit(url);
+			});
+		});
+		selectResourceLocatorItem('workflowId', 0, 'Create a');
+		// **************************
+		// NAVIGATE TO CHILD WORKFLOW
+		// **************************
+		// Close NDV before opening the node creator
+		cy.get('body').type('{esc}');
+		openNode('When Executed by Another Workflow');
+	});
+
+	it('works with type-checked values', () => {
+		populateFixedCollection(EXAMPLE_FIELDS, 'workflowInputs', 1);
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_1,
+			1,
+			EXAMPLE_FIELDS.map((f) => f[0]),
+		);
+
+		const values = [
+			'-1', // number fields don't support `=` switch to expression, so let's test the Fixed case with it
+			...EXAMPLE_FIELDS.slice(1).map((x) => `={{}{{} $json.a${x[0]}`), // the `}}` at the end are added automatically
+		];
+
+		// this matches with the pinned data provided in the fixture
+		populateMapperFields(values.map((x, i) => [EXAMPLE_FIELDS[i][0], x]));
+
+		clickExecuteNode();
+
+		const expected = [
+			['-1', 'A String', '0:11:true2:3', 'aKey:-1', '[empty object]', 'true'],
+			['-1', 'Another String', '[empty array]', 'aDifferentKey:-1', '[empty array]', 'true'],
+		];
+		assertOutputTableContent(expected);
+
+		// Test the type-checking options
+		populateMapperFields([['aString', '{selectAll}{backspace}{{}{{} 5']]);
+
+		getNodeRunInfoStale().should('exist');
+		clickExecuteNode();
+
+		assertNodeOutputErrorMessageExists();
+
+		// attemptToConvertTypes enabled
+		checkParameterCheckboxInputByName('attemptToConvertTypes');
+
+		getNodeRunInfoStale().should('exist');
+		clickExecuteNode();
+
+		const expected2 = [
+			['-1', '5', '0:11:true2:3', 'aKey:-1', '[empty object]', 'true'],
+			['-1', '5', '[empty array]', 'aDifferentKey:-1', '[empty array]', 'true'],
+		];
+
+		assertOutputTableContent(expected2);
+
+		// disabled again
+		uncheckParameterCheckboxInputByName('attemptToConvertTypes');
+
+		getNodeRunInfoStale().should('exist');
+		clickExecuteNode();
+
+		assertNodeOutputErrorMessageExists();
+	});
+
+	it('works with Fields input source, and can then be changed to JSON input source', () => {
+		assertNodeOutputHintExists();
+
+		populateFixedCollection(EXAMPLE_FIELDS, 'workflowInputs', 1);
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_1,
+			1,
+			EXAMPLE_FIELDS.map((f) => f[0]),
+		);
+
+		cy.window().then((win) => {
+			cy.stub(win, 'open').callsFake((url) => {
+				cy.visit(url);
+				selectResourceLocatorItem('workflowId', 0, 'Create a');
+
+				openNode('When Executed by Another Workflow');
+
+				getParameterInputByName('inputSource').click();
+
+				getVisiblePopper()
+					.getByTestId('parameter-input')
+					.eq(0)
+					.type('Using JSON Example{downArrow}{enter}');
+
+				const exampleJson =
+					'{{}' + EXAMPLE_FIELDS.map((x) => `"${x[0]}": ${makeExample(x[1])}`).join(',') + '}';
+				getParameterInputByName('jsonExample')
+					.find('.cm-line')
+					.eq(0)
+					.type(`{selectAll}{backspace}${exampleJson}{enter}`);
+
+				// first one doesn't work for some reason, might need to wait for something?
+				clickExecuteNode();
+
+				validateAndReturnToParent(
+					DEFAULT_SUBWORKFLOW_NAME_2,
+					2,
+					EXAMPLE_FIELDS.map((f) => f[0]),
+				);
+
+				assertOutputTableContent([
+					['[null]', '[null]', '[null]', '[null]', '[null]', 'true'],
+					['[null]', '[null]', '[null]', '[null]', '[null]', 'true'],
+				]);
+
+				clickExecuteNode();
+			});
+		});
+	});
+
+	it('should show node issue when no fields are defined in manual mode', () => {
+		getExecuteNodeButton().should('be.disabled');
+		clickGetBackToCanvas();
+		// Executing the workflow should show an error toast
+		clickExecuteWorkflowButton();
+		errorToast().should('contain', 'The workflow has issues');
+		openNode('When Executed by Another Workflow');
+		// Add a field to the workflowInputs fixedCollection
+		addItemToFixedCollection('workflowInputs');
+		typeIntoFixedCollectionItem('workflowInputs', 0, 'test');
+		// Executing the workflow should not show error now
+		clickGetBackToCanvas();
+		clickExecuteWorkflowButton();
+		successToast().should('contain', 'Workflow executed successfully');
+	});
+});
+
+// This function starts off in the Child Workflow Input Trigger, assuming we just defined the input fields
+// It then navigates back to the parent and validates the outputPanel matches our changes
+function validateAndReturnToParent(targetChild: string, offset: number, fields: string[]) {
+	clickExecuteNode();
+
+	// + 1 to account for formatting-only column
+	getOutputTableHeaders().should('have.length', fields.length + 1);
+	for (const [i, name] of fields.entries()) {
+		getOutputTableHeaders().eq(i).should('have.text', name);
+	}
+
+	clickGetBackToCanvas();
+	saveWorkflowOnButtonClick();
+
+	visitWorkflowsPage();
+
+	clickWorkflowCardContent(DEFAULT_WORKFLOW_NAME);
+
+	openNode('Execute Workflow');
+
+	// Note that outside of e2e tests this will be pre-selected correctly.
+	// Due to our workaround to remain in the same tab we need to select the correct tab manually
+	selectResourceLocatorItem('workflowId', offset, targetChild);
+
+	clickExecuteNode();
+
+	getOutputTableHeaders().should('have.length', fields.length + 1);
+	for (const [i, name] of fields.entries()) {
+		getOutputTableHeaders().eq(i).should('have.text', name);
 	}
 }
 
@@ -74,215 +241,3 @@ function makeExample(type: TypeField) {
 			return 'null';
 	}
 }
-
-type TypeField = 'Allow Any Type' | 'String' | 'Number' | 'Boolean' | 'Array' | 'Object';
-function populateFields(items: ReadonlyArray<readonly [string, TypeField]>) {
-	populateFixedCollection(items, 'workflowInputs', 1);
-}
-
-function navigateWorkflowSelectionDropdown(index: number, expectedText: string) {
-	ndv.getters.resourceLocator('workflowId').should('be.visible');
-	ndv.getters.resourceLocatorInput('workflowId').click();
-
-	getVisiblePopper().findChildByTestId('rlc-item').eq(0).should('exist');
-	getVisiblePopper()
-		.findChildByTestId('rlc-item')
-		.eq(index)
-		.find('span')
-		.should('have.text', expectedText)
-		.click();
-}
-
-function populateMapperFields(values: readonly string[], offset: number) {
-	for (const [i, value] of values.entries()) {
-		cy.getByTestId('parameter-input')
-			.eq(offset + i)
-			.type(value);
-
-		// Click on a parent to dismiss the pop up hiding the field below.
-		cy.getByTestId('parameter-input')
-			.eq(offset + i)
-			.parent()
-			.parent()
-			.click('topLeft');
-	}
-}
-
-// This function starts off in the Child Workflow Input Trigger, assuming we just defined the input fields
-// It then navigates back to the parent and validates output
-function validateAndReturnToParent(targetChild: string, offset: number, fields: string[]) {
-	ndv.actions.execute();
-
-	// + 1 to account for formatting-only column
-	getOutputTableHeaders().should('have.length', fields.length + 1);
-	for (const [i, name] of fields.entries()) {
-		getOutputTableHeaders().eq(i).should('have.text', name);
-	}
-
-	clickGetBackToCanvas();
-	saveWorkflowOnButtonClick();
-
-	cy.visit(workflowsPage.url);
-
-	workflowsPage.getters.workflowCardContent(DEFAULT_WORKFLOW_NAME).click();
-
-	openNode('Execute Workflow');
-
-	// Note that outside of e2e tests this will be pre-selected correctly.
-	// Due to our workaround to remain in the same tab we need to select the correct tab manually
-	navigateWorkflowSelectionDropdown(offset, targetChild);
-
-	// This fails, pointing to `usePushConnection` `const triggerNode = subWorkflow?.nodes.find` being `undefined.find()`I <think>
-	ndv.actions.execute();
-
-	getOutputTableHeaders().should('have.length', fields.length + 1);
-	for (const [i, name] of fields.entries()) {
-		getOutputTableHeaders().eq(i).should('have.text', name);
-	}
-
-	// todo: verify the fields appear and show the correct types
-
-	// todo: fill in the input fields (and mock previous node data in the json fixture to match)
-
-	// todo: validate the actual output data
-}
-
-function setWorkflowInputFieldValue(index: number, value: string) {
-	ndv.actions.addItemToFixedCollection('workflowInputs');
-	ndv.actions.typeIntoFixedCollectionItem('workflowInputs', index, value);
-}
-
-describe('Sub-workflow creation and typed usage', () => {
-	beforeEach(() => {
-		navigateToNewWorkflowPage();
-		pasteWorkflow(SUB_WORKFLOW_INPUTS);
-		saveWorkflowOnButtonClick();
-		clickZoomToFit();
-
-		openNode('Execute Workflow');
-
-		// Prevent sub-workflow from opening in new window
-		cy.window().then((win) => {
-			cy.stub(win, 'open').callsFake((url) => {
-				cy.visit(url);
-			});
-		});
-		navigateWorkflowSelectionDropdown(0, 'Create a new sub-workflow');
-		// **************************
-		// NAVIGATE TO CHILD WORKFLOW
-		// **************************
-
-		openNode('Workflow Input Trigger');
-	});
-
-	it('works with type-checked values', () => {
-		populateFields(exampleFields);
-
-		validateAndReturnToParent(
-			DEFAULT_SUBWORKFLOW_NAME_1,
-			1,
-			exampleFields.map((f) => f[0]),
-		);
-
-		const values = [
-			'-1', // number fields don't support `=` switch to expression, so let's test the Fixed case with it
-			...exampleFields.slice(1).map((x) => `={{}{{} $json.a${x[0]}`), // }} are added automatically
-		];
-
-		// this matches with the pinned data provided in the fixture
-		populateMapperFields(values, 2);
-
-		ndv.actions.execute();
-
-		// todo:
-		// - validate output lines up
-		// - change input to need casts
-		// - run
-		// - confirm error
-		// - switch `attemptToConvertTypes` flag
-		// - confirm success and changed output
-		// - change input to be invalid despite cast
-		// - run
-		// - confirm error
-		// - switch type option flags
-		// - run
-		// - confirm success
-		// - turn off attempt to cast flag
-		// - confirm a value was not cast
-	});
-
-	it('works with Fields input source into JSON input source', () => {
-		ndv.getters.nodeOutputHint().should('exist');
-
-		populateFields(exampleFields);
-
-		validateAndReturnToParent(
-			DEFAULT_SUBWORKFLOW_NAME_1,
-			1,
-			exampleFields.map((f) => f[0]),
-		);
-
-		cy.window().then((win) => {
-			cy.stub(win, 'open').callsFake((url) => {
-				cy.visit(url);
-			});
-		});
-		navigateWorkflowSelectionDropdown(0, 'Create a new sub-workflow');
-
-		openNode('Workflow Input Trigger');
-
-		cy.getByTestId('parameter-input').eq(0).click();
-
-		// Todo: Check if there's a better way to interact with option dropdowns
-		// This PR would add this child testId
-		getVisiblePopper()
-			.getByTestId('parameter-input')
-			.eq(0)
-			.type('Using JSON Example{downArrow}{enter}');
-
-		const exampleJson =
-			'{{}' + exampleFields.map((x) => `"${x[0]}": ${makeExample(x[1])}`).join(',') + '}';
-		cy.getByTestId('parameter-input-jsonExample')
-			.find('.cm-line')
-			.eq(0)
-			.type(`{selectAll}{backspace}${exampleJson}{enter}`);
-
-		// first one doesn't work for some reason, might need to wait for something?
-		ndv.actions.execute();
-
-		validateAndReturnToParent(
-			DEFAULT_SUBWORKFLOW_NAME_2,
-			2,
-			exampleFields.map((f) => f[0]),
-		);
-
-		// test for either InputSource mode and options combinations:
-		// + we're showing the notice in the output panel
-		// + we start with no fields
-		// + Test Step works and we create the fields
-		// + create field of each type (string, number, boolean, object, array, any)
-		// + exit ndv
-		// + save
-		// + go back to parent workflow
-		// - verify fields appear [needs Ivan's PR]
-		// - link fields [needs Ivan's PR]
-		// + run parent
-		// - verify output with `null` defaults exists
-		//
-	});
-
-	it('should show node issue when no fields are defined in manual mode', () => {
-		ndv.getters.nodeExecuteButton().should('be.disabled');
-		ndv.actions.close();
-		// Executing the workflow should show an error toast
-		workflow.actions.executeWorkflow();
-		errorToast().should('contain', 'The workflow has issues');
-		openNode('Workflow Input Trigger');
-		// Add a field to the workflowInputs fixedCollection
-		setWorkflowInputFieldValue(0, 'test');
-		// Executing the workflow should not show error now
-		ndv.actions.close();
-		workflow.actions.executeWorkflow();
-		successToast().should('contain', 'Workflow executed successfully');
-	});
-});
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 8bad424554..22d5b9f49e 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -1,6 +1,10 @@
 import { setCredentialValues } from '../composables/modals/credential-modal';
-import { clickCreateNewCredential } from '../composables/ndv';
-import { MANUAL_TRIGGER_NODE_DISPLAY_NAME, NOTION_NODE_NAME } from '../constants';
+import { clickCreateNewCredential, setParameterSelectByContent } from '../composables/ndv';
+import {
+	EDIT_FIELDS_SET_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+	NOTION_NODE_NAME,
+} from '../constants';
 import { NDV, WorkflowPage } from '../pages';
 import { NodeCreator } from '../pages/features/node-creator';
 
@@ -106,7 +110,10 @@ describe('NDV', () => {
 		ndv.actions.execute();
 		ndv.getters
 			.nodeRunErrorMessage()
-			.should('have.text', 'Info for expression missing from previous node');
+			.should(
+				'have.text',
+				"Using the item method doesn't work with pinned data in this scenario. Please unpin 'Break pairedItem chain' and try again.",
+			);
 		ndv.getters
 			.nodeRunErrorDescription()
 			.should(
@@ -242,6 +249,15 @@ describe('NDV', () => {
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
 
+		// Start from linked state
+		ndv.getters.outputLinkRun().then(($el) => {
+			const classList = Array.from($el[0].classList);
+			if (!classList.includes('linked')) {
+				ndv.actions.toggleOutputRunLinking();
+				ndv.getters.inputTbodyCell(1, 0).click(); // remove tooltip
+			}
+		});
+
 		ndv.getters
 			.inputRunSelector()
 			.should('exist')
@@ -359,15 +375,71 @@ describe('NDV', () => {
 		ndv.getters.nodeExecuteButton().should('be.visible');
 	});
 
-	it('should allow editing code in fullscreen in the Code node', () => {
+	it('should allow editing code in fullscreen in the code editors', () => {
+		// Code (JavaScript)
 		workflowPage.actions.addInitialNodeToCanvas('Code', { keepNdvOpen: true });
 		ndv.actions.openCodeEditorFullscreen();
 
 		ndv.getters.codeEditorFullscreen().type('{selectall}').type('{backspace}').type('foo()');
 		ndv.getters.codeEditorFullscreen().should('contain.text', 'foo()');
-		cy.wait(200);
+		cy.wait(200); // allow change to emit before closing modal
 		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
 		ndv.getters.parameterInput('jsCode').get('.cm-content').should('contain.text', 'foo()');
+		ndv.actions.close();
+
+		// SQL
+		workflowPage.actions.addNodeToCanvas('Postgres', true, true, 'Execute a SQL query');
+		ndv.actions.openCodeEditorFullscreen();
+
+		ndv.getters
+			.codeEditorFullscreen()
+			.type('{selectall}')
+			.type('{backspace}')
+			.type('SELECT * FROM workflows');
+		ndv.getters.codeEditorFullscreen().should('contain.text', 'SELECT * FROM workflows');
+		cy.wait(200);
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters
+			.parameterInput('query')
+			.get('.cm-content')
+			.should('contain.text', 'SELECT * FROM workflows');
+		ndv.actions.close();
+
+		// HTML
+		workflowPage.actions.addNodeToCanvas('HTML', true, true, 'Generate HTML template');
+		ndv.actions.openCodeEditorFullscreen();
+
+		ndv.getters
+			.codeEditorFullscreen()
+			.type('{selectall}')
+			.type('{backspace}')
+			.type('<div>Hello World');
+		ndv.getters.codeEditorFullscreen().should('contain.text', '<div>Hello World</div>');
+		cy.wait(200);
+
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters
+			.parameterInput('html')
+			.get('.cm-content')
+			.should('contain.text', '<div>Hello World</div>');
+		ndv.actions.close();
+
+		// JSON
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true, true);
+		setParameterSelectByContent('mode', 'JSON');
+		ndv.actions.openCodeEditorFullscreen();
+		ndv.getters
+			.codeEditorFullscreen()
+			.type('{selectall}')
+			.type('{backspace}')
+			.type('{ "key": "value" }', { parseSpecialCharSequences: false });
+		ndv.getters.codeEditorFullscreen().should('contain.text', '{ "key": "value" }');
+		cy.wait(200);
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters
+			.parameterInput('jsonOutput')
+			.get('.cm-content')
+			.should('contain.text', '{ "key": "value" }');
 	});
 
 	it('should not retrieve remote options when a parameter value changes', () => {
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 674d91af18..4ecda7d56d 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -7,6 +7,9 @@ import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 const WorkflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
+const getParameter = () => ndv.getters.parameterInput('jsCode').should('be.visible');
+const getEditor = () => getParameter().find('.cm-content').should('exist');
+
 describe('Code node', () => {
 	describe('Code editor', () => {
 		beforeEach(() => {
@@ -40,10 +43,23 @@ describe('Code node', () => {
 			successToast().contains('Node executed successfully');
 		});
 
-		it('should show lint errors in `runOnceForAllItems` mode', () => {
-			const getParameter = () => ndv.getters.parameterInput('jsCode').should('be.visible');
-			const getEditor = () => getParameter().find('.cm-content').should('exist');
+		it('should allow switching between sibling code nodes', () => {
+			// Setup
+			getEditor().type('{selectall}').paste("console.log('code node 1')");
+			ndv.actions.close();
+			WorkflowPage.actions.addNodeToCanvas('Code', true, true);
+			getEditor().type('{selectall}').paste("console.log('code node 2')");
+			ndv.actions.close();
 
+			WorkflowPage.actions.openNode('Code');
+			ndv.actions.clickFloatingNode('Code1');
+			getEditor().should('have.text', "console.log('code node 2')");
+
+			ndv.actions.clickFloatingNode('Code');
+			getEditor().should('have.text', "console.log('code node 1')");
+		});
+
+		it('should show lint errors in `runOnceForAllItems` mode', () => {
 			getEditor()
 				.type('{selectall}')
 				.paste(`$input.itemMatching()
@@ -66,9 +82,6 @@ return
 		});
 
 		it('should show lint errors in `runOnceForEachItem` mode', () => {
-			const getParameter = () => ndv.getters.parameterInput('jsCode').should('be.visible');
-			const getEditor = () => getParameter().find('.cm-content').should('exist');
-
 			ndv.getters.parameterInput('mode').click();
 			ndv.actions.selectOptionInParameterDropdown('mode', 'Run Once for Each Item');
 			getEditor()
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index f0f3ae019a..079030359a 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -200,7 +200,14 @@ describe('Workflow Actions', () => {
 			WorkflowPage.getters.nodeConnections().should('have.length', 2);
 			// Check if all nodes have names
 			WorkflowPage.getters.canvasNodes().each((node) => {
-				cy.wrap(node).should('have.attr', 'data-name');
+				cy.ifCanvasVersion(
+					() => {
+						cy.wrap(node).should('have.attr', 'data-name');
+					},
+					() => {
+						cy.wrap(node).should('have.attr', 'data-node-name');
+					},
+				);
 			});
 		});
 	});
diff --git a/cypress/e2e/9-expression-editor-modal.cy.ts b/cypress/e2e/9-expression-editor-modal.cy.ts
index 840e3d4fc6..42095b06fe 100644
--- a/cypress/e2e/9-expression-editor-modal.cy.ts
+++ b/cypress/e2e/9-expression-editor-modal.cy.ts
@@ -105,7 +105,7 @@ describe('Expression editor modal', () => {
 			// Run workflow
 			cy.get('body').type('{esc}');
 			ndv.actions.close();
-			WorkflowPage.actions.executeNode('No Operation');
+			WorkflowPage.actions.executeNode('No Operation, do nothing', { anchor: 'topLeft' });
 			WorkflowPage.actions.openNode('Hacker News');
 			WorkflowPage.actions.openExpressionEditorModal();
 
diff --git a/cypress/fixtures/Test_workflow_chat_partial_execution.json b/cypress/fixtures/Test_workflow_chat_partial_execution.json
new file mode 100644
index 0000000000..451ddcf964
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_chat_partial_execution.json
@@ -0,0 +1,77 @@
+{
+  "nodes": [
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "535fd3dd-e78f-4ffa-a085-79723fc81b38",
+      "name": "When chat message received",
+      "type": "@n8n/n8n-nodes-langchain.chatTrigger",
+      "typeVersion": 1.1,
+      "position": [
+        320,
+        -380
+      ],
+      "webhookId": "4fb58136-3481-494a-a30f-d9e064dac186"
+    },
+    {
+      "parameters": {
+        "mode": "raw",
+        "jsonOutput": "{\n  \"this_my_field_1\": \"value\",\n  \"this_my_field_2\": 1\n}\n",
+        "options": {}
+      },
+      "id": "78201ec2-6def-40b7-85e5-97b580d7f642",
+      "name": "Node 1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.4,
+      "position": [
+        580,
+        -380
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "raw",
+        "jsonOutput": "{\n  \"this_my_field_3\": \"value\",\n  \"this_my_field_4\": 1\n}\n",
+        "options": {}
+      },
+      "id": "1cfca06d-3ec3-427f-89f7-1ef321e025ff",
+      "name": "Node 2",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.4,
+      "position": [
+        780,
+        -380
+      ]
+    }
+  ],
+  "connections": {
+    "When chat message received": {
+      "main": [
+        [
+          {
+            "node": "Node 1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Node 1": {
+      "main": [
+        [
+          {
+            "node": "Node 2",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "pinData": {},
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "178ef8a5109fc76c716d40bcadb720c455319f7b7a3fd5a39e4f336a091f524a"
+  }
+}
diff --git a/cypress/fixtures/Two_schedule_triggers.json b/cypress/fixtures/Two_schedule_triggers.json
new file mode 100644
index 0000000000..a990b4a448
--- /dev/null
+++ b/cypress/fixtures/Two_schedule_triggers.json
@@ -0,0 +1,76 @@
+{
+	"nodes": [
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "6a8c3d85-26f8-4f28-ace9-55a196a23d37",
+							"name": "prevNode",
+							"value": "={{ $prevNode.name }}",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [200, -100],
+			"id": "351ce967-0399-4a78-848a-9cc69b831796",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {
+				"rule": {
+					"interval": [{}]
+				}
+			},
+			"type": "n8n-nodes-base.scheduleTrigger",
+			"typeVersion": 1.2,
+			"position": [0, -100],
+			"id": "cf2f58a8-1fbb-4c70-b2b1-9e06bee7ec47",
+			"name": "Trigger A"
+		},
+		{
+			"parameters": {
+				"rule": {
+					"interval": [{}]
+				}
+			},
+			"type": "n8n-nodes-base.scheduleTrigger",
+			"typeVersion": 1.2,
+			"position": [0, 100],
+			"id": "4fade34e-2bfc-4a2e-a8ed-03ab2ed9c690",
+			"name": "Trigger B"
+		}
+	],
+	"connections": {
+		"Trigger A": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Trigger B": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {},
+	"meta": {
+		"instanceId": "0dd4627b77a5a795ab9bf073e5812be94dd8d1a5f012248ef2a4acac09be12cb"
+	}
+}
diff --git a/cypress/package.json b/cypress/package.json
index 6725c46bc6..4ad2d4f199 100644
--- a/cypress/package.json
+++ b/cypress/package.json
@@ -6,7 +6,7 @@
     "cypress:install": "cypress install",
     "test:e2e:ui": "scripts/run-e2e.js ui",
     "test:e2e:dev": "scripts/run-e2e.js dev",
-    "test:e2e:dev:v2": "scripts/run-e2e.js dev:v2",
+    "test:e2e:dev:v1": "scripts/run-e2e.js dev:v1",
     "test:e2e:all": "scripts/run-e2e.js all",
     "format": "biome format --write .",
     "format:check": "biome ci .",
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 91ece23122..54ae067e72 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -151,6 +151,9 @@ export class NDV extends BasePage {
 		schemaViewNodeName: () => cy.getByTestId('run-data-schema-node-name'),
 		expressionExpanders: () => cy.getByTestId('expander'),
 		expressionModalOutput: () => cy.getByTestId('expression-modal-output'),
+		floatingNodes: () => cy.getByTestId('floating-node'),
+		floatingNodeByName: (name: string) =>
+			cy.getByTestId('floating-node').filter(`[data-node-name="${name}"]`),
 	};
 
 	actions = {
@@ -339,6 +342,9 @@ export class NDV extends BasePage {
 		dragMainPanelToRight: () => {
 			cy.drag('[data-test-id=panel-drag-button]', [1000, 0], { moveTwice: true });
 		},
+		clickFloatingNode: (name: string) => {
+			this.getters.floatingNodeByName(name).realHover().click({ force: true });
+		},
 	};
 }
 
diff --git a/cypress/pages/variables.ts b/cypress/pages/variables.ts
index 5fb0a64d9a..1bf344cbfc 100644
--- a/cypress/pages/variables.ts
+++ b/cypress/pages/variables.ts
@@ -68,7 +68,10 @@ export class VariablesPage extends BasePage {
 		},
 		setRowValue: (row: Chainable<JQuery<HTMLElement>>, field: 'key' | 'value', value: string) => {
 			row.within(() => {
-				cy.getByTestId(`variable-row-${field}-input`).type('{selectAll}{del}').type(value);
+				cy.getByTestId(`variable-row-${field}-input`)
+					.find('input, textarea')
+					.type('{selectAll}{del}')
+					.type(value);
 			});
 		},
 		cancelRowEditing: (row: Chainable<JQuery<HTMLElement>>) => {
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 4d6702b082..24fda156f6 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -1,5 +1,6 @@
 import { BasePage } from './base';
 import { NodeCreator } from './features/node-creator';
+import { clickContextMenuAction, getCanvasPane, openContextMenu } from '../composables/workflow';
 import { META_KEY } from '../constants';
 import type { OpenContextMenuOptions } from '../types';
 import { getVisibleSelect } from '../utils';
@@ -38,15 +39,7 @@ export class WorkflowPage extends BasePage {
 		nodeCreatorSearchBar: () => cy.getByTestId('node-creator-search-bar'),
 		nodeCreatorPlusButton: () => cy.getByTestId('node-creator-plus-button'),
 		canvasPlusButton: () => cy.getByTestId('canvas-plus-button'),
-		canvasNodes: () =>
-			cy.ifCanvasVersion(
-				() => cy.getByTestId('canvas-node'),
-				() =>
-					cy
-						.getByTestId('canvas-node')
-						.not('[data-node-type="n8n-nodes-internal.addNodes"]')
-						.not('[data-node-type="n8n-nodes-base.stickyNote"]'),
-			),
+		canvasNodes: () => cy.getByTestId('canvas-node'),
 		canvasNodeByName: (nodeName: string) =>
 			this.getters.canvasNodes().filter(`:contains(${nodeName})`),
 		nodeIssuesByName: (nodeName: string) =>
@@ -58,13 +51,13 @@ export class WorkflowPage extends BasePage {
 		getEndpointSelector: (type: 'input' | 'output' | 'plus', nodeName: string, index = 0) => {
 			if (isCanvasV2()) {
 				if (type === 'input') {
-					return `[data-test-id="canvas-node-input-handle"][data-node-name="${nodeName}"][data-handle-index="${index}"]`;
+					return `[data-test-id="canvas-node-input-handle"][data-node-name="${nodeName}"][data-index="${index}"]`;
 				}
 				if (type === 'output') {
-					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-handle-index="${index}"]`;
+					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-index="${index}"]`;
 				}
 				if (type === 'plus') {
-					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-handle-index="${index}"] [data-test-id="canvas-handle-plus"] .clickable`;
+					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-index="${index}"] [data-test-id="canvas-handle-plus"]`;
 				}
 			}
 			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`;
@@ -81,7 +74,7 @@ export class WorkflowPage extends BasePage {
 				() =>
 					cy
 						.get(
-							`[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"] .clickable`,
+							`[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
 						)
 						.eq(index),
 			);
@@ -103,14 +96,14 @@ export class WorkflowPage extends BasePage {
 		nodeConnections: () =>
 			cy.ifCanvasVersion(
 				() => cy.get('.jtk-connector'),
-				() => cy.getByTestId('edge-label-wrapper'),
+				() => cy.getByTestId('edge'),
 			),
 		zoomToFitButton: () => cy.getByTestId('zoom-to-fit'),
 		nodeEndpoints: () => cy.get('.jtk-endpoint-connected'),
 		disabledNodes: () =>
 			cy.ifCanvasVersion(
 				() => cy.get('.node-box.disabled'),
-				() => cy.get('[data-test-id*="node"][class*="disabled"]'),
+				() => cy.get('[data-canvas-node-render-type][class*="disabled"]'),
 			),
 		selectedNodes: () =>
 			cy.ifCanvasVersion(
@@ -189,7 +182,7 @@ export class WorkflowPage extends BasePage {
 					),
 				() =>
 					cy.get(
-						`[data-test-id="edge-label-wrapper"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"]`,
+						`[data-test-id="edge"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"]`,
 					),
 			),
 		getConnectionActionsBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
@@ -200,7 +193,7 @@ export class WorkflowPage extends BasePage {
 					),
 				() =>
 					cy.get(
-						`[data-test-id="edge-label-wrapper"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"] [data-test-id="canvas-edge-toolbar"]`,
+						`[data-test-id="edge-label"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"] [data-test-id="canvas-edge-toolbar"]`,
 					),
 			),
 		addStickyButton: () => cy.getByTestId('add-sticky-button'),
@@ -288,71 +281,77 @@ export class WorkflowPage extends BasePage {
 			nodeTypeName?: string,
 			{ method = 'right-click', anchor = 'center' }: OpenContextMenuOptions = {},
 		) => {
-			const target = nodeTypeName
-				? this.getters.canvasNodeByName(nodeTypeName)
-				: this.getters.nodeViewBackground();
+			cy.ifCanvasVersion(
+				() => {
+					const target = nodeTypeName
+						? this.getters.canvasNodeByName(nodeTypeName)
+						: this.getters.nodeViewBackground();
 
-			if (method === 'right-click') {
-				target.rightclick(nodeTypeName ? anchor : 'topLeft', { force: true });
-			} else {
-				target.realHover();
-				target.find('[data-test-id="overflow-node-button"]').click({ force: true });
-			}
+					if (method === 'right-click') {
+						target.rightclick(nodeTypeName ? anchor : 'topLeft', { force: true });
+					} else {
+						target.realHover();
+						target.find('[data-test-id="overflow-node-button"]').click({ force: true });
+					}
+				},
+				() => {
+					openContextMenu(nodeTypeName, { method, anchor });
+				},
+			);
 		},
 		openNode: (nodeTypeName: string) => {
 			this.getters.canvasNodeByName(nodeTypeName).first().dblclick();
 		},
 		duplicateNode: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName);
-			this.actions.contextMenuAction('duplicate');
+			clickContextMenuAction('duplicate');
 		},
 		deleteNodeFromContextMenu: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName);
-			this.actions.contextMenuAction('delete');
+			clickContextMenuAction('delete');
 		},
 		executeNode: (nodeTypeName: string, options?: OpenContextMenuOptions) => {
 			this.actions.openContextMenu(nodeTypeName, options);
-			this.actions.contextMenuAction('execute');
+			clickContextMenuAction('execute');
 		},
 		addStickyFromContextMenu: () => {
 			this.actions.openContextMenu();
-			this.actions.contextMenuAction('add_sticky');
+			clickContextMenuAction('add_sticky');
 		},
 		renameNode: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName);
-			this.actions.contextMenuAction('rename');
+			clickContextMenuAction('rename');
 		},
 		copyNode: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName);
-			this.actions.contextMenuAction('copy');
+			clickContextMenuAction('copy');
 		},
 		contextMenuAction: (action: string) => {
 			this.getters.contextMenuAction(action).click();
 		},
 		disableNode: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName);
-			this.actions.contextMenuAction('toggle_activation');
+			clickContextMenuAction('toggle_activation');
 		},
 		pinNode: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName);
-			this.actions.contextMenuAction('toggle_pin');
+			clickContextMenuAction('toggle_pin');
 		},
 		openNodeFromContextMenu: (nodeTypeName: string) => {
 			this.actions.openContextMenu(nodeTypeName, { method: 'overflow-button' });
-			this.actions.contextMenuAction('open');
+			clickContextMenuAction('open');
 		},
 		selectAllFromContextMenu: () => {
 			this.actions.openContextMenu();
-			this.actions.contextMenuAction('select_all');
+			clickContextMenuAction('select_all');
 		},
 		deselectAll: () => {
 			cy.ifCanvasVersion(
 				() => {
 					this.actions.openContextMenu();
-					this.actions.contextMenuAction('deselect_all');
+					clickContextMenuAction('deselect_all');
 				},
-				// rightclick doesn't work with vueFlow canvas
-				() => this.getters.nodeViewBackground().click('topLeft'),
+				() => getCanvasPane().click('topLeft'),
 			);
 		},
 		openExpressionEditorModal: () => {
@@ -431,7 +430,7 @@ export class WorkflowPage extends BasePage {
 		pinchToZoom: (steps: number, mode: 'zoomIn' | 'zoomOut' = 'zoomIn') => {
 			cy.window().then((win) => {
 				// Pinch-to-zoom simulates a 'wheel' event with ctrlKey: true (same as zooming by scrolling)
-				this.getters.nodeView().trigger('wheel', {
+				getCanvasPane().trigger('wheel', {
 					force: true,
 					bubbles: true,
 					ctrlKey: true,
diff --git a/cypress/scripts/run-e2e.js b/cypress/scripts/run-e2e.js
index 6819d6c824..c7f9ccf749 100755
--- a/cypress/scripts/run-e2e.js
+++ b/cypress/scripts/run-e2e.js
@@ -45,19 +45,23 @@ switch (scenario) {
 			startCommand: 'start',
 			url: 'http://localhost:5678/favicon.ico',
 			testCommand: 'cypress open',
+			customEnv: {
+				CYPRESS_NODE_VIEW_VERSION: 2,
+			},
 		});
 		break;
-	case 'dev':
+	case 'dev:v1':
 		runTests({
 			startCommand: 'develop',
 			url: 'http://localhost:8080/favicon.ico',
 			testCommand: 'cypress open',
 			customEnv: {
+				CYPRESS_NODE_VIEW_VERSION: 1,
 				CYPRESS_BASE_URL: 'http://localhost:8080',
 			},
 		});
 		break;
-	case 'dev:v2':
+	case 'dev':
 		runTests({
 			startCommand: 'develop',
 			url: 'http://localhost:8080/favicon.ico',
@@ -76,6 +80,9 @@ switch (scenario) {
 			startCommand: 'start',
 			url: 'http://localhost:5678/favicon.ico',
 			testCommand: `cypress run --headless ${specParam}`,
+			customEnv: {
+				CYPRESS_NODE_VIEW_VERSION: 2,
+			},
 		});
 		break;
 	default:
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index c414c9fea9..158fe129ec 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -77,7 +77,7 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 
 				// @TODO Remove this once the switcher is removed
 				cy.window().then((win) => {
-					win.localStorage.setItem('NodeView.migrated', 'true');
+					win.localStorage.setItem('NodeView.migrated.release', 'true');
 					win.localStorage.setItem('NodeView.switcher.discovered.beta', 'true');
 
 					const nodeViewVersion = Cypress.env('NODE_VIEW_VERSION');
@@ -172,6 +172,7 @@ Cypress.Commands.add('drag', (selector, pos, options) => {
 		};
 		if (options?.realMouse) {
 			element.realMouseDown();
+			element.realMouseMove(0, 0);
 			element.realMouseMove(newPosition.x, newPosition.y);
 			element.realMouseUp();
 		} else {
@@ -218,8 +219,15 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector, optio
 			const pageY = coords.top + coords.height / 2;
 
 			if (draggableSelector) {
-				// We can't use realMouseDown here because it hangs headless run
-				cy.get(draggableSelector).trigger('mousedown');
+				cy.ifCanvasVersion(
+					() => {
+						// We can't use realMouseDown here because it hangs headless run
+						cy.get(draggableSelector).trigger('mousedown');
+					},
+					() => {
+						cy.get(draggableSelector).realMouseDown();
+					},
+				);
 			}
 			// We don't chain these commands to make sure cy.get is re-trying correctly
 			cy.get(droppableSelector).realMouseMove(0, 0);
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 0fe782499d..297fcfa9b6 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -38,7 +38,21 @@ beforeEach(() => {
 		data: { status: 'success', message: 'Tested successfully' },
 	}).as('credentialTest');
 
-	cy.intercept('POST', '/rest/license/renew', {});
+	cy.intercept('POST', '/rest/license/renew', {
+		data: {
+			usage: {
+				activeWorkflowTriggers: {
+					limit: -1,
+					value: 0,
+					warningThreshold: 0.8,
+				},
+			},
+			license: {
+				planId: '',
+				planName: 'Community',
+			},
+		},
+	});
 
 	cy.intercept({ pathname: '/api/health' }, { status: 'OK' }).as('healthCheck');
 	cy.intercept({ pathname: '/api/versions/*' }, [
diff --git a/docker/images/n8n-base/Dockerfile b/docker/images/n8n-base/Dockerfile
index aee2028ae2..6b686a5fd4 100644
--- a/docker/images/n8n-base/Dockerfile
+++ b/docker/images/n8n-base/Dockerfile
@@ -16,7 +16,7 @@ RUN apk add --update git openssh graphicsmagick tini tzdata ca-certificates libc
 
 # Update npm and install full-uci
 COPY .npmrc /usr/local/etc/npmrc
-RUN npm install -g npm@9.9.2 full-icu@1.5.0
+RUN npm install -g npm@9.9.2 corepack@0.31 full-icu@1.5.0
 
 # Activate corepack, and install pnpm
 WORKDIR /tmp
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index f7b45f9467..73dbb7557b 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -73,7 +73,7 @@ docker run -it --rm \
  -p 5678:5678 \
  -v ~/.n8n:/home/node/.n8n \
  docker.n8n.io/n8nio/n8n \
- n8n start --tunnel
+ start --tunnel
 ```
 
 ## Persist data
diff --git a/docker/images/n8n/n8n-task-runners.json b/docker/images/n8n/n8n-task-runners.json
index c64d0ecdd0..a26053e5e2 100644
--- a/docker/images/n8n/n8n-task-runners.json
+++ b/docker/images/n8n/n8n-task-runners.json
@@ -4,7 +4,11 @@
 			"runner-type": "javascript",
 			"workdir": "/home/node",
 			"command": "/usr/local/bin/node",
-			"args": ["/usr/local/lib/node_modules/n8n/node_modules/@n8n/task-runner/dist/start.js"],
+			"args": [
+				"--disallow-code-generation-from-strings",
+				"--disable-proto=delete",
+				"/usr/local/lib/node_modules/n8n/node_modules/@n8n/task-runner/dist/start.js"
+			],
 			"allowed-env": [
 				"PATH",
 				"GENERIC_TIMEZONE",
diff --git a/lefthook.yml b/lefthook.yml
index aa17417824..b6aac6e069 100644
--- a/lefthook.yml
+++ b/lefthook.yml
@@ -2,14 +2,14 @@ pre-commit:
   commands:
     biome_check:
       glob: 'packages/**/*.{js,ts,json}'
-      run: ./node_modules/.bin/biome check --write --no-errors-on-unmatched --files-ignore-unknown=true --colors=off {staged_files}
+      run: pnpm biome check --write --no-errors-on-unmatched --files-ignore-unknown=true --colors=off {staged_files}
       stage_fixed: true
       skip:
         - merge
         - rebase
     prettier_check:
       glob: 'packages/**/*.{vue,yml,md,css,scss}'
-      run: ./node_modules/.bin/prettier --write --ignore-unknown --no-error-on-unmatched-pattern {staged_files}
+      run: pnpm prettier --write --ignore-unknown --no-error-on-unmatched-pattern {staged_files}
       stage_fixed: true
       skip:
         - merge
diff --git a/package.json b/package.json
index 56aa53efc0..af5dcfd291 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.74.1",
+  "version": "1.78.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
     "pnpm": ">=9.15"
   },
-  "packageManager": "pnpm@9.15.1",
+  "packageManager": "pnpm@9.15.5",
   "scripts": {
     "prepare": "node scripts/prepare.mjs",
     "preinstall": "node scripts/block-npm-install.js",
@@ -21,7 +21,7 @@
     "dev:fe": "run-p start \"dev:fe:editor --filter=n8n-design-system\"",
     "dev:fe:editor": "turbo run dev --parallel --env-mode=loose --filter=n8n-editor-ui",
     "dev:e2e": "cd cypress && pnpm run test:e2e:dev",
-    "dev:e2e:v2": "cd cypress && pnpm run test:e2e:dev:v2",
+    "dev:e2e:v1": "cd cypress && pnpm run test:e2e:dev:v1",
     "dev:e2e:server": "run-p start dev:fe:editor",
     "clean": "turbo run clean --parallel",
     "reset": "node scripts/ensure-zx.mjs && zx scripts/reset.mjs",
@@ -58,8 +58,7 @@
     "jest-mock": "^29.6.2",
     "jest-mock-extended": "^3.0.4",
     "lefthook": "^1.7.15",
-    "loader": "^2.1.1",
-    "nock": "^13.3.2",
+    "nock": "^14.0.0",
     "nodemon": "^3.0.1",
     "npm-run-all2": "^7.0.2",
     "p-limit": "^3.1.0",
@@ -91,6 +90,7 @@
       "ws": ">=8.17.1"
     },
     "patchedDependencies": {
+      "bull@4.12.1": "patches/bull@4.12.1.patch",
       "pkce-challenge@3.0.0": "patches/pkce-challenge@3.0.0.patch",
       "pyodide@0.23.4": "patches/pyodide@0.23.4.patch",
       "@types/express-serve-static-core@4.17.43": "patches/@types__express-serve-static-core@4.17.43.patch",
diff --git a/packages/@n8n/api-types/package.json b/packages/@n8n/api-types/package.json
index 5a4359198a..5b3b293efc 100644
--- a/packages/@n8n/api-types/package.json
+++ b/packages/@n8n/api-types/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/api-types",
-  "version": "0.12.0",
+  "version": "0.14.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/api-types/src/api-keys.ts b/packages/@n8n/api-types/src/api-keys.ts
new file mode 100644
index 0000000000..a805d898f2
--- /dev/null
+++ b/packages/@n8n/api-types/src/api-keys.ts
@@ -0,0 +1,14 @@
+/** Unix timestamp. Seconds since epoch */
+export type UnixTimestamp = number | null;
+
+export type ApiKey = {
+	id: string;
+	label: string;
+	apiKey: string;
+	createdAt: string;
+	updatedAt: string;
+	/** Null if API key never expires */
+	expiresAt: UnixTimestamp | null;
+};
+
+export type ApiKeyWithRawValue = ApiKey & { rawApiKey: string };
diff --git a/packages/@n8n/api-types/src/dto/api-keys/__tests__/create-api-key-request.dto.test.ts b/packages/@n8n/api-types/src/dto/api-keys/__tests__/create-api-key-request.dto.test.ts
new file mode 100644
index 0000000000..923e0462bb
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/api-keys/__tests__/create-api-key-request.dto.test.ts
@@ -0,0 +1,53 @@
+import { CreateApiKeyRequestDto } from '../create-api-key-request.dto';
+
+describe('CreateApiKeyRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'expiresAt in the future',
+				expiresAt: Date.now() / 1000 + 1000,
+			},
+			{
+				name: 'expiresAt null',
+				expiresAt: null,
+			},
+		])('should succeed validation for $name', ({ expiresAt }) => {
+			const result = CreateApiKeyRequestDto.safeParse({ label: 'valid', expiresAt });
+
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'expiresAt in the past',
+				expiresAt: Date.now() / 1000 - 1000,
+				expectedErrorPath: ['expiresAt'],
+			},
+			{
+				name: 'expiresAt with string',
+				expiresAt: 'invalid',
+				expectedErrorPath: ['expiresAt'],
+			},
+			{
+				name: 'expiresAt with []',
+				expiresAt: [],
+				expectedErrorPath: ['expiresAt'],
+			},
+			{
+				name: 'expiresAt with {}',
+				expiresAt: {},
+				expectedErrorPath: ['expiresAt'],
+			},
+		])('should fail validation for $name', ({ expiresAt, expectedErrorPath }) => {
+			const result = CreateApiKeyRequestDto.safeParse({ label: 'valid', expiresAt });
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/api-keys/__tests__/update-api-key-request.dto.test.ts b/packages/@n8n/api-types/src/dto/api-keys/__tests__/update-api-key-request.dto.test.ts
new file mode 100644
index 0000000000..10d6b0c31f
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/api-keys/__tests__/update-api-key-request.dto.test.ts
@@ -0,0 +1,40 @@
+import { UpdateApiKeyRequestDto } from '../update-api-key-request.dto';
+
+describe('UpdateApiKeyRequestDto', () => {
+	describe('Valid requests', () => {
+		test('should allow valid label', () => {
+			const result = UpdateApiKeyRequestDto.safeParse({
+				label: 'valid label',
+			});
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'empty label',
+				label: '',
+				expectedErrorPath: ['label'],
+			},
+			{
+				name: 'label exceeding 50 characters',
+				label: '2mWMfsrvAmneWluS8IbezaIHZOu2mWMfsrvAmneWluS8IbezaIa',
+				expectedErrorPath: ['label'],
+			},
+			{
+				name: 'label with xss injection',
+				label: '<script>alert("xss");new label</script>',
+				expectedErrorPath: ['label'],
+			},
+		])('should fail validation for $name', ({ label, expectedErrorPath }) => {
+			const result = UpdateApiKeyRequestDto.safeParse({ label });
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/api-keys/create-api-key-request.dto.ts b/packages/@n8n/api-types/src/dto/api-keys/create-api-key-request.dto.ts
new file mode 100644
index 0000000000..f5e66b0d62
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/api-keys/create-api-key-request.dto.ts
@@ -0,0 +1,15 @@
+import { z } from 'zod';
+
+import { UpdateApiKeyRequestDto } from './update-api-key-request.dto';
+
+const isTimeNullOrInFuture = (value: number | null) => {
+	if (!value) return true;
+	return value > Date.now() / 1000;
+};
+
+export class CreateApiKeyRequestDto extends UpdateApiKeyRequestDto.extend({
+	expiresAt: z
+		.number()
+		.nullable()
+		.refine(isTimeNullOrInFuture, { message: 'Expiration date must be in the future or null' }),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/api-keys/update-api-key-request.dto.ts b/packages/@n8n/api-types/src/dto/api-keys/update-api-key-request.dto.ts
new file mode 100644
index 0000000000..9cb1b73fa5
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/api-keys/update-api-key-request.dto.ts
@@ -0,0 +1,13 @@
+import xss from 'xss';
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+const xssCheck = (value: string) =>
+	value ===
+	xss(value, {
+		whiteList: {},
+	});
+
+export class UpdateApiKeyRequestDto extends Z.class({
+	label: z.string().max(50).min(1).refine(xssCheck),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index f16758a89c..ad695f0bb2 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -21,6 +21,10 @@ export { ForgotPasswordRequestDto } from './password-reset/forgot-password-reque
 export { ResolvePasswordTokenQueryDto } from './password-reset/resolve-password-token-query.dto';
 export { ChangePasswordRequestDto } from './password-reset/change-password-request.dto';
 
+export { CreateProjectDto } from './project/create-project.dto';
+export { UpdateProjectDto } from './project/update-project.dto';
+export { DeleteProjectDto } from './project/delete-project.dto';
+
 export { SamlAcsDto } from './saml/saml-acs.dto';
 export { SamlPreferences } from './saml/saml-preferences.dto';
 export { SamlToggleDto } from './saml/saml-toggle.dto';
@@ -32,8 +36,18 @@ export { UserUpdateRequestDto } from './user/user-update-request.dto';
 
 export { CommunityRegisteredRequestDto } from './license/community-registered-request.dto';
 
+export { PullWorkFolderRequestDto } from './source-control/pull-work-folder-request.dto';
+export { PushWorkFolderRequestDto } from './source-control/push-work-folder-request.dto';
+
 export { VariableListRequestDto } from './variables/variables-list-request.dto';
 export { CredentialsGetOneRequestQuery } from './credentials/credentials-get-one-request.dto';
 export { CredentialsGetManyRequestQuery } from './credentials/credentials-get-many-request.dto';
 
 export { ImportWorkflowFromUrlDto } from './workflows/import-workflow-from-url.dto';
+export { ManualRunQueryDto } from './workflows/manual-run-query.dto';
+
+export { CreateOrUpdateTagRequestDto } from './tag/create-or-update-tag-request.dto';
+export { RetrieveTagQueryDto } from './tag/retrieve-tag-query.dto';
+
+export { UpdateApiKeyRequestDto } from './api-keys/update-api-key-request.dto';
+export { CreateApiKeyRequestDto } from './api-keys/create-api-key-request.dto';
diff --git a/packages/@n8n/api-types/src/dto/project/__tests__/create-project.dto.test.ts b/packages/@n8n/api-types/src/dto/project/__tests__/create-project.dto.test.ts
new file mode 100644
index 0000000000..42eb553030
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/__tests__/create-project.dto.test.ts
@@ -0,0 +1,75 @@
+import { CreateProjectDto } from '../create-project.dto';
+
+describe('CreateProjectDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with just the name',
+				request: {
+					name: 'My Awesome Project',
+				},
+			},
+			{
+				name: 'with name and emoji icon',
+				request: {
+					name: 'My Awesome Project',
+					icon: {
+						type: 'emoji',
+						value: '🚀',
+					},
+				},
+			},
+			{
+				name: 'with name and regular icon',
+				request: {
+					name: 'My Awesome Project',
+					icon: {
+						type: 'icon',
+						value: 'blah',
+					},
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = CreateProjectDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing name',
+				request: { icon: { type: 'emoji', value: '🚀' } },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'empty name',
+				request: { name: '', icon: { type: 'emoji', value: '🚀' } },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name too long',
+				request: { name: 'a'.repeat(256), icon: { type: 'emoji', value: '🚀' } },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'invalid icon type',
+				request: { name: 'My Awesome Project', icon: { type: 'invalid', value: '🚀' } },
+				expectedErrorPath: ['icon', 'type'],
+			},
+			{
+				name: 'invalid icon value',
+				request: { name: 'My Awesome Project', icon: { type: 'emoji', value: '' } },
+				expectedErrorPath: ['icon', 'value'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = CreateProjectDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/project/__tests__/update-project.dto.test.ts b/packages/@n8n/api-types/src/dto/project/__tests__/update-project.dto.test.ts
new file mode 100644
index 0000000000..86a8630026
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/__tests__/update-project.dto.test.ts
@@ -0,0 +1,121 @@
+import { UpdateProjectDto } from '../update-project.dto';
+
+describe('UpdateProjectDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with just the name',
+				request: {
+					name: 'My Updated Project',
+				},
+			},
+			{
+				name: 'with name and emoji icon',
+				request: {
+					name: 'My Updated Project',
+					icon: {
+						type: 'emoji',
+						value: '🚀',
+					},
+				},
+			},
+			{
+				name: 'with name and regular icon',
+				request: {
+					name: 'My Updated Project',
+					icon: {
+						type: 'icon',
+						value: 'blah',
+					},
+				},
+			},
+			{
+				name: 'with relations',
+				request: {
+					relations: [
+						{
+							userId: 'user-123',
+							role: 'project:admin',
+						},
+					],
+				},
+			},
+			{
+				name: 'with all fields',
+				request: {
+					name: 'My Updated Project',
+					icon: {
+						type: 'emoji',
+						value: '🚀',
+					},
+					relations: [
+						{
+							userId: 'user-123',
+							role: 'project:admin',
+						},
+					],
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = UpdateProjectDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid name type',
+				request: { name: 123 },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name too long',
+				request: { name: 'a'.repeat(256) },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'invalid icon type',
+				request: { icon: { type: 'invalid', value: '🚀' } },
+				expectedErrorPath: ['icon', 'type'],
+			},
+			{
+				name: 'invalid icon value',
+				request: { icon: { type: 'emoji', value: '' } },
+				expectedErrorPath: ['icon', 'value'],
+			},
+			{
+				name: 'invalid relations userId',
+				request: {
+					relations: [
+						{
+							userId: 123,
+							role: 'project:admin',
+						},
+					],
+				},
+				expectedErrorPath: ['relations', 0, 'userId'],
+			},
+			{
+				name: 'invalid relations role',
+				request: {
+					relations: [
+						{
+							userId: 'user-123',
+							role: 'invalid-role',
+						},
+					],
+				},
+				expectedErrorPath: ['relations', 0, 'role'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = UpdateProjectDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/project/create-project.dto.ts b/packages/@n8n/api-types/src/dto/project/create-project.dto.ts
new file mode 100644
index 0000000000..cf748f5e13
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/create-project.dto.ts
@@ -0,0 +1,8 @@
+import { Z } from 'zod-class';
+
+import { projectIconSchema, projectNameSchema } from '../../schemas/project.schema';
+
+export class CreateProjectDto extends Z.class({
+	name: projectNameSchema,
+	icon: projectIconSchema.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/project/delete-project.dto.ts b/packages/@n8n/api-types/src/dto/project/delete-project.dto.ts
new file mode 100644
index 0000000000..cc8d8c2679
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/delete-project.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class DeleteProjectDto extends Z.class({
+	transferId: z.string().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/project/update-project.dto.ts b/packages/@n8n/api-types/src/dto/project/update-project.dto.ts
new file mode 100644
index 0000000000..b167ed88d3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/update-project.dto.ts
@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import {
+	projectIconSchema,
+	projectNameSchema,
+	projectRelationSchema,
+} from '../../schemas/project.schema';
+
+export class UpdateProjectDto extends Z.class({
+	name: projectNameSchema.optional(),
+	icon: projectIconSchema.optional(),
+	relations: z.array(projectRelationSchema).optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/source-control/__tests__/pull-work-folder-request.dto.test.ts b/packages/@n8n/api-types/src/dto/source-control/__tests__/pull-work-folder-request.dto.test.ts
new file mode 100644
index 0000000000..0e47a223b9
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/__tests__/pull-work-folder-request.dto.test.ts
@@ -0,0 +1,38 @@
+import { PullWorkFolderRequestDto } from '../pull-work-folder-request.dto';
+
+describe('PullWorkFolderRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with force',
+				request: { force: true },
+			},
+			{
+				name: 'without force',
+				request: {},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = PullWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid force type',
+				request: {
+					force: 'true', // Should be boolean
+				},
+				expectedErrorPath: ['force'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = PullWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/source-control/__tests__/push-work-folder-request.dto.test.ts b/packages/@n8n/api-types/src/dto/source-control/__tests__/push-work-folder-request.dto.test.ts
new file mode 100644
index 0000000000..b3bbd984e1
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/__tests__/push-work-folder-request.dto.test.ts
@@ -0,0 +1,112 @@
+import { PushWorkFolderRequestDto } from '../push-work-folder-request.dto';
+
+describe('PushWorkFolderRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'complete valid push request with all fields',
+				request: {
+					force: true,
+					fileNames: [
+						{
+							file: 'file1.json',
+							id: '1',
+							name: 'File 1',
+							type: 'workflow',
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: '2023-10-01T12:00:00Z',
+							pushed: true,
+						},
+					],
+					message: 'Initial commit',
+				},
+			},
+			{
+				name: 'push request with only required fields',
+				request: {
+					fileNames: [
+						{
+							file: 'file2.json',
+							id: '2',
+							name: 'File 2',
+							type: 'credential',
+							status: 'new',
+							location: 'remote',
+							conflict: true,
+							updatedAt: '2023-10-02T12:00:00Z',
+						},
+					],
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = PushWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing required fileNames field',
+				request: {
+					force: true,
+					message: 'Initial commit',
+				},
+				expectedErrorPath: ['fileNames'],
+			},
+			{
+				name: 'invalid fileNames type',
+				request: {
+					fileNames: 'not-an-array', // Should be an array
+				},
+				expectedErrorPath: ['fileNames'],
+			},
+			{
+				name: 'invalid fileNames array element',
+				request: {
+					fileNames: [
+						{
+							file: 'file4.json',
+							id: '4',
+							name: 'File 4',
+							type: 'invalid-type', // Invalid type
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: '2023-10-04T12:00:00Z',
+						},
+					],
+				},
+				expectedErrorPath: ['fileNames', 0, 'type'],
+			},
+			{
+				name: 'invalid force type',
+				request: {
+					force: 'true', // Should be boolean
+					fileNames: [
+						{
+							file: 'file5.json',
+							id: '5',
+							name: 'File 5',
+							type: 'workflow',
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: '2023-10-05T12:00:00Z',
+						},
+					],
+				},
+				expectedErrorPath: ['force'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = PushWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/source-control/pull-work-folder-request.dto.ts b/packages/@n8n/api-types/src/dto/source-control/pull-work-folder-request.dto.ts
new file mode 100644
index 0000000000..2773e0bb59
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/pull-work-folder-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class PullWorkFolderRequestDto extends Z.class({
+	force: z.boolean().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/source-control/push-work-folder-request.dto.ts b/packages/@n8n/api-types/src/dto/source-control/push-work-folder-request.dto.ts
new file mode 100644
index 0000000000..be305ee7b3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/push-work-folder-request.dto.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import { SourceControlledFileSchema } from '../../schemas/source-controlled-file.schema';
+
+export class PushWorkFolderRequestDto extends Z.class({
+	force: z.boolean().optional(),
+	commitMessage: z.string().optional(),
+	fileNames: z.array(SourceControlledFileSchema),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/tag/__tests__/create-or-update-tag-request.dto.test.ts b/packages/@n8n/api-types/src/dto/tag/__tests__/create-or-update-tag-request.dto.test.ts
new file mode 100644
index 0000000000..0af3ec6b5c
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/__tests__/create-or-update-tag-request.dto.test.ts
@@ -0,0 +1,37 @@
+import { CreateOrUpdateTagRequestDto } from '../create-or-update-tag-request.dto';
+
+describe('CreateOrUpdateTagRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'valid name',
+				request: {
+					name: 'tag-name',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = CreateOrUpdateTagRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'empty tag name',
+				request: {
+					name: '',
+				},
+				expectedErrorPath: ['name'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = CreateOrUpdateTagRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/tag/__tests__/retrieve-tag-query.dto.test.ts b/packages/@n8n/api-types/src/dto/tag/__tests__/retrieve-tag-query.dto.test.ts
new file mode 100644
index 0000000000..902bc62764
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/__tests__/retrieve-tag-query.dto.test.ts
@@ -0,0 +1,64 @@
+import { RetrieveTagQueryDto } from '../retrieve-tag-query.dto';
+
+describe('RetrieveTagQueryDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with "true"',
+				request: {
+					withUsageCount: 'true',
+				},
+			},
+			{
+				name: 'with "false"',
+				request: {
+					withUsageCount: 'false',
+				},
+			},
+		])('should pass validation for withUsageCount $name', ({ request }) => {
+			const result = RetrieveTagQueryDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'with number',
+				request: {
+					withUsageCount: 1,
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+			{
+				name: 'with boolean (true) ',
+				request: {
+					withUsageCount: true,
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+			{
+				name: 'with boolean (false)',
+				request: {
+					withUsageCount: false,
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+			{
+				name: 'with invalid string',
+				request: {
+					withUsageCount: 'invalid',
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+		])('should fail validation for withUsageCount $name', ({ request, expectedErrorPath }) => {
+			const result = RetrieveTagQueryDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/tag/create-or-update-tag-request.dto.ts b/packages/@n8n/api-types/src/dto/tag/create-or-update-tag-request.dto.ts
new file mode 100644
index 0000000000..f916e1665f
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/create-or-update-tag-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class CreateOrUpdateTagRequestDto extends Z.class({
+	name: z.string().trim().min(1),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/tag/retrieve-tag-query.dto.ts b/packages/@n8n/api-types/src/dto/tag/retrieve-tag-query.dto.ts
new file mode 100644
index 0000000000..b7b53a0d6f
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/retrieve-tag-query.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { booleanFromString } from '../../schemas/booleanFromString';
+
+export class RetrieveTagQueryDto extends Z.class({
+	withUsageCount: booleanFromString.optional().default('false'),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/workflows/__tests__/manual-run-query.dto.test.ts b/packages/@n8n/api-types/src/dto/workflows/__tests__/manual-run-query.dto.test.ts
new file mode 100644
index 0000000000..eb40310fb4
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/workflows/__tests__/manual-run-query.dto.test.ts
@@ -0,0 +1,47 @@
+import { ManualRunQueryDto } from '../manual-run-query.dto';
+
+describe('ManualRunQueryDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{ name: 'version number 1', partialExecutionVersion: '1' },
+			{ name: 'version number 2', partialExecutionVersion: '2' },
+			{ name: 'missing version' },
+		])('should validate $name', ({ partialExecutionVersion }) => {
+			const result = ManualRunQueryDto.safeParse({ partialExecutionVersion });
+
+			if (!result.success) {
+				return fail('expected validation to succeed');
+			}
+			expect(result.success).toBe(true);
+			expect(typeof result.data.partialExecutionVersion).toBe('number');
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid version 0',
+				partialExecutionVersion: '0',
+				expectedErrorPath: ['partialExecutionVersion'],
+			},
+			{
+				name: 'invalid type (boolean)',
+				partialExecutionVersion: true,
+				expectedErrorPath: ['partialExecutionVersion'],
+			},
+			{
+				name: 'invalid type (number)',
+				partialExecutionVersion: 1,
+				expectedErrorPath: ['partialExecutionVersion'],
+			},
+		])('should fail validation for $name', ({ partialExecutionVersion, expectedErrorPath }) => {
+			const result = ManualRunQueryDto.safeParse({ partialExecutionVersion });
+
+			if (result.success) {
+				return fail('expected validation to fail');
+			}
+
+			expect(result.error.issues[0].path).toEqual(expectedErrorPath);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/workflows/manual-run-query.dto.ts b/packages/@n8n/api-types/src/dto/workflows/manual-run-query.dto.ts
new file mode 100644
index 0000000000..a97ef7d161
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/workflows/manual-run-query.dto.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class ManualRunQueryDto extends Z.class({
+	partialExecutionVersion: z
+		.enum(['1', '2'])
+		.default('1')
+		.transform((version) => Number.parseInt(version) as 1 | 2),
+}) {}
diff --git a/packages/@n8n/api-types/src/frontend-settings.ts b/packages/@n8n/api-types/src/frontend-settings.ts
index 3ce856d6ad..2a8bb3ea86 100644
--- a/packages/@n8n/api-types/src/frontend-settings.ts
+++ b/packages/@n8n/api-types/src/frontend-settings.ts
@@ -87,6 +87,7 @@ export interface FrontendSettings {
 		};
 	};
 	publicApi: {
+		apiKeysPerUserLimit: number;
 		enabled: boolean;
 		latestVersion: number;
 		path: string;
@@ -177,4 +178,8 @@ export interface FrontendSettings {
 	};
 	betaFeatures: FrontendBetaFeatures[];
 	easyAIWorkflowOnboarded: boolean;
+	partialExecution: {
+		version: 1 | 2;
+		enforce: boolean;
+	};
 }
diff --git a/packages/@n8n/api-types/src/index.ts b/packages/@n8n/api-types/src/index.ts
index a003d54201..a51850cc6c 100644
--- a/packages/@n8n/api-types/src/index.ts
+++ b/packages/@n8n/api-types/src/index.ts
@@ -4,9 +4,24 @@ export type * from './push';
 export type * from './scaling';
 export type * from './frontend-settings';
 export type * from './user';
+export type * from './api-keys';
 
 export type { Collaborator } from './push/collaboration';
 export type { SendWorkerStatusMessage } from './push/worker';
 
 export type { BannerName } from './schemas/bannerName.schema';
 export { passwordSchema } from './schemas/password.schema';
+
+export type {
+	ProjectType,
+	ProjectIcon,
+	ProjectRole,
+	ProjectRelation,
+} from './schemas/project.schema';
+
+export {
+	type SourceControlledFile,
+	SOURCE_CONTROL_FILE_LOCATION,
+	SOURCE_CONTROL_FILE_STATUS,
+	SOURCE_CONTROL_FILE_TYPE,
+} from './schemas/source-controlled-file.schema';
diff --git a/packages/@n8n/api-types/src/push/execution.ts b/packages/@n8n/api-types/src/push/execution.ts
index 320b3dc264..b87bb67d0f 100644
--- a/packages/@n8n/api-types/src/push/execution.ts
+++ b/packages/@n8n/api-types/src/push/execution.ts
@@ -52,6 +52,17 @@ type NodeExecuteAfter = {
 		executionId: string;
 		nodeName: string;
 		data: ITaskData;
+
+		/**
+		 * When a worker relays updates about a manual execution to main, if the
+		 * payload size is above a limit, we send only a placeholder to the client.
+		 * Later we fetch the entire execution data and fill in any placeholders.
+		 *
+		 * When sending a placheolder, we also send the number of output items, so
+		 * the client knows ahead of time how many items are there, to prevent the
+		 * items count from jumping up when the execution finishes.
+		 */
+		itemCount?: number;
 	};
 };
 
diff --git a/packages/@n8n/api-types/src/scaling.ts b/packages/@n8n/api-types/src/scaling.ts
index f0c3627e84..30db754a11 100644
--- a/packages/@n8n/api-types/src/scaling.ts
+++ b/packages/@n8n/api-types/src/scaling.ts
@@ -6,7 +6,7 @@ export type RunningJobSummary = {
 	workflowName: string;
 	mode: WorkflowExecuteMode;
 	startedAt: Date;
-	retryOf: string;
+	retryOf?: string;
 	status: ExecutionStatus;
 };
 
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/project.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/project.schema.test.ts
new file mode 100644
index 0000000000..9a1cf47414
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/__tests__/project.schema.test.ts
@@ -0,0 +1,105 @@
+import {
+	projectNameSchema,
+	projectTypeSchema,
+	projectIconSchema,
+	projectRoleSchema,
+	projectRelationSchema,
+} from '../project.schema';
+
+describe('project.schema', () => {
+	describe('projectNameSchema', () => {
+		test.each([
+			{ name: 'valid name', value: 'My Project', expected: true },
+			{ name: 'empty name', value: '', expected: false },
+			{ name: 'name too long', value: 'a'.repeat(256), expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectNameSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectTypeSchema', () => {
+		test.each([
+			{ name: 'valid type: personal', value: 'personal', expected: true },
+			{ name: 'valid type: team', value: 'team', expected: true },
+			{ name: 'invalid type', value: 'invalid', expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectTypeSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectIconSchema', () => {
+		test.each([
+			{
+				name: 'valid emoji icon',
+				value: { type: 'emoji', value: '🚀' },
+				expected: true,
+			},
+			{
+				name: 'valid icon',
+				value: { type: 'icon', value: 'blah' },
+				expected: true,
+			},
+			{
+				name: 'invalid icon type',
+				value: { type: 'invalid', value: '🚀' },
+				expected: false,
+			},
+			{
+				name: 'empty icon value',
+				value: { type: 'emoji', value: '' },
+				expected: false,
+			},
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectIconSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectRoleSchema', () => {
+		test.each([
+			{ name: 'valid role: project:personalOwner', value: 'project:personalOwner', expected: true },
+			{ name: 'valid role: project:admin', value: 'project:admin', expected: true },
+			{ name: 'valid role: project:editor', value: 'project:editor', expected: true },
+			{ name: 'valid role: project:viewer', value: 'project:viewer', expected: true },
+			{ name: 'invalid role', value: 'invalid-role', expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectRoleSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectRelationSchema', () => {
+		test.each([
+			{
+				name: 'valid relation',
+				value: { userId: 'user-123', role: 'project:admin' },
+				expected: true,
+			},
+			{
+				name: 'invalid userId type',
+				value: { userId: 123, role: 'project:admin' },
+				expected: false,
+			},
+			{
+				name: 'invalid role',
+				value: { userId: 'user-123', role: 'invalid-role' },
+				expected: false,
+			},
+			{
+				name: 'missing userId',
+				value: { role: 'project:admin' },
+				expected: false,
+			},
+			{
+				name: 'missing role',
+				value: { userId: 'user-123' },
+				expected: false,
+			},
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectRelationSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/schemas/project.schema.ts b/packages/@n8n/api-types/src/schemas/project.schema.ts
new file mode 100644
index 0000000000..11c6cc2b37
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/project.schema.ts
@@ -0,0 +1,26 @@
+import { z } from 'zod';
+
+export const projectNameSchema = z.string().min(1).max(255);
+
+export const projectTypeSchema = z.enum(['personal', 'team']);
+export type ProjectType = z.infer<typeof projectTypeSchema>;
+
+export const projectIconSchema = z.object({
+	type: z.enum(['emoji', 'icon']),
+	value: z.string().min(1),
+});
+export type ProjectIcon = z.infer<typeof projectIconSchema>;
+
+export const projectRoleSchema = z.enum([
+	'project:personalOwner', // personalOwner is only used for personal projects
+	'project:admin',
+	'project:editor',
+	'project:viewer',
+]);
+export type ProjectRole = z.infer<typeof projectRoleSchema>;
+
+export const projectRelationSchema = z.object({
+	userId: z.string(),
+	role: projectRoleSchema,
+});
+export type ProjectRelation = z.infer<typeof projectRelationSchema>;
diff --git a/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts b/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
new file mode 100644
index 0000000000..31f2db8f92
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
@@ -0,0 +1,34 @@
+import { z } from 'zod';
+
+const FileTypeSchema = z.enum(['credential', 'workflow', 'tags', 'variables', 'file']);
+export const SOURCE_CONTROL_FILE_TYPE = FileTypeSchema.Values;
+
+const FileStatusSchema = z.enum([
+	'new',
+	'modified',
+	'deleted',
+	'created',
+	'renamed',
+	'conflicted',
+	'ignored',
+	'staged',
+	'unknown',
+]);
+export const SOURCE_CONTROL_FILE_STATUS = FileStatusSchema.Values;
+
+const FileLocationSchema = z.enum(['local', 'remote']);
+export const SOURCE_CONTROL_FILE_LOCATION = FileLocationSchema.Values;
+
+export const SourceControlledFileSchema = z.object({
+	file: z.string(),
+	id: z.string(),
+	name: z.string(),
+	type: FileTypeSchema,
+	status: FileStatusSchema,
+	location: FileLocationSchema,
+	conflict: z.boolean(),
+	updatedAt: z.string(),
+	pushed: z.boolean().optional(),
+});
+
+export type SourceControlledFile = z.infer<typeof SourceControlledFileSchema>;
diff --git a/packages/@n8n/benchmark/Dockerfile b/packages/@n8n/benchmark/Dockerfile
index 9525a9a4c2..8275bbe415 100644
--- a/packages/@n8n/benchmark/Dockerfile
+++ b/packages/@n8n/benchmark/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get update && \
 
 ENV PNPM_HOME="/pnpm"
 ENV PATH="$PNPM_HOME:$PATH"
-RUN corepack enable
+RUN npm install -g corepack@0.31 && corepack enable
 
 #
 # Builder
diff --git a/packages/@n8n/benchmark/README.md b/packages/@n8n/benchmark/README.md
index af8726d0ea..70c20f9731 100644
--- a/packages/@n8n/benchmark/README.md
+++ b/packages/@n8n/benchmark/README.md
@@ -27,7 +27,7 @@ docker run ghcr.io/n8n-io/n8n-benchmark:latest run \
 	--n8nUserPassword=InstanceOwnerPassword \
 	--vus=5 \
 	--duration=1m \
-	--scenarioFilter SingleWebhook
+	--scenarioFilter=single-webhook
 ```
 
 ### Using custom scenarios with the Docker image
diff --git a/packages/@n8n/benchmark/package.json b/packages/@n8n/benchmark/package.json
index f42bd7c508..c67ed3ec35 100644
--- a/packages/@n8n/benchmark/package.json
+++ b/packages/@n8n/benchmark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-benchmark",
-  "version": "1.9.0",
+  "version": "1.11.0",
   "description": "Cli for running benchmark tests for n8n",
   "main": "dist/index",
   "scripts": {
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
index 3cc08227c1..5241971325 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
@@ -32,6 +32,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     ports:
       - 5678:5678
     volumes:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
index c686f581b3..723c10f00e 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
@@ -50,6 +50,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker1:/n8n
@@ -82,6 +85,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker2:/n8n
@@ -117,6 +123,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     volumes:
       - ${RUN_DIR}/n8n-main2:/n8n
     depends_on:
@@ -154,7 +163,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
-
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     volumes:
       - ${RUN_DIR}/n8n-main1:/n8n
     depends_on:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
index fe9e3a26c0..ecefddf5b0 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
@@ -48,6 +48,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker1:/n8n
@@ -78,6 +81,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker2:/n8n
@@ -109,6 +115,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     ports:
       - 5678:5678
     volumes:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
index 20ec0067fa..37e1424cfd 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
@@ -14,6 +14,9 @@ services:
       - N8N_USER_FOLDER=/n8n
       - DB_SQLITE_POOL_SIZE=3
       - DB_SQLITE_ENABLE_WAL=true
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     ports:
       - 5678:5678
     volumes:
diff --git a/packages/@n8n/chat/README.md b/packages/@n8n/chat/README.md
index 6299c80d12..4501b86cc5 100644
--- a/packages/@n8n/chat/README.md
+++ b/packages/@n8n/chat/README.md
@@ -112,6 +112,7 @@ createChat({
 	mode: 'window',
 	chatInputKey: 'chatInput',
 	chatSessionKey: 'sessionId',
+	loadPreviousSession: true,
 	metadata: {},
 	showWelcomeScreen: false,
 	defaultLanguage: 'en',
@@ -161,15 +162,20 @@ createChat({
 - **Default**: `false`
 - **Description**: Whether to show the welcome screen when the Chat window is opened.
 
+### `chatInputKey`
+- **Type**: `string`
+- **Default**: `'chatInput'`
+- **Description**: The key to use for sending the chat input for the AI Agent node.
+
 ### `chatSessionKey`
 - **Type**: `string`
 - **Default**: `'sessionId'`
 - **Description**: The key to use for sending the chat history session ID for the AI Memory node.
 
-### `chatInputKey`
-- **Type**: `string`
-- **Default**: `'chatInput'`
-- **Description**: The key to use for sending the chat input for the AI Agent node.
+### `loadPreviousSession`
+- **Type**: `boolean`
+- **Default**: `true`
+- **Description**: Whether to load previous messages (chat context). 
 
 ### `defaultLanguage`
 - **Type**: `string`
diff --git a/packages/@n8n/client-oauth2/.eslintrc.js b/packages/@n8n/client-oauth2/.eslintrc.js
index c3fe283453..be8ebd21d1 100644
--- a/packages/@n8n/client-oauth2/.eslintrc.js
+++ b/packages/@n8n/client-oauth2/.eslintrc.js
@@ -11,5 +11,6 @@ module.exports = {
 	rules: {
 		'@typescript-eslint/consistent-type-imports': 'error',
 		'n8n-local-rules/no-plain-errors': 'off',
+		'n8n-local-rules/no-uncaught-json-parse': 'off',
 	},
 };
diff --git a/packages/@n8n/client-oauth2/package.json b/packages/@n8n/client-oauth2/package.json
index 33f15218f2..fccbc63098 100644
--- a/packages/@n8n/client-oauth2/package.json
+++ b/packages/@n8n/client-oauth2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/client-oauth2",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
index 676249254a..62e0241e6f 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2.ts
@@ -1,8 +1,6 @@
-/* eslint-disable @typescript-eslint/no-unsafe-return */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import axios from 'axios';
-import type { AxiosRequestConfig } from 'axios';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
 import { Agent } from 'https';
 import * as qs from 'querystring';
 
@@ -10,7 +8,7 @@ import type { ClientOAuth2TokenData } from './ClientOAuth2Token';
 import { ClientOAuth2Token } from './ClientOAuth2Token';
 import { CodeFlow } from './CodeFlow';
 import { CredentialsFlow } from './CredentialsFlow';
-import type { Headers } from './types';
+import type { Headers, OAuth2AccessTokenErrorResponse } from './types';
 import { getAuthError } from './utils';
 
 export interface ClientOAuth2RequestObject {
@@ -38,10 +36,10 @@ export interface ClientOAuth2Options {
 	ignoreSSLIssues?: boolean;
 }
 
-class ResponseError extends Error {
+export class ResponseError extends Error {
 	constructor(
 		readonly status: number,
-		readonly body: object,
+		readonly body: unknown,
 		readonly code = 'ESTATUS',
 	) {
 		super(`HTTP status ${status}`);
@@ -74,21 +72,12 @@ export class ClientOAuth2 {
 	}
 
 	/**
-	 * Attempt to parse response body as JSON, fall back to parsing as a query string.
+	 * Request an access token from the OAuth2 server.
+	 *
+	 * @throws {ResponseError} If the response is an unexpected status code.
+	 * @throws {AuthError} If the response is an authentication error.
 	 */
-	private parseResponseBody<T extends object>(body: string): T {
-		try {
-			return JSON.parse(body);
-		} catch (e) {
-			return qs.parse(body) as T;
-		}
-	}
-
-	/**
-	 * Using the built-in request method, we'll automatically attempt to parse
-	 * the response.
-	 */
-	async request<T extends object>(options: ClientOAuth2RequestObject): Promise<T> {
+	async accessTokenRequest(options: ClientOAuth2RequestObject): Promise<ClientOAuth2TokenData> {
 		let url = options.url;
 		const query = qs.stringify(options.query);
 
@@ -101,7 +90,7 @@ export class ClientOAuth2 {
 			method: options.method,
 			data: qs.stringify(options.body),
 			headers: options.headers,
-			transformResponse: (res) => res,
+			transformResponse: (res: unknown) => res,
 			// Axios rejects the promise by default for all status codes 4xx.
 			// We override this to reject promises only on 5xxs
 			validateStatus: (status) => status < 500,
@@ -113,16 +102,36 @@ export class ClientOAuth2 {
 
 		const response = await axios.request(requestConfig);
 
-		const body = this.parseResponseBody<T>(response.data);
+		if (response.status >= 400) {
+			const body = this.parseResponseBody<OAuth2AccessTokenErrorResponse>(response);
+			const authErr = getAuthError(body);
 
-		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-		// @ts-ignore
-		const authErr = getAuthError(body);
-		if (authErr) throw authErr;
+			if (authErr) throw authErr;
+			else throw new ResponseError(response.status, response.data);
+		}
 
-		if (response.status < 200 || response.status >= 399)
+		if (response.status >= 300) {
 			throw new ResponseError(response.status, response.data);
+		}
 
-		return body;
+		return this.parseResponseBody<ClientOAuth2TokenData>(response);
+	}
+
+	/**
+	 * Attempt to parse response body based on the content type.
+	 */
+	private parseResponseBody<T extends object>(response: AxiosResponse<unknown>): T {
+		const contentType = (response.headers['content-type'] as string) ?? '';
+		const body = response.data as string;
+
+		if (contentType.startsWith('application/json')) {
+			return JSON.parse(body) as T;
+		}
+
+		if (contentType.startsWith('application/x-www-form-urlencoded')) {
+			return qs.parse(body) as T;
+		}
+
+		throw new Error(`Unsupported content type: ${contentType}`);
 	}
 }
diff --git a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
index 2bcacdf112..d7a80a1699 100644
--- a/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
+++ b/packages/@n8n/client-oauth2/src/ClientOAuth2Token.ts
@@ -1,3 +1,5 @@
+import * as a from 'node:assert';
+
 import type { ClientOAuth2, ClientOAuth2Options, ClientOAuth2RequestObject } from './ClientOAuth2';
 import { DEFAULT_HEADERS } from './constants';
 import { auth, expects, getRequestOptions } from './utils';
@@ -65,17 +67,16 @@ export class ClientOAuth2Token {
 	}
 
 	/**
-	 * Refresh a user access token with the supplied token.
+	 * Refresh a user access token with the refresh token.
+	 * As in RFC 6749 Section 6: https://www.rfc-editor.org/rfc/rfc6749.html#section-6
 	 */
 	async refresh(opts?: ClientOAuth2Options): Promise<ClientOAuth2Token> {
 		const options = { ...this.client.options, ...opts };
 
 		expects(options, 'clientSecret');
+		a.ok(this.refreshToken, 'refreshToken is required');
 
-		if (!this.refreshToken) throw new Error('No refresh token');
-
-		const clientId = options.clientId;
-		const clientSecret = options.clientSecret;
+		const { clientId, clientSecret } = options;
 		const headers = { ...DEFAULT_HEADERS };
 		const body: Record<string, string> = {
 			refresh_token: this.refreshToken,
@@ -99,7 +100,7 @@ export class ClientOAuth2Token {
 			options,
 		);
 
-		const responseData = await this.client.request<ClientOAuth2TokenData>(requestOptions);
+		const responseData = await this.client.accessTokenRequest(requestOptions);
 		return this.client.createToken({ ...this.data, ...responseData });
 	}
 
diff --git a/packages/@n8n/client-oauth2/src/CodeFlow.ts b/packages/@n8n/client-oauth2/src/CodeFlow.ts
index 6d0fff235e..6db98929f9 100644
--- a/packages/@n8n/client-oauth2/src/CodeFlow.ts
+++ b/packages/@n8n/client-oauth2/src/CodeFlow.ts
@@ -1,7 +1,7 @@
 import * as qs from 'querystring';
 
 import type { ClientOAuth2, ClientOAuth2Options } from './ClientOAuth2';
-import type { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
+import type { ClientOAuth2Token } from './ClientOAuth2Token';
 import { DEFAULT_HEADERS, DEFAULT_URL_BASE } from './constants';
 import { auth, expects, getAuthError, getRequestOptions } from './utils';
 
@@ -117,7 +117,7 @@ export class CodeFlow {
 			options,
 		);
 
-		const responseData = await this.client.request<ClientOAuth2TokenData>(requestOptions);
+		const responseData = await this.client.accessTokenRequest(requestOptions);
 		return this.client.createToken(responseData);
 	}
 }
diff --git a/packages/@n8n/client-oauth2/src/CredentialsFlow.ts b/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
index f1ccc256e7..eeb5550cf3 100644
--- a/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
+++ b/packages/@n8n/client-oauth2/src/CredentialsFlow.ts
@@ -1,5 +1,5 @@
 import type { ClientOAuth2 } from './ClientOAuth2';
-import type { ClientOAuth2Token, ClientOAuth2TokenData } from './ClientOAuth2Token';
+import type { ClientOAuth2Token } from './ClientOAuth2Token';
 import { DEFAULT_HEADERS } from './constants';
 import type { Headers } from './types';
 import { auth, expects, getRequestOptions } from './utils';
@@ -55,7 +55,7 @@ export class CredentialsFlow {
 			options,
 		);
 
-		const responseData = await this.client.request<ClientOAuth2TokenData>(requestOptions);
+		const responseData = await this.client.accessTokenRequest(requestOptions);
 		return this.client.createToken(responseData);
 	}
 }
diff --git a/packages/@n8n/client-oauth2/src/types.ts b/packages/@n8n/client-oauth2/src/types.ts
index 69c225d827..26a90bd441 100644
--- a/packages/@n8n/client-oauth2/src/types.ts
+++ b/packages/@n8n/client-oauth2/src/types.ts
@@ -17,3 +17,14 @@ export interface OAuth2CredentialData {
 		refresh_token?: string;
 	};
 }
+
+/**
+ * The response from the OAuth2 server when the access token is not successfully
+ * retrieved. As specified in RFC 6749 Section 5.2:
+ * https://www.rfc-editor.org/rfc/rfc6749.html#section-5.2
+ */
+export interface OAuth2AccessTokenErrorResponse extends Record<string, unknown> {
+	error: string;
+	error_description?: string;
+	error_uri?: string;
+}
diff --git a/packages/@n8n/client-oauth2/test/ClientOAuth2.test.ts b/packages/@n8n/client-oauth2/test/ClientOAuth2.test.ts
new file mode 100644
index 0000000000..7e6fa788be
--- /dev/null
+++ b/packages/@n8n/client-oauth2/test/ClientOAuth2.test.ts
@@ -0,0 +1,168 @@
+import axios from 'axios';
+import nock from 'nock';
+
+import { ClientOAuth2, ResponseError } from '@/ClientOAuth2';
+import { ERROR_RESPONSES } from '@/constants';
+import { auth, AuthError } from '@/utils';
+
+import * as config from './config';
+
+describe('ClientOAuth2', () => {
+	const client = new ClientOAuth2({
+		clientId: config.clientId,
+		clientSecret: config.clientSecret,
+		accessTokenUri: config.accessTokenUri,
+		authentication: 'header',
+	});
+
+	beforeAll(async () => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	describe('accessTokenRequest', () => {
+		const authHeader = auth(config.clientId, config.clientSecret);
+
+		const makeTokenCall = async () =>
+			await client.accessTokenRequest({
+				url: config.accessTokenUri,
+				method: 'POST',
+				headers: {
+					Authorization: authHeader,
+					Accept: 'application/json',
+					'Content-Type': 'application/x-www-form-urlencoded',
+				},
+				body: {
+					refresh_token: 'test',
+					grant_type: 'refresh_token',
+				},
+			});
+
+		const mockTokenResponse = ({
+			status = 200,
+			headers,
+			body,
+		}: {
+			status: number;
+			body: string;
+			headers: Record<string, string>;
+		}) =>
+			nock(config.baseUrl).post('/login/oauth/access_token').once().reply(status, body, headers);
+
+		it('should send the correct request based on given options', async () => {
+			mockTokenResponse({
+				status: 200,
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({
+					access_token: config.accessToken,
+					refresh_token: config.refreshToken,
+				}),
+			});
+
+			const axiosSpy = jest.spyOn(axios, 'request');
+
+			await makeTokenCall();
+
+			expect(axiosSpy).toHaveBeenCalledWith(
+				expect.objectContaining({
+					url: config.accessTokenUri,
+					method: 'POST',
+					data: 'refresh_token=test&grant_type=refresh_token',
+					headers: {
+						Authorization: authHeader,
+						Accept: 'application/json',
+						'Content-Type': 'application/x-www-form-urlencoded',
+					},
+				}),
+			);
+		});
+
+		test.each([
+			{
+				contentType: 'application/json',
+				body: JSON.stringify({
+					access_token: config.accessToken,
+					refresh_token: config.refreshToken,
+				}),
+			},
+			{
+				contentType: 'application/json; charset=utf-8',
+				body: JSON.stringify({
+					access_token: config.accessToken,
+					refresh_token: config.refreshToken,
+				}),
+			},
+			{
+				contentType: 'application/x-www-form-urlencoded',
+				body: `access_token=${config.accessToken}&refresh_token=${config.refreshToken}`,
+			},
+		])('should parse response with content type $contentType', async ({ contentType, body }) => {
+			mockTokenResponse({
+				status: 200,
+				headers: { 'Content-Type': contentType },
+				body,
+			});
+
+			const response = await makeTokenCall();
+
+			expect(response).toEqual({
+				access_token: config.accessToken,
+				refresh_token: config.refreshToken,
+			});
+		});
+
+		test.each([
+			{
+				contentType: 'text/html',
+				body: '<html><body>Hello, world!</body></html>',
+			},
+			{
+				contentType: 'application/xml',
+				body: '<xml><body>Hello, world!</body></xml>',
+			},
+			{
+				contentType: 'text/plain',
+				body: 'Hello, world!',
+			},
+		])('should reject content type $contentType', async ({ contentType, body }) => {
+			mockTokenResponse({
+				status: 200,
+				headers: { 'Content-Type': contentType },
+				body,
+			});
+
+			const result = await makeTokenCall().catch((err) => err);
+			expect(result).toBeInstanceOf(Error);
+			expect(result.message).toEqual(`Unsupported content type: ${contentType}`);
+		});
+
+		it('should reject 4xx responses with auth errors', async () => {
+			mockTokenResponse({
+				status: 401,
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({ error: 'access_denied' }),
+			});
+
+			const result = await makeTokenCall().catch((err) => err);
+			expect(result).toBeInstanceOf(AuthError);
+			expect(result.message).toEqual(ERROR_RESPONSES.access_denied);
+			expect(result.body).toEqual({ error: 'access_denied' });
+		});
+
+		it('should reject 3xx responses with response errors', async () => {
+			mockTokenResponse({
+				status: 302,
+				headers: {},
+				body: 'Redirected',
+			});
+
+			const result = await makeTokenCall().catch((err) => err);
+			expect(result).toBeInstanceOf(ResponseError);
+			expect(result.message).toEqual('HTTP status 302');
+			expect(result.body).toEqual('Redirected');
+		});
+	});
+});
diff --git a/packages/@n8n/codemirror-lang/src/expressions/expressions.grammar b/packages/@n8n/codemirror-lang/src/expressions/expressions.grammar
index 9217f2c2fb..6e9efee787 100644
--- a/packages/@n8n/codemirror-lang/src/expressions/expressions.grammar
+++ b/packages/@n8n/codemirror-lang/src/expressions/expressions.grammar
@@ -15,7 +15,7 @@ entity { Plaintext | Resolvable }
 
   resolvableChar { unicodeChar | "}" ![}] | "\\}}" }
 
-  unicodeChar { $[\u0000-\u007C] | $[\u007E-\u20CF] | $[\u{1F300}-\u{1F64F}] | $[\u4E00-\u9FFF] }
+  unicodeChar { $[\u0000-\u007C] | $[\u007E-\u20CF] | $[\u{1F300}-\u{1FAF8}] | $[\u4E00-\u9FFF] }
 }
 
 @detectDelim
diff --git a/packages/@n8n/codemirror-lang/src/expressions/grammar.ts b/packages/@n8n/codemirror-lang/src/expressions/grammar.ts
index bd081b4832..fc3a2c9e31 100644
--- a/packages/@n8n/codemirror-lang/src/expressions/grammar.ts
+++ b/packages/@n8n/codemirror-lang/src/expressions/grammar.ts
@@ -10,7 +10,7 @@ export const parser = LRParser.deserialize({
 	skippedNodes: [0],
 	repeatNodeCount: 1,
 	tokenData:
-		"&U~RTO#ob#o#p!h#p;'Sb;'S;=`!]<%lOb~gTQ~O#ob#o#pv#p;'Sb;'S;=`!]<%lOb~yUO#ob#p;'Sb;'S;=`!]<%l~b~Ob~~!c~!`P;=`<%lb~!hOQ~~!kVO#ob#o#p#Q#p;'Sb;'S;=`!]<%l~b~Ob~~!c~#TWO#O#Q#O#P#m#P#q#Q#q#r%Z#r$Ml#Q*5S41d#Q;(b;(c%x;(c;(d&O~#pWO#O#Q#O#P#m#P#q#Q#q#r$Y#r$Ml#Q*5S41d#Q;(b;(c%x;(c;(d&O~$]TO#q#Q#q#r$l#r;'S#Q;'S;=`%r<%lO#Q~$qWR~O#O#Q#O#P#m#P#q#Q#q#r%Z#r$Ml#Q*5S41d#Q;(b;(c%x;(c;(d&O~%^TO#q#Q#q#r%m#r;'S#Q;'S;=`%r<%lO#Q~%rOR~~%uP;=`<%l#Q~%{P;NQ<%l#Q~&RP;=`;JY#Q",
+		"&_~RTO#ob#o#p!h#p;'Sb;'S;=`!]<%lOb~gTQ~O#ob#o#pv#p;'Sb;'S;=`!]<%lOb~yUO#ob#p;'Sb;'S;=`!]<%l~b~Ob~~!c~!`P;=`<%lb~!hOQ~~!kVO#ob#o#p#Q#p;'Sb;'S;=`!]<%l~b~Ob~~!c~#TXO#O#Q#O#P#p#P#q#Q#q#r%d#r$Ml#Q*5S41d#Q;(b;(c&R;(c;(d%{;(d;(e&X~#sXO#O#Q#O#P#p#P#q#Q#q#r$`#r$Ml#Q*5S41d#Q;(b;(c&R;(c;(d%{;(d;(e&X~$cTO#q#Q#q#r$r#r;'S#Q;'S;=`%{<%lO#Q~$wXR~O#O#Q#O#P#p#P#q#Q#q#r%d#r$Ml#Q*5S41d#Q;(b;(c&R;(c;(d%{;(d;(e&X~%gTO#q#Q#q#r%v#r;'S#Q;'S;=`%{<%lO#Q~%{OR~~&OP;=`<%l#Q~&UP;NQ<%l#Q~&[P;=`;My#Q",
 	tokenizers: [0],
 	topRules: { Program: [0, 1] },
 	tokenPrec: 0,
diff --git a/packages/@n8n/codemirror-lang/test/expressions/cases.txt b/packages/@n8n/codemirror-lang/test/expressions/cases.txt
index 36f41ddccd..37db1e0bc0 100644
--- a/packages/@n8n/codemirror-lang/test/expressions/cases.txt
+++ b/packages/@n8n/codemirror-lang/test/expressions/cases.txt
@@ -277,3 +277,19 @@ Program(Resolvable)
 ==>
 
 Program(Resolvable)
+
+# Resolvable with new emoji range
+
+{{ '🟢' }}
+
+==>
+
+Program(Resolvable)
+
+# Resolvable with new emoji range end of range
+
+{{ '🫸' }}
+
+==>
+
+Program(Resolvable)
diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json
index f32da81581..0c58861309 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.24.0",
+  "version": "1.28.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/config/src/configs/database.config.ts b/packages/@n8n/config/src/configs/database.config.ts
index cebbf2191a..dc8bdde98d 100644
--- a/packages/@n8n/config/src/configs/database.config.ts
+++ b/packages/@n8n/config/src/configs/database.config.ts
@@ -107,7 +107,7 @@ class MysqlConfig {
 }
 
 @Config
-class SqliteConfig {
+export class SqliteConfig {
 	/** SQLite database file name */
 	@Env('DB_SQLITE_DATABASE')
 	database: string = 'database.sqlite';
diff --git a/packages/@n8n/config/src/configs/external-hooks.config.ts b/packages/@n8n/config/src/configs/external-hooks.config.ts
new file mode 100644
index 0000000000..20c8eb8654
--- /dev/null
+++ b/packages/@n8n/config/src/configs/external-hooks.config.ts
@@ -0,0 +1,17 @@
+import { Config, Env } from '../decorators';
+
+class ColonSeparatedStringArray<T extends string = string> extends Array<T> {
+	constructor(str: string) {
+		super();
+		const parsed = str.split(':') as this;
+		const filtered = parsed.filter((i) => typeof i === 'string' && i.length);
+		return filtered.length ? filtered : [];
+	}
+}
+
+@Config
+export class ExternalHooksConfig {
+	/** Files containing external hooks. Multiple files can be separated by colon (":") */
+	@Env('EXTERNAL_HOOK_FILES')
+	files: ColonSeparatedStringArray = [];
+}
diff --git a/packages/@n8n/config/src/configs/external-storage.config.ts b/packages/@n8n/config/src/configs/external-storage.config.ts
index 6e5fbd64d8..aff2447d40 100644
--- a/packages/@n8n/config/src/configs/external-storage.config.ts
+++ b/packages/@n8n/config/src/configs/external-storage.config.ts
@@ -23,11 +23,14 @@ class S3CredentialsConfig {
 }
 
 @Config
-class S3Config {
+export class S3Config {
 	/** Host of the n8n bucket in S3-compatible external storage @example "s3.us-east-1.amazonaws.com" */
 	@Env('N8N_EXTERNAL_STORAGE_S3_HOST')
 	host: string = '';
 
+	@Env('N8N_EXTERNAL_STORAGE_S3_PROTOCOL')
+	protocol: 'http' | 'https' = 'https';
+
 	@Nested
 	bucket: S3BucketConfig;
 
diff --git a/packages/@n8n/config/src/configs/nodes.config.ts b/packages/@n8n/config/src/configs/nodes.config.ts
index 577c4055ab..f5e190e289 100644
--- a/packages/@n8n/config/src/configs/nodes.config.ts
+++ b/packages/@n8n/config/src/configs/nodes.config.ts
@@ -33,6 +33,10 @@ class CommunityPackagesConfig {
 	/** Whether to reinstall any missing community packages */
 	@Env('N8N_REINSTALL_MISSING_PACKAGES')
 	reinstallMissing: boolean = false;
+
+	/** Whether to allow community packages as tools for AI agents */
+	@Env('N8N_COMMUNITY_PACKAGES_ALLOW_TOOL_USAGE')
+	allowToolUsage: boolean = false;
 }
 
 @Config
diff --git a/packages/@n8n/config/src/configs/partial-executions.config.ts b/packages/@n8n/config/src/configs/partial-executions.config.ts
new file mode 100644
index 0000000000..7937f451d3
--- /dev/null
+++ b/packages/@n8n/config/src/configs/partial-executions.config.ts
@@ -0,0 +1,12 @@
+import { Config, Env } from '../decorators';
+
+@Config
+export class PartialExecutionsConfig {
+	/** Partial execution logic version to use by default. */
+	@Env('N8N_PARTIAL_EXECUTION_VERSION_DEFAULT')
+	version: 1 | 2 = 1;
+
+	/** Set this to true to enforce using the default version. Users cannot use the other version then by setting a local storage key. */
+	@Env('N8N_PARTIAL_EXECUTION_ENFORCE_VERSION')
+	enforce: boolean = false;
+}
diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index 02ebdf5df9..af7e911877 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -12,7 +12,6 @@ export class TaskRunnersConfig {
 	@Env('N8N_RUNNERS_ENABLED')
 	enabled: boolean = false;
 
-	// Defaults to true for now
 	@Env('N8N_RUNNERS_MODE')
 	mode: TaskRunnerMode = 'internal';
 
@@ -23,12 +22,12 @@ export class TaskRunnersConfig {
 	@Env('N8N_RUNNERS_AUTH_TOKEN')
 	authToken: string = '';
 
-	/** IP address task runners server should listen on */
-	@Env('N8N_RUNNERS_HEALTH_CHECK_SERVER_PORT')
+	/** IP address task runners broker should listen on */
+	@Env('N8N_RUNNERS_BROKER_PORT')
 	port: number = 5679;
 
-	/** IP address task runners server should listen on */
-	@Env('N8N_RUNNERS_SERVER_LISTEN_ADDRESS')
+	/** IP address task runners broker should listen on */
+	@Env('N8N_RUNNERS_BROKER_LISTEN_ADDRESS')
 	listenAddress: string = '127.0.0.1';
 
 	/** Maximum size of a payload sent to the runner in bytes, Default 1G */
diff --git a/packages/@n8n/config/src/configs/scaling-mode.config.ts b/packages/@n8n/config/src/configs/scaling-mode.config.ts
index f202440a5b..e4331ce9d0 100644
--- a/packages/@n8n/config/src/configs/scaling-mode.config.ts
+++ b/packages/@n8n/config/src/configs/scaling-mode.config.ts
@@ -52,6 +52,10 @@ class RedisConfig {
 	/** Whether to enable TLS on Redis connections. */
 	@Env('QUEUE_BULL_REDIS_TLS')
 	tls: boolean = false;
+
+	/** Whether to enable dual-stack hostname resolution for Redis connections. */
+	@Env('QUEUE_BULL_REDIS_DUALSTACK')
+	dualStack: boolean = false;
 }
 
 @Config
diff --git a/packages/@n8n/config/src/configs/sentry.config.ts b/packages/@n8n/config/src/configs/sentry.config.ts
index d1067f9984..97e34edeea 100644
--- a/packages/@n8n/config/src/configs/sentry.config.ts
+++ b/packages/@n8n/config/src/configs/sentry.config.ts
@@ -2,11 +2,35 @@ import { Config, Env } from '../decorators';
 
 @Config
 export class SentryConfig {
-	/** Sentry DSN for the backend. */
+	/** Sentry DSN (data source name) for the backend. */
 	@Env('N8N_SENTRY_DSN')
 	backendDsn: string = '';
 
-	/** Sentry DSN for the frontend . */
+	/** Sentry DSN (data source name) for the frontend. */
 	@Env('N8N_FRONTEND_SENTRY_DSN')
 	frontendDsn: string = '';
+
+	/**
+	 * Version of the n8n instance
+	 *
+	 * @example '1.73.0'
+	 */
+	@Env('N8N_VERSION')
+	n8nVersion: string = '';
+
+	/**
+	 * Environment of the n8n instance.
+	 *
+	 * @example 'production'
+	 */
+	@Env('ENVIRONMENT')
+	environment: string = '';
+
+	/**
+	 * Name of the deployment, e.g. cloud account name.
+	 *
+	 * @example 'janober'
+	 */
+	@Env('DEPLOYMENT_NAME')
+	deploymentName: string = '';
 }
diff --git a/packages/@n8n/config/src/configs/tags.config.ts b/packages/@n8n/config/src/configs/tags.config.ts
new file mode 100644
index 0000000000..1c6db71809
--- /dev/null
+++ b/packages/@n8n/config/src/configs/tags.config.ts
@@ -0,0 +1,10 @@
+import { Config, Env } from '../decorators';
+
+@Config
+export class TagsConfig {
+	/*
+		Disable workflow tags
+	*/
+	@Env('N8N_WORKFLOW_TAGS_DISABLED')
+	disabled: boolean = false;
+}
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index 945b5f1237..edcc794ca5 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -6,6 +6,7 @@ import { DiagnosticsConfig } from './configs/diagnostics.config';
 import { EndpointsConfig } from './configs/endpoints.config';
 import { EventBusConfig } from './configs/event-bus.config';
 import { ExecutionsConfig } from './configs/executions.config';
+import { ExternalHooksConfig } from './configs/external-hooks.config';
 import { ExternalSecretsConfig } from './configs/external-secrets.config';
 import { ExternalStorageConfig } from './configs/external-storage.config';
 import { GenericConfig } from './configs/generic.config';
@@ -13,11 +14,13 @@ import { LicenseConfig } from './configs/license.config';
 import { LoggingConfig } from './configs/logging.config';
 import { MultiMainSetupConfig } from './configs/multi-main-setup.config';
 import { NodesConfig } from './configs/nodes.config';
+import { PartialExecutionsConfig } from './configs/partial-executions.config';
 import { PublicApiConfig } from './configs/public-api.config';
 import { TaskRunnersConfig } from './configs/runners.config';
 import { ScalingModeConfig } from './configs/scaling-mode.config';
 import { SecurityConfig } from './configs/security.config';
 import { SentryConfig } from './configs/sentry.config';
+import { TagsConfig } from './configs/tags.config';
 import { TemplatesConfig } from './configs/templates.config';
 import { UserManagementConfig } from './configs/user-management.config';
 import { VersionNotificationsConfig } from './configs/version-notifications.config';
@@ -29,6 +32,7 @@ export { TaskRunnersConfig } from './configs/runners.config';
 export { SecurityConfig } from './configs/security.config';
 export { ExecutionsConfig } from './configs/executions.config';
 export { FrontendBetaFeatures, FrontendConfig } from './configs/frontend.config';
+export { S3Config } from './configs/external-storage.config';
 export { LOG_SCOPES } from './configs/logging.config';
 export type { LogScope } from './configs/logging.config';
 
@@ -49,6 +53,9 @@ export class GlobalConfig {
 	@Nested
 	publicApi: PublicApiConfig;
 
+	@Nested
+	externalHooks: ExternalHooksConfig;
+
 	@Nested
 	externalSecrets: ExternalSecretsConfig;
 
@@ -125,4 +132,10 @@ export class GlobalConfig {
 
 	@Nested
 	aiAssistant: AiAssistantConfig;
+
+	@Nested
+	tags: TagsConfig;
+
+	@Nested
+	partialExecutions: PartialExecutionsConfig;
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index ed386fee6b..32952ec60b 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -107,6 +107,9 @@ describe('GlobalConfig', () => {
 				maxFileSizeInKB: 10240,
 			},
 		},
+		externalHooks: {
+			files: [],
+		},
 		externalSecrets: {
 			preferGet: false,
 			updateInterval: 300,
@@ -116,6 +119,7 @@ describe('GlobalConfig', () => {
 				enabled: true,
 				registry: 'https://registry.npmjs.org',
 				reinstallMissing: false,
+				allowToolUsage: false,
 			},
 			errorTriggerType: 'n8n-nodes-base.errorTrigger',
 			include: [],
@@ -138,6 +142,7 @@ describe('GlobalConfig', () => {
 		externalStorage: {
 			s3: {
 				host: '',
+				protocol: 'https',
 				bucket: {
 					name: '',
 					region: '',
@@ -209,6 +214,7 @@ describe('GlobalConfig', () => {
 					username: '',
 					clusterNodes: '',
 					tls: false,
+					dualStack: false,
 				},
 				gracefulShutdownTimeout: 30,
 				prefix: 'bull',
@@ -236,6 +242,9 @@ describe('GlobalConfig', () => {
 		sentry: {
 			backendDsn: '',
 			frontendDsn: '',
+			n8nVersion: '',
+			environment: '',
+			deploymentName: '',
 		},
 		logging: {
 			level: 'info',
@@ -292,6 +301,13 @@ describe('GlobalConfig', () => {
 		aiAssistant: {
 			baseUrl: '',
 		},
+		tags: {
+			disabled: false,
+		},
+		partialExecutions: {
+			version: 1,
+			enforce: false,
+		},
 	};
 
 	it('should use all default values when no env variables are defined', () => {
diff --git a/packages/@n8n/di/jest.config.js b/packages/@n8n/di/jest.config.js
index d6c48554a7..d14f2d60c6 100644
--- a/packages/@n8n/di/jest.config.js
+++ b/packages/@n8n/di/jest.config.js
@@ -1,2 +1,7 @@
 /** @type {import('jest').Config} */
-module.exports = require('../../../jest.config');
+module.exports = {
+	...require('../../../jest.config'),
+	transform: {
+		'^.+\\.ts$': ['ts-jest', { isolatedModules: false }],
+	},
+};
diff --git a/packages/@n8n/di/package.json b/packages/@n8n/di/package.json
index be327aefb6..88774017d3 100644
--- a/packages/@n8n/di/package.json
+++ b/packages/@n8n/di/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/di",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/di/src/__tests__/circular-depedency.test.ts b/packages/@n8n/di/src/__tests__/circular-depedency.test.ts
new file mode 100644
index 0000000000..66bce38f7b
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/circular-depedency.test.ts
@@ -0,0 +1,17 @@
+import { ServiceA } from './fixtures/ServiceA';
+import { ServiceB } from './fixtures/ServiceB';
+import { Container } from '../di';
+
+describe('DI Container', () => {
+	describe('circular dependency', () => {
+		it('should detect multilevel circular dependencies', () => {
+			expect(() => Container.get(ServiceA)).toThrow(
+				'[DI] Circular dependency detected in ServiceB at index 0.\nServiceA -> ServiceB',
+			);
+
+			expect(() => Container.get(ServiceB)).toThrow(
+				'[DI] Circular dependency detected in ServiceB at index 0.\nServiceB',
+			);
+		});
+	});
+});
diff --git a/packages/@n8n/di/src/__tests__/fixtures/ServiceA.ts b/packages/@n8n/di/src/__tests__/fixtures/ServiceA.ts
new file mode 100644
index 0000000000..83f4c90430
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/fixtures/ServiceA.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-cycle
+import { ServiceB } from './ServiceB';
+import { Service } from '../../di';
+
+@Service()
+export class ServiceA {
+	constructor(readonly b: ServiceB) {}
+}
diff --git a/packages/@n8n/di/src/__tests__/fixtures/ServiceB.ts b/packages/@n8n/di/src/__tests__/fixtures/ServiceB.ts
new file mode 100644
index 0000000000..a0dbd1908a
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/fixtures/ServiceB.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-cycle
+import { ServiceA } from './ServiceA';
+import { Service } from '../../di';
+
+@Service()
+export class ServiceB {
+	constructor(readonly a: ServiceA) {}
+}
diff --git a/packages/@n8n/di/src/di.ts b/packages/@n8n/di/src/di.ts
index a4acb98474..08d86eae07 100644
--- a/packages/@n8n/di/src/di.ts
+++ b/packages/@n8n/di/src/di.ts
@@ -78,13 +78,6 @@ class ContainerClass {
 
 		if (metadata?.instance) return metadata.instance as T;
 
-		// Check for circular dependencies before proceeding with instantiation
-		if (resolutionStack.includes(type)) {
-			throw new DIError(
-				`Circular dependency detected. ${resolutionStack.map((t) => t.name).join(' -> ')}`,
-			);
-		}
-
 		// Add current type to resolution stack before resolving dependencies
 		resolutionStack.push(type);
 
@@ -96,9 +89,15 @@ class ContainerClass {
 			} else {
 				const paramTypes = (Reflect.getMetadata('design:paramtypes', type) ??
 					[]) as Constructable[];
-				const dependencies = paramTypes.map(<P>(paramType: Constructable<P>) =>
-					this.get(paramType),
-				);
+
+				const dependencies = paramTypes.map(<P>(paramType: Constructable<P>, index: number) => {
+					if (paramType === undefined) {
+						throw new DIError(
+							`Circular dependency detected in ${type.name} at index ${index}.\n${resolutionStack.map((t) => t.name).join(' -> ')}\n`,
+						);
+					}
+					return this.get(paramType);
+				});
 				// Create new instance with resolved dependencies
 				instance = new (type as Constructable)(...dependencies) as T;
 			}
diff --git a/packages/@n8n/nodes-langchain/credentials/DeepSeekApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/DeepSeekApi.credentials.ts
new file mode 100644
index 0000000000..6088fbbb81
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/DeepSeekApi.credentials.ts
@@ -0,0 +1,47 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class DeepSeekApi implements ICredentialType {
+	name = 'deepSeekApi';
+
+	displayName = 'DeepSeek';
+
+	documentationUrl = 'deepseek';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Base URL',
+			name: 'url',
+			type: 'hidden',
+			default: 'https://api.deepseek.com',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{ $credentials.url }}',
+			url: '/models',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/credentials/OpenRouterApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/OpenRouterApi.credentials.ts
new file mode 100644
index 0000000000..e21a84d020
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/credentials/OpenRouterApi.credentials.ts
@@ -0,0 +1,47 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class OpenRouterApi implements ICredentialType {
+	name = 'openRouterApi';
+
+	displayName = 'OpenRouter';
+
+	documentationUrl = 'openrouter';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			type: 'string',
+			typeOptions: { password: true },
+			required: true,
+			default: '',
+		},
+		{
+			displayName: 'Base URL',
+			name: 'url',
+			type: 'hidden',
+			default: 'https://openrouter.ai/api/v1',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{ $credentials.url }}',
+			url: '/models',
+		},
+	};
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
index 230a6ddc6e..c5a46a1192 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -91,6 +91,8 @@ function getInputs(
 						'@n8n/n8n-nodes-langchain.lmChatGoogleVertex',
 						'@n8n/n8n-nodes-langchain.lmChatMistralCloud',
 						'@n8n/n8n-nodes-langchain.lmChatAzureOpenAi',
+						'@n8n/n8n-nodes-langchain.lmChatDeepSeek',
+						'@n8n/n8n-nodes-langchain.lmChatOpenRouter',
 					],
 				},
 			},
@@ -119,6 +121,8 @@ function getInputs(
 						'@n8n/n8n-nodes-langchain.lmChatGroq',
 						'@n8n/n8n-nodes-langchain.lmChatGoogleVertex',
 						'@n8n/n8n-nodes-langchain.lmChatGoogleGemini',
+						'@n8n/n8n-nodes-langchain.lmChatDeepSeek',
+						'@n8n/n8n-nodes-langchain.lmChatOpenRouter',
 					],
 				},
 			},
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.test.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.test.ts
new file mode 100644
index 0000000000..fc67b6bb17
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.test.ts
@@ -0,0 +1,156 @@
+import { mock } from 'jest-mock-extended';
+import type { PostgresNodeCredentials } from 'n8n-nodes-base/nodes/Postgres/v2/helpers/interfaces';
+import type { IExecuteFunctions } from 'n8n-workflow';
+
+import { getPostgresDataSource } from './postgres';
+
+describe('Postgres SSL settings', () => {
+	const credentials = mock<PostgresNodeCredentials>({
+		host: 'localhost',
+		port: 5432,
+		user: 'user',
+		password: 'password',
+		database: 'database',
+	});
+
+	test('ssl is disabled + allowUnauthorizedCerts is false', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'disable',
+				allowUnauthorizedCerts: false,
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: false,
+		});
+	});
+
+	test('ssl is disabled + allowUnauthorizedCerts is true', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'disable',
+				allowUnauthorizedCerts: true,
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: false,
+		});
+	});
+
+	test('ssl is disabled + allowUnauthorizedCerts is undefined', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'disable',
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: false,
+		});
+	});
+
+	test('ssl is allow + allowUnauthorizedCerts is false', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'allow',
+				allowUnauthorizedCerts: false,
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: true,
+		});
+	});
+
+	test('ssl is allow + allowUnauthorizedCerts is true', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'allow',
+				allowUnauthorizedCerts: true,
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: { rejectUnauthorized: false },
+		});
+	});
+
+	test('ssl is allow + allowUnauthorizedCerts is undefined', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'allow',
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: true,
+		});
+	});
+
+	test('ssl is require + allowUnauthorizedCerts is false', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'require',
+				allowUnauthorizedCerts: false,
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: true,
+		});
+	});
+
+	test('ssl is require + allowUnauthorizedCerts is true', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'require',
+				allowUnauthorizedCerts: true,
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: { rejectUnauthorized: false },
+		});
+	});
+
+	test('ssl is require + allowUnauthorizedCerts is undefined', async () => {
+		const context = mock<IExecuteFunctions>({
+			getCredentials: jest.fn().mockReturnValue({
+				...credentials,
+				ssl: 'require',
+			}),
+		});
+
+		const dataSource = await getPostgresDataSource.call(context);
+
+		expect(dataSource.options).toMatchObject({
+			ssl: true,
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
index 31dda9ed72..8654dcafbb 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
@@ -1,29 +1,23 @@
 import { DataSource } from '@n8n/typeorm';
+import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
 import { type IExecuteFunctions } from 'n8n-workflow';
+import type { TlsOptions } from 'tls';
 
 export async function getPostgresDataSource(this: IExecuteFunctions): Promise<DataSource> {
-	const credentials = await this.getCredentials('postgres');
+	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
 
-	const dataSource = new DataSource({
-		type: 'postgres',
-		host: credentials.host as string,
-		port: credentials.port as number,
-		username: credentials.user as string,
-		password: credentials.password as string,
-		database: credentials.database as string,
-	});
-
-	if (credentials.allowUnauthorizedCerts === true) {
-		dataSource.setOptions({
-			ssl: {
-				rejectUnauthorized: true,
-			},
-		});
-	} else {
-		dataSource.setOptions({
-			ssl: !['disable', undefined].includes(credentials.ssl as string | undefined),
-		});
+	let ssl: TlsOptions | boolean = !['disable', undefined].includes(credentials.ssl);
+	if (credentials.allowUnauthorizedCerts && ssl) {
+		ssl = { rejectUnauthorized: false };
 	}
 
-	return dataSource;
+	return new DataSource({
+		type: 'postgres',
+		host: credentials.host,
+		port: credentials.port,
+		username: credentials.user,
+		password: credentials.password,
+		database: credentials.database,
+		ssl,
+	});
 }
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
index 4b2ddf5db9..45d3932309 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -34,6 +34,7 @@ import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser'
 import { getTemplateNoticeField } from '@utils/sharedFields';
 import { getTracingConfig } from '@utils/tracing';
 
+import { dataUriFromImageData, UnsupportedMimeTypeError } from './utils';
 import {
 	getCustomErrorMessage as getCustomOpenAiErrorMessage,
 	isOpenAiError,
@@ -88,21 +89,28 @@ async function getImageMessage(
 		NodeConnectionType.AiLanguageModel,
 		0,
 	)) as BaseLanguageModel;
-	const dataURI = `data:image/jpeg;base64,${bufferData.toString('base64')}`;
 
-	const directUriModels = [ChatGoogleGenerativeAI, ChatOllama];
-	const imageUrl = directUriModels.some((i) => model instanceof i)
-		? dataURI
-		: { url: dataURI, detail };
+	try {
+		const dataURI = dataUriFromImageData(binaryData, bufferData);
 
-	return new HumanMessage({
-		content: [
-			{
-				type: 'image_url',
-				image_url: imageUrl,
-			},
-		],
-	});
+		const directUriModels = [ChatGoogleGenerativeAI, ChatOllama];
+		const imageUrl = directUriModels.some((i) => model instanceof i)
+			? dataURI
+			: { url: dataURI, detail };
+
+		return new HumanMessage({
+			content: [
+				{
+					type: 'image_url',
+					image_url: imageUrl,
+				},
+			],
+		});
+	} catch (error) {
+		if (error instanceof UnsupportedMimeTypeError)
+			throw new NodeOperationError(context.getNode(), error.message);
+		throw error;
+	}
 }
 
 async function getChainPromptTemplate(
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/test/utils.test.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/test/utils.test.ts
new file mode 100644
index 0000000000..2207caf20b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/test/utils.test.ts
@@ -0,0 +1,23 @@
+import { mock } from 'jest-mock-extended';
+import type { IBinaryData } from 'n8n-workflow';
+
+import { dataUriFromImageData, UnsupportedMimeTypeError } from '../utils';
+
+describe('dataUriFromImageData', () => {
+	it('should not throw an error on images', async () => {
+		const mockBuffer = Buffer.from('Test data');
+		const mockBinaryData = mock<IBinaryData>({ mimeType: 'image/jpeg' });
+
+		const dataUri = dataUriFromImageData(mockBinaryData, mockBuffer);
+		expect(dataUri).toBe('data:image/jpeg;base64,VGVzdCBkYXRh');
+	});
+
+	it('should throw an UnsupportetMimeTypeError on non-images', async () => {
+		const mockBuffer = Buffer.from('Test data');
+		const mockBinaryData = mock<IBinaryData>({ mimeType: 'text/plain' });
+
+		expect(() => {
+			dataUriFromImageData(mockBinaryData, mockBuffer);
+		}).toThrow(UnsupportedMimeTypeError);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/utils.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/utils.ts
new file mode 100644
index 0000000000..95671d40fe
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/utils.ts
@@ -0,0 +1,12 @@
+import type { IBinaryData } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+
+export class UnsupportedMimeTypeError extends ApplicationError {}
+
+export function dataUriFromImageData(binaryData: IBinaryData, bufferData: Buffer) {
+	if (!binaryData.mimeType?.startsWith('image/'))
+		throw new UnsupportedMimeTypeError(
+			`${binaryData.mimeType} is not a supported type of binary data. Only images are supported.`,
+		);
+	return `data:${binaryData.mimeType};base64,${bufferData.toString('base64')}`;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
index cd44cb114b..58d90ff90b 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
@@ -24,7 +24,7 @@ const modelParameter: INodeProperties = {
 			routing: {
 				request: {
 					method: 'GET',
-					url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+					url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || $credentials?.url?.split("/").slice(-1).pop() || "v1" }}/models',
 				},
 				output: {
 					postReceive: [
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
index cf24d944de..1db5ef7706 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
@@ -11,18 +11,25 @@ import {
 
 import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
+import { searchModels } from './methods/loadModels';
 import { openAiFailedAttemptHandler } from '../../vendors/OpenAi/helpers/error-handling';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatOpenAi implements INodeType {
+	methods = {
+		listSearch: {
+			searchModels,
+		},
+	};
+
 	description: INodeTypeDescription = {
 		displayName: 'OpenAI Chat Model',
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
 		name: 'lmChatOpenAi',
 		icon: { light: 'file:openAiLight.svg', dark: 'file:openAiLight.dark.svg' },
 		group: ['transform'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		description: 'For advanced usage with an AI chain',
 		defaults: {
 			name: 'OpenAI Chat Model',
@@ -101,6 +108,7 @@ export class LmChatOpenAi implements INodeType {
 												($credentials?.url && !$credentials.url.includes('api.openai.com')) ||
 												$responseItem.id.startsWith('ft:') ||
 												$responseItem.id.startsWith('o1') ||
+												$responseItem.id.startsWith('o3') ||
 												($responseItem.id.startsWith('gpt-') && !$responseItem.id.includes('instruct'))
 											}}`,
 										},
@@ -130,6 +138,42 @@ export class LmChatOpenAi implements INodeType {
 					},
 				},
 				default: 'gpt-4o-mini',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: 'gpt-4o-mini' },
+				required: true,
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select a model...',
+						typeOptions: {
+							searchListMethod: 'searchModels',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: 'gpt-4o-mini',
+					},
+				],
+				description: 'The model. Choose from the list, or specify an ID.',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { lte: 1.1 } }],
+					},
+				},
 			},
 			{
 				displayName:
@@ -215,11 +259,43 @@ export class LmChatOpenAi implements INodeType {
 						displayName: 'Sampling Temperature',
 						name: 'temperature',
 						default: 0.7,
-						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						typeOptions: { maxValue: 2, minValue: 0, numberPrecision: 1 },
 						description:
 							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
 						type: 'number',
 					},
+					{
+						displayName: 'Reasoning Effort',
+						name: 'reasoningEffort',
+						default: 'medium',
+						description:
+							'Controls the amount of reasoning tokens to use. A value of "low" will favor speed and economical token usage, "high" will favor more complete reasoning at the cost of more tokens generated and slower responses.',
+						type: 'options',
+						options: [
+							{
+								name: 'Low',
+								value: 'low',
+								description: 'Favors speed and economical token usage',
+							},
+							{
+								name: 'Medium',
+								value: 'medium',
+								description: 'Balance between speed and reasoning accuracy',
+							},
+							{
+								name: 'High',
+								value: 'high',
+								description:
+									'Favors more complete reasoning at the cost of more tokens generated and slower responses',
+							},
+						],
+						displayOptions: {
+							show: {
+								// reasoning_effort is only available on o1, o1-versioned, or on o3-mini and beyond. Not on o1-mini or other GPT-models.
+								'/model': [{ _cnd: { regex: '(^o1([-\\d]+)?$)|(^o[3-9].*)' } }],
+							},
+						},
+					},
 					{
 						displayName: 'Timeout',
 						name: 'timeout',
@@ -251,7 +327,12 @@ export class LmChatOpenAi implements INodeType {
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
 		const credentials = await this.getCredentials('openAiApi');
 
-		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const version = this.getNode().typeVersion;
+		const modelName =
+			version >= 1.2
+				? (this.getNodeParameter('model.value', itemIndex) as string)
+				: (this.getNodeParameter('model', itemIndex) as string);
+
 		const options = this.getNodeParameter('options', itemIndex, {}) as {
 			baseURL?: string;
 			frequencyPenalty?: number;
@@ -262,6 +343,7 @@ export class LmChatOpenAi implements INodeType {
 			temperature?: number;
 			topP?: number;
 			responseFormat?: 'text' | 'json_object';
+			reasoningEffort?: 'low' | 'medium' | 'high';
 		};
 
 		const configuration: ClientOptions = {};
@@ -271,6 +353,15 @@ export class LmChatOpenAi implements INodeType {
 			configuration.baseURL = credentials.url as string;
 		}
 
+		// Extra options to send to OpenAI, that are not directly supported by LangChain
+		const modelKwargs: {
+			response_format?: object;
+			reasoning_effort?: 'low' | 'medium' | 'high';
+		} = {};
+		if (options.responseFormat) modelKwargs.response_format = { type: options.responseFormat };
+		if (options.reasoningEffort && ['low', 'medium', 'high'].includes(options.reasoningEffort))
+			modelKwargs.reasoning_effort = options.reasoningEffort;
+
 		const model = new ChatOpenAI({
 			openAIApiKey: credentials.apiKey as string,
 			modelName,
@@ -279,11 +370,7 @@ export class LmChatOpenAi implements INodeType {
 			maxRetries: options.maxRetries ?? 2,
 			configuration,
 			callbacks: [new N8nLlmTracing(this)],
-			modelKwargs: options.responseFormat
-				? {
-						response_format: { type: options.responseFormat },
-					}
-				: undefined,
+			modelKwargs,
 			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this, openAiFailedAttemptHandler),
 		});
 
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/__tests__/loadModels.test.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/__tests__/loadModels.test.ts
new file mode 100644
index 0000000000..b2f728678f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/__tests__/loadModels.test.ts
@@ -0,0 +1,112 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+import OpenAI from 'openai';
+
+import { searchModels } from '../loadModels';
+
+jest.mock('openai');
+
+describe('searchModels', () => {
+	let mockContext: jest.Mocked<ILoadOptionsFunctions>;
+	let mockOpenAI: jest.Mocked<typeof OpenAI>;
+
+	beforeEach(() => {
+		mockContext = {
+			getCredentials: jest.fn().mockResolvedValue({
+				apiKey: 'test-api-key',
+			}),
+			getNodeParameter: jest.fn().mockReturnValue(''),
+		} as unknown as jest.Mocked<ILoadOptionsFunctions>;
+
+		// Setup OpenAI mock with required properties
+		const mockOpenAIInstance = {
+			apiKey: 'test-api-key',
+			organization: null,
+			project: null,
+			_options: {},
+			models: {
+				list: jest.fn().mockResolvedValue({
+					data: [
+						{ id: 'gpt-4' },
+						{ id: 'gpt-3.5-turbo' },
+						{ id: 'gpt-3.5-turbo-instruct' },
+						{ id: 'ft:gpt-3.5-turbo' },
+						{ id: 'o1-model' },
+						{ id: 'other-model' },
+					],
+				}),
+			},
+		} as unknown as OpenAI;
+
+		(OpenAI as jest.MockedClass<typeof OpenAI>).mockImplementation(() => mockOpenAIInstance);
+
+		mockOpenAI = OpenAI as jest.Mocked<typeof OpenAI>;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return filtered models if custom API endpoint is not provided', async () => {
+		const result = await searchModels.call(mockContext);
+
+		expect(mockOpenAI).toHaveBeenCalledWith({
+			baseURL: 'https://api.openai.com/v1',
+			apiKey: 'test-api-key',
+		});
+		expect(result.results).toHaveLength(4);
+	});
+
+	it('should initialize OpenAI with correct credentials', async () => {
+		mockContext.getCredentials.mockResolvedValueOnce({
+			apiKey: 'test-api-key',
+			url: 'https://test-url.com',
+		});
+		await searchModels.call(mockContext);
+
+		expect(mockOpenAI).toHaveBeenCalledWith({
+			baseURL: 'https://test-url.com',
+			apiKey: 'test-api-key',
+		});
+	});
+
+	it('should use default OpenAI URL if no custom URL provided', async () => {
+		mockContext.getCredentials = jest.fn().mockResolvedValue({
+			apiKey: 'test-api-key',
+		});
+
+		await searchModels.call(mockContext);
+
+		expect(mockOpenAI).toHaveBeenCalledWith({
+			baseURL: 'https://api.openai.com/v1',
+			apiKey: 'test-api-key',
+		});
+	});
+
+	it('should include all models for custom API endpoints', async () => {
+		mockContext.getNodeParameter = jest.fn().mockReturnValue('https://custom-api.com');
+
+		const result = await searchModels.call(mockContext);
+
+		expect(result.results).toHaveLength(6);
+	});
+
+	it('should filter models based on search term', async () => {
+		const result = await searchModels.call(mockContext, 'gpt');
+
+		expect(result.results).toEqual([
+			{ name: 'gpt-4', value: 'gpt-4' },
+			{ name: 'gpt-3.5-turbo', value: 'gpt-3.5-turbo' },
+			{ name: 'ft:gpt-3.5-turbo', value: 'ft:gpt-3.5-turbo' },
+		]);
+	});
+
+	it('should handle case-insensitive search', async () => {
+		const result = await searchModels.call(mockContext, 'GPT');
+
+		expect(result.results).toEqual([
+			{ name: 'gpt-4', value: 'gpt-4' },
+			{ name: 'gpt-3.5-turbo', value: 'gpt-3.5-turbo' },
+			{ name: 'ft:gpt-3.5-turbo', value: 'ft:gpt-3.5-turbo' },
+		]);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/loadModels.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/loadModels.ts
new file mode 100644
index 0000000000..bfcbfe1c30
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/loadModels.ts
@@ -0,0 +1,38 @@
+import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+import OpenAI from 'openai';
+
+export async function searchModels(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const credentials = await this.getCredentials('openAiApi');
+	const baseURL =
+		(this.getNodeParameter('options.baseURL', '') as string) ||
+		(credentials.url as string) ||
+		'https://api.openai.com/v1';
+
+	const openai = new OpenAI({ baseURL, apiKey: credentials.apiKey as string });
+	const { data: models = [] } = await openai.models.list();
+
+	const filteredModels = models.filter((model: { id: string }) => {
+		const isValidModel =
+			(baseURL && !baseURL.includes('api.openai.com')) ||
+			model.id.startsWith('ft:') ||
+			model.id.startsWith('o1') ||
+			model.id.startsWith('o3') ||
+			(model.id.startsWith('gpt-') && !model.id.includes('instruct'));
+
+		if (!filter) return isValidModel;
+
+		return isValidModel && model.id.toLowerCase().includes(filter.toLowerCase());
+	});
+
+	const results = {
+		results: filteredModels.map((model: { id: string }) => ({
+			name: model.id,
+			value: model.id,
+		})),
+	};
+
+	return results;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatDeepSeek/LmChatDeepSeek.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatDeepSeek/LmChatDeepSeek.node.ts
new file mode 100644
index 0000000000..bf811ac2fe
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatDeepSeek/LmChatDeepSeek.node.ts
@@ -0,0 +1,253 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import { ChatOpenAI, type ClientOptions } from '@langchain/openai';
+import {
+	NodeConnectionType,
+	type INodeType,
+	type INodeTypeDescription,
+	type ISupplyDataFunctions,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { openAiFailedAttemptHandler } from '../../vendors/OpenAi/helpers/error-handling';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
+
+export class LmChatDeepSeek implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'DeepSeek Chat Model',
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
+		name: 'lmChatDeepSeek',
+		icon: 'file:deepseek.svg',
+		group: ['transform'],
+		version: [1],
+		description: 'For advanced usage with an AI chain',
+		defaults: {
+			name: 'DeepSeek Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models', 'Root Nodes'],
+				'Language Models': ['Chat Models (Recommended)'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatdeepseek/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'deepSeekApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials?.url }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName:
+					'If using JSON response format, you must include word "json" in the prompt in your chain or agent. Also, make sure to select latest models released post November 2023.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						'/options.responseFormat': ['json_object'],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://api-docs.deepseek.com/quick_start/pricing">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.id}}',
+											value: '={{$responseItem.id}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'deepseek-chat',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Frequency Penalty',
+						name: 'frequencyPenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+						type: 'number',
+					},
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: -1,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Response Format',
+						name: 'responseFormat',
+						default: 'text',
+						type: 'options',
+						options: [
+							{
+								name: 'Text',
+								value: 'text',
+								description: 'Regular text response',
+							},
+							{
+								name: 'JSON',
+								value: 'json_object',
+								description:
+									'Enables JSON mode, which should guarantee the message the model generates is valid JSON',
+							},
+						],
+					},
+					{
+						displayName: 'Presence Penalty',
+						name: 'presencePenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 2, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: 360000,
+						description: 'Maximum amount of time a request is allowed to take in milliseconds',
+						type: 'number',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials<OpenAICompatibleCredential>('deepSeekApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			frequencyPenalty?: number;
+			maxTokens?: number;
+			maxRetries: number;
+			timeout: number;
+			presencePenalty?: number;
+			temperature?: number;
+			topP?: number;
+			responseFormat?: 'text' | 'json_object';
+		};
+
+		const configuration: ClientOptions = {
+			baseURL: credentials.url,
+		};
+
+		const model = new ChatOpenAI({
+			openAIApiKey: credentials.apiKey,
+			modelName,
+			...options,
+			timeout: options.timeout ?? 60000,
+			maxRetries: options.maxRetries ?? 2,
+			configuration,
+			callbacks: [new N8nLlmTracing(this)],
+			modelKwargs: options.responseFormat
+				? {
+						response_format: { type: options.responseFormat },
+					}
+				: undefined,
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this, openAiFailedAttemptHandler),
+		});
+
+		return {
+			response: model,
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatDeepSeek/deepseek.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatDeepSeek/deepseek.svg
new file mode 100644
index 0000000000..3395016ce0
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatDeepSeek/deepseek.svg
@@ -0,0 +1 @@
+<svg width="40" height="40" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>DeepSeek</title><path d="M23.748 4.482c-.254-.124-.364.113-.512.234-.051.039-.094.09-.137.136-.372.397-.806.657-1.373.626-.829-.046-1.537.214-2.163.848-.133-.782-.575-1.248-1.247-1.548-.352-.156-.708-.311-.955-.65-.172-.241-.219-.51-.305-.774-.055-.16-.11-.323-.293-.35-.2-.031-.278.136-.356.276-.313.572-.434 1.202-.422 1.84.027 1.436.633 2.58 1.838 3.393.137.093.172.187.129.323-.082.28-.18.552-.266.833-.055.179-.137.217-.329.14a5.526 5.526 0 01-1.736-1.18c-.857-.828-1.631-1.742-2.597-2.458a11.365 11.365 0 00-.689-.471c-.985-.957.13-1.743.388-1.836.27-.098.093-.432-.779-.428-.872.004-1.67.295-2.687.684a3.055 3.055 0 01-.465.137 9.597 9.597 0 00-2.883-.102c-1.885.21-3.39 1.102-4.497 2.623C.082 8.606-.231 10.684.152 12.85c.403 2.284 1.569 4.175 3.36 5.653 1.858 1.533 3.997 2.284 6.438 2.14 1.482-.085 3.133-.284 4.994-1.86.47.234.962.327 1.78.397.63.059 1.236-.03 1.705-.128.735-.156.684-.837.419-.961-2.155-1.004-1.682-.595-2.113-.926 1.096-1.296 2.746-2.642 3.392-7.003.05-.347.007-.565 0-.845-.004-.17.035-.237.23-.256a4.173 4.173 0 001.545-.475c1.396-.763 1.96-2.015 2.093-3.517.02-.23-.004-.467-.247-.588zM11.581 18c-2.089-1.642-3.102-2.183-3.52-2.16-.392.024-.321.471-.235.763.09.288.207.486.371.739.114.167.192.416-.113.603-.673.416-1.842-.14-1.897-.167-1.361-.802-2.5-1.86-3.301-3.307-.774-1.393-1.224-2.887-1.298-4.482-.02-.386.093-.522.477-.592a4.696 4.696 0 011.529-.039c2.132.312 3.946 1.265 5.468 2.774.868.86 1.525 1.887 2.202 2.891.72 1.066 1.494 2.082 2.48 2.914.348.292.625.514.891.677-.802.09-2.14.11-3.054-.614zm1-6.44a.306.306 0 01.415-.287.302.302 0 01.2.288.306.306 0 01-.31.307.303.303 0 01-.304-.308zm3.11 1.596c-.2.081-.399.151-.59.16a1.245 1.245 0 01-.798-.254c-.274-.23-.47-.358-.552-.758a1.73 1.73 0 01.016-.588c.07-.327-.008-.537-.239-.727-.187-.156-.426-.199-.688-.199a.559.559 0 01-.254-.078c-.11-.054-.2-.19-.114-.358.028-.054.16-.186.192-.21.356-.202.767-.136 1.146.016.352.144.618.408 1.001.782.391.451.462.576.685.914.176.265.336.537.445.848.067.195-.019.354-.25.452z" fill="#4D6BFE"></path></svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
index f8b7d2bb3e..f6ff0f5038 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
@@ -1,12 +1,13 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
 import type { SafetySetting } from '@google/generative-ai';
 import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
-import {
-	NodeConnectionType,
-	type INodeType,
-	type INodeTypeDescription,
-	type ISupplyDataFunctions,
-	type SupplyData,
+import { NodeConnectionType } from 'n8n-workflow';
+import type {
+	NodeError,
+	INodeType,
+	INodeTypeDescription,
+	ISupplyDataFunctions,
+	SupplyData,
 } from 'n8n-workflow';
 
 import { getConnectionHintNoticeField } from '@utils/sharedFields';
@@ -15,6 +16,13 @@ import { additionalOptions } from '../gemini-common/additional-options';
 import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
+function errorDescriptionMapper(error: NodeError) {
+	if (error.description?.includes('properties: should be non-empty for OBJECT type')) {
+		return 'Google Gemini requires at least one <a href="https://docs.n8n.io/advanced-ai/examples/using-the-fromai-function/" target="_blank">dynamic parameter</a> when using tools';
+	}
+
+	return error.description ?? 'Unknown error';
+}
 export class LmChatGoogleGemini implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Gemini Chat Model',
@@ -140,13 +148,14 @@ export class LmChatGoogleGemini implements INodeType {
 
 		const model = new ChatGoogleGenerativeAI({
 			apiKey: credentials.apiKey as string,
+			baseUrl: credentials.host as string,
 			modelName,
 			topK: options.topK,
 			topP: options.topP,
 			temperature: options.temperature,
 			maxOutputTokens: options.maxOutputTokens,
 			safetySettings,
-			callbacks: [new N8nLlmTracing(this)],
+			callbacks: [new N8nLlmTracing(this, { errorDescriptionMapper })],
 			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/LmChatOpenRouter.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/LmChatOpenRouter.node.ts
new file mode 100644
index 0000000000..57a14028e7
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/LmChatOpenRouter.node.ts
@@ -0,0 +1,252 @@
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import { ChatOpenAI, type ClientOptions } from '@langchain/openai';
+import {
+	NodeConnectionType,
+	type INodeType,
+	type INodeTypeDescription,
+	type ISupplyDataFunctions,
+	type SupplyData,
+} from 'n8n-workflow';
+
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { openAiFailedAttemptHandler } from '../../vendors/OpenAi/helpers/error-handling';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
+
+export class LmChatOpenRouter implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'OpenRouter Chat Model',
+		name: 'lmChatOpenRouter',
+		icon: { light: 'file:openrouter.svg', dark: 'file:openrouter.dark.svg' },
+		group: ['transform'],
+		version: [1],
+		description: 'For advanced usage with an AI chain',
+		defaults: {
+			name: 'OpenRouter Chat Model',
+		},
+		codex: {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Language Models', 'Root Nodes'],
+				'Language Models': ['Chat Models (Recommended)'],
+			},
+			resources: {
+				primaryDocumentation: [
+					{
+						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.lmchatopenrouter/',
+					},
+				],
+			},
+		},
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+		inputs: [],
+		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+		outputs: [NodeConnectionType.AiLanguageModel],
+		outputNames: ['Model'],
+		credentials: [
+			{
+				name: 'openRouterApi',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			ignoreHttpStatusErrors: true,
+			baseURL: '={{ $credentials?.url }}',
+		},
+		properties: [
+			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName:
+					'If using JSON response format, you must include word "json" in the prompt in your chain or agent. Also, make sure to select latest models released post November 2023.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: {
+						'/options.responseFormat': ['json_object'],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'options',
+				description:
+					'The model which will generate the completion. <a href="https://openrouter.ai/docs/models">Learn more</a>.',
+				typeOptions: {
+					loadOptions: {
+						routing: {
+							request: {
+								method: 'GET',
+								url: '/models',
+							},
+							output: {
+								postReceive: [
+									{
+										type: 'rootProperty',
+										properties: {
+											property: 'data',
+										},
+									},
+									{
+										type: 'setKeyValue',
+										properties: {
+											name: '={{$responseItem.id}}',
+											value: '={{$responseItem.id}}',
+										},
+									},
+									{
+										type: 'sort',
+										properties: {
+											key: 'name',
+										},
+									},
+								],
+							},
+						},
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'model',
+					},
+				},
+				default: 'openai/gpt-4o-mini',
+			},
+			{
+				displayName: 'Options',
+				name: 'options',
+				placeholder: 'Add Option',
+				description: 'Additional options to add',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'Frequency Penalty',
+						name: 'frequencyPenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+						type: 'number',
+					},
+					{
+						displayName: 'Maximum Number of Tokens',
+						name: 'maxTokens',
+						default: -1,
+						description:
+							'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 32,768).',
+						type: 'number',
+						typeOptions: {
+							maxValue: 32768,
+						},
+					},
+					{
+						displayName: 'Response Format',
+						name: 'responseFormat',
+						default: 'text',
+						type: 'options',
+						options: [
+							{
+								name: 'Text',
+								value: 'text',
+								description: 'Regular text response',
+							},
+							{
+								name: 'JSON',
+								value: 'json_object',
+								description:
+									'Enables JSON mode, which should guarantee the message the model generates is valid JSON',
+							},
+						],
+					},
+					{
+						displayName: 'Presence Penalty',
+						name: 'presencePenalty',
+						default: 0,
+						typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+						description:
+							"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+						type: 'number',
+					},
+					{
+						displayName: 'Sampling Temperature',
+						name: 'temperature',
+						default: 0.7,
+						typeOptions: { maxValue: 2, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+						type: 'number',
+					},
+					{
+						displayName: 'Timeout',
+						name: 'timeout',
+						default: 360000,
+						description: 'Maximum amount of time a request is allowed to take in milliseconds',
+						type: 'number',
+					},
+					{
+						displayName: 'Max Retries',
+						name: 'maxRetries',
+						default: 2,
+						description: 'Maximum number of retries to attempt',
+						type: 'number',
+					},
+					{
+						displayName: 'Top P',
+						name: 'topP',
+						default: 1,
+						typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+						description:
+							'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+						type: 'number',
+					},
+				],
+			},
+		],
+	};
+
+	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const credentials = await this.getCredentials<OpenAICompatibleCredential>('openRouterApi');
+
+		const modelName = this.getNodeParameter('model', itemIndex) as string;
+
+		const options = this.getNodeParameter('options', itemIndex, {}) as {
+			frequencyPenalty?: number;
+			maxTokens?: number;
+			maxRetries: number;
+			timeout: number;
+			presencePenalty?: number;
+			temperature?: number;
+			topP?: number;
+			responseFormat?: 'text' | 'json_object';
+		};
+
+		const configuration: ClientOptions = {
+			baseURL: credentials.url,
+		};
+
+		const model = new ChatOpenAI({
+			openAIApiKey: credentials.apiKey,
+			modelName,
+			...options,
+			timeout: options.timeout ?? 60000,
+			maxRetries: options.maxRetries ?? 2,
+			configuration,
+			callbacks: [new N8nLlmTracing(this)],
+			modelKwargs: options.responseFormat
+				? {
+						response_format: { type: options.responseFormat },
+					}
+				: undefined,
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this, openAiFailedAttemptHandler),
+		});
+
+		return {
+			response: model,
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/openrouter.dark.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/openrouter.dark.svg
new file mode 100644
index 0000000000..0b8bb9df1b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/openrouter.dark.svg
@@ -0,0 +1 @@
+<svg fill="white" fill-rule="evenodd" width="40" height="40" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>OpenRouter</title><path d="M16.804 1.957l7.22 4.105v.087L16.73 10.21l.017-2.117-.821-.03c-1.059-.028-1.611.002-2.268.11-1.064.175-2.038.577-3.147 1.352L8.345 11.03c-.284.195-.495.336-.68.455l-.515.322-.397.234.385.23.53.338c.476.314 1.17.796 2.701 1.866 1.11.775 2.083 1.177 3.147 1.352l.3.045c.694.091 1.375.094 2.825.033l.022-2.159 7.22 4.105v.087L16.589 22l.014-1.862-.635.022c-1.386.042-2.137.002-3.138-.162-1.694-.28-3.26-.926-4.881-2.059l-2.158-1.5a21.997 21.997 0 00-.755-.498l-.467-.28a55.927 55.927 0 00-.76-.43C2.908 14.73.563 14.116 0 14.116V9.888l.14.004c.564-.007 2.91-.622 3.809-1.124l1.016-.58.438-.274c.428-.28 1.072-.726 2.686-1.853 1.621-1.133 3.186-1.78 4.881-2.059 1.152-.19 1.974-.213 3.814-.138l.02-1.907z"></path></svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/openrouter.svg b/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/openrouter.svg
new file mode 100644
index 0000000000..749e44df71
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatOpenRouter/openrouter.svg
@@ -0,0 +1 @@
+<svg fill="#94A3B8" fill-rule="evenodd" width="40" height="40" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><title>OpenRouter</title><path d="M16.804 1.957l7.22 4.105v.087L16.73 10.21l.017-2.117-.821-.03c-1.059-.028-1.611.002-2.268.11-1.064.175-2.038.577-3.147 1.352L8.345 11.03c-.284.195-.495.336-.68.455l-.515.322-.397.234.385.23.53.338c.476.314 1.17.796 2.701 1.866 1.11.775 2.083 1.177 3.147 1.352l.3.045c.694.091 1.375.094 2.825.033l.022-2.159 7.22 4.105v.087L16.589 22l.014-1.862-.635.022c-1.386.042-2.137.002-3.138-.162-1.694-.28-3.26-.926-4.881-2.059l-2.158-1.5a21.997 21.997 0 00-.755-.498l-.467-.28a55.927 55.927 0 00-.76-.43C2.908 14.73.563 14.116 0 14.116V9.888l.14.004c.564-.007 2.91-.622 3.809-1.124l1.016-.58.438-.274c.428-.28 1.072-.726 2.686-1.853 1.621-1.133 3.186-1.78 4.881-2.059 1.152-.19 1.974-.213 3.814-.138l.02-1.907z"></path></svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts b/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
index 3d426309b7..7f7d70841e 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
@@ -61,11 +61,15 @@ export class N8nLlmTracing extends BaseCallbackHandler {
 				totalTokens: completionTokens + promptTokens,
 			};
 		},
+		errorDescriptionMapper: (error: NodeError) => error.description,
 	};
 
 	constructor(
 		private executionFunctions: ISupplyDataFunctions,
-		options?: { tokensUsageParser: TokensUsageParser },
+		options?: {
+			tokensUsageParser?: TokensUsageParser;
+			errorDescriptionMapper?: (error: NodeError) => string;
+		},
 	) {
 		super();
 		this.options = { ...this.options, ...options };
@@ -192,6 +196,10 @@ export class N8nLlmTracing extends BaseCallbackHandler {
 		}
 
 		if (error instanceof NodeError) {
+			if (this.options.errorDescriptionMapper) {
+				error.description = this.options.errorDescriptionMapper(error);
+			}
+
 			this.executionFunctions.addOutputData(this.connectionType, runDetails.index, error);
 		} else {
 			// If the error is not a NodeError, we wrap it in a NodeOperationError
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
index 18fd76e3c5..81be577f79 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
@@ -1,9 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
 import { PostgresChatMessageHistory } from '@langchain/community/stores/message/postgres';
 import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
+import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/transport';
 import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
 import { postgresConnectionTest } from 'n8n-nodes-base/dist/nodes/Postgres/v2/methods/credentialTest';
-import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
 import type {
 	ISupplyDataFunctions,
 	INodeType,
@@ -115,12 +115,7 @@ export class MemoryPostgresChat implements INodeType {
 			...kOptions,
 		});
 
-		async function closeFunction() {
-			void pool.end();
-		}
-
 		return {
-			closeFunction,
 			response: logWrapper(memory, this),
 		};
 	}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
index 05ed1e619c..346234c8d3 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
@@ -237,6 +237,69 @@ describe('ToolHttpRequest', () => {
 				}),
 			);
 		});
+
+		it('should return the error when receiving text that contains a null character', async () => {
+			helpers.httpRequest.mockResolvedValue({
+				body: 'Hello\0World',
+				headers: {
+					'content-type': 'text/plain',
+				},
+			});
+
+			executeFunctions.getNodeParameter.mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'method':
+						return 'GET';
+					case 'url':
+						return 'https://httpbin.org/text/plain';
+					case 'options':
+						return {};
+					case 'placeholderDefinitions.values':
+						return [];
+					default:
+						return undefined;
+				}
+			});
+
+			const { response } = await httpTool.supplyData.call(executeFunctions, 0);
+			const res = await (response as N8nTool).invoke({});
+			expect(helpers.httpRequest).toHaveBeenCalled();
+			// Check that the returned string is formatted as an error message.
+			expect(res).toContain('error');
+			expect(res).toContain('Binary data is not supported');
+		});
+
+		it('should return the error when receiving a JSON response containing a null character', async () => {
+			// Provide a raw JSON string with a literal null character.
+			helpers.httpRequest.mockResolvedValue({
+				body: '{"message":"hello\0world"}',
+				headers: {
+					'content-type': 'application/json',
+				},
+			});
+
+			executeFunctions.getNodeParameter.mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'method':
+						return 'GET';
+					case 'url':
+						return 'https://httpbin.org/json';
+					case 'options':
+						return {};
+					case 'placeholderDefinitions.values':
+						return [];
+					default:
+						return undefined;
+				}
+			});
+
+			const { response } = await httpTool.supplyData.call(executeFunctions, 0);
+			const res = await (response as N8nTool).invoke({});
+			expect(helpers.httpRequest).toHaveBeenCalled();
+			// Check that the tool returns an error string rather than resolving to valid JSON.
+			expect(res).toContain('error');
+			expect(res).toContain('Binary data is not supported');
+		});
 	});
 
 	describe('Optimize response', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
index f1d6dfd150..0bd1b1a8a6 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
@@ -5,7 +5,6 @@ import { JSDOM } from 'jsdom';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import unset from 'lodash/unset';
-import * as mime from 'mime-types';
 import { getOAuth2AdditionalParameters } from 'n8n-nodes-base/dist/nodes/HttpRequest/GenericFunctions';
 import type {
 	IDataObject,
@@ -146,6 +145,25 @@ const defaultOptimizer = <T>(response: T) => {
 	return String(response);
 };
 
+function isBinary(data: unknown) {
+	// Check if data is a Buffer
+	if (Buffer.isBuffer(data)) {
+		return true;
+	}
+
+	// If data is a string, assume it's text unless it contains null characters.
+	if (typeof data === 'string') {
+		// If the string contains a null character, it's likely binary.
+		if (data.includes('\0')) {
+			return true;
+		}
+		return false;
+	}
+
+	// For any other type, assume it's not binary.
+	return false;
+}
+
 const htmlOptimizer = (ctx: ISupplyDataFunctions, itemIndex: number, maxLength: number) => {
 	const cssSelector = ctx.getNodeParameter('cssSelector', itemIndex, '') as string;
 	const onlyContent = ctx.getNodeParameter('onlyContent', itemIndex, false) as boolean;
@@ -755,13 +773,8 @@ export const configureToolFunction = (
 			if (!response) {
 				try {
 					// Check if the response is binary data
-					if (fullResponse?.headers?.['content-type']) {
-						const contentType = fullResponse.headers['content-type'] as string;
-						const mimeType = contentType.split(';')[0].trim();
-
-						if (mime.charset(mimeType) !== 'UTF-8') {
-							throw new NodeOperationError(ctx.getNode(), 'Binary data is not supported');
-						}
+					if (fullResponse.body && isBinary(fullResponse.body)) {
+						throw new NodeOperationError(ctx.getNode(), 'Binary data is not supported');
 					}
 
 					response = optimizeResponse(fullResponse.body);
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
index 22ca31e4da..98ca94cb1f 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
@@ -1,4 +1,3 @@
-import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
 import type {
 	INodeTypeBaseDescription,
 	ISupplyDataFunctions,
@@ -7,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { localResourceMapping } from './methods';
 import { WorkflowToolService } from './utils/WorkflowToolService';
 import { versionDescription } from './versionDescription';
 
@@ -21,9 +21,7 @@ export class ToolWorkflowV2 implements INodeType {
 	}
 
 	methods = {
-		localResourceMapping: {
-			loadWorkflowInputMappings,
-		},
+		localResourceMapping,
 	};
 
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
index 73aa24c6b7..a5aa4e41bc 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
@@ -11,9 +11,14 @@ import type {
 
 import { WorkflowToolService } from './utils/WorkflowToolService';
 
+type ISupplyDataFunctionsWithRunIndex = ISupplyDataFunctions & { runIndex: number };
+
 // Mock ISupplyDataFunctions interface
-function createMockContext(overrides?: Partial<ISupplyDataFunctions>): ISupplyDataFunctions {
+function createMockContext(
+	overrides?: Partial<ISupplyDataFunctions>,
+): ISupplyDataFunctionsWithRunIndex {
 	return {
+		runIndex: 0,
 		getNodeParameter: jest.fn(),
 		getWorkflowDataProxy: jest.fn(),
 		getNode: jest.fn(),
@@ -35,11 +40,11 @@ function createMockContext(overrides?: Partial<ISupplyDataFunctions>): ISupplyDa
 			warn: jest.fn(),
 		},
 		...overrides,
-	} as ISupplyDataFunctions;
+	} as ISupplyDataFunctionsWithRunIndex;
 }
 
 describe('WorkflowTool::WorkflowToolService', () => {
-	let context: ISupplyDataFunctions;
+	let context: ISupplyDataFunctionsWithRunIndex;
 	let service: WorkflowToolService;
 
 	beforeEach(() => {
@@ -93,6 +98,7 @@ describe('WorkflowTool::WorkflowToolService', () => {
 
 			expect(result).toBe(JSON.stringify(TEST_RESPONSE, null, 2));
 			expect(context.addOutputData).toHaveBeenCalled();
+			expect(context.runIndex).toBe(1);
 		});
 
 		it('should handle errors during tool execution', async () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts
new file mode 100644
index 0000000000..f43c9557ea
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/index.ts
@@ -0,0 +1 @@
+export * as localResourceMapping from './localResourceMapping';
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts
new file mode 100644
index 0000000000..74de9baae2
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/methods/localResourceMapping.ts
@@ -0,0 +1,24 @@
+import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
+import type { ILocalLoadOptionsFunctions, ResourceMapperFields } from 'n8n-workflow';
+
+export async function loadSubWorkflowInputs(
+	this: ILocalLoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const { fields, subworkflowInfo, dataMode } = await loadWorkflowInputMappings.bind(this)();
+	let emptyFieldsNotice: string | undefined;
+	if (fields.length === 0) {
+		const subworkflowLink = subworkflowInfo?.id
+			? `<a href="/workflow/${subworkflowInfo?.id}" target="_blank">sub-workflow’s trigger</a>`
+			: 'sub-workflow’s trigger';
+
+		switch (dataMode) {
+			case 'passthrough':
+				emptyFieldsNotice = `This sub-workflow is set up to receive all input data, without specific inputs the Agent will not be able to pass data to this tool. You can define specific inputs in the ${subworkflowLink}.`;
+				break;
+			default:
+				emptyFieldsNotice = `This sub-workflow will not receive any input when called by your AI node. Define your expected input in the ${subworkflowLink}.`;
+				break;
+		}
+	}
+	return { fields, emptyFieldsNotice };
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts
deleted file mode 100644
index 4b9b6ed58e..0000000000
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts
+++ /dev/null
@@ -1,284 +0,0 @@
-import type { ISupplyDataFunctions } from 'n8n-workflow';
-import { jsonParse, NodeOperationError } from 'n8n-workflow';
-import { z } from 'zod';
-
-type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
-export interface FromAIArgument {
-	key: string;
-	description?: string;
-	type?: AllowedTypes;
-	defaultValue?: string | number | boolean | Record<string, unknown>;
-}
-
-// TODO: We copied this class from the core package, once the new nodes context work is merged, this should be available in root node context and this file can be removed.
-// Please apply any changes to both files
-
-/**
- * AIParametersParser
- *
- * This class encapsulates the logic for parsing node parameters, extracting $fromAI calls,
- * generating Zod schemas, and creating LangChain tools.
- */
-export class AIParametersParser {
-	private ctx: ISupplyDataFunctions;
-
-	/**
-	 * Constructs an instance of AIParametersParser.
-	 * @param ctx The execution context.
-	 */
-	constructor(ctx: ISupplyDataFunctions) {
-		this.ctx = ctx;
-	}
-
-	/**
-	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
-	 * @param placeholder The FromAIArgument object containing key, type, description, and defaultValue.
-	 * @returns A Zod schema corresponding to the placeholder's type and constraints.
-	 */
-	generateZodSchema(placeholder: FromAIArgument): z.ZodTypeAny {
-		let schema: z.ZodTypeAny;
-
-		switch (placeholder.type?.toLowerCase()) {
-			case 'string':
-				schema = z.string();
-				break;
-			case 'number':
-				schema = z.number();
-				break;
-			case 'boolean':
-				schema = z.boolean();
-				break;
-			case 'json':
-				schema = z.record(z.any());
-				break;
-			default:
-				schema = z.string();
-		}
-
-		if (placeholder.description) {
-			schema = schema.describe(`${schema.description ?? ''} ${placeholder.description}`.trim());
-		}
-
-		if (placeholder.defaultValue !== undefined) {
-			schema = schema.default(placeholder.defaultValue);
-		}
-
-		return schema;
-	}
-
-	/**
-	 * Recursively traverses the nodeParameters object to find all $fromAI calls.
-	 * @param payload The current object or value being traversed.
-	 * @param collectedArgs The array collecting FromAIArgument objects.
-	 */
-	traverseNodeParameters(payload: unknown, collectedArgs: FromAIArgument[]) {
-		if (typeof payload === 'string') {
-			const fromAICalls = this.extractFromAICalls(payload);
-			fromAICalls.forEach((call) => collectedArgs.push(call));
-		} else if (Array.isArray(payload)) {
-			payload.forEach((item: unknown) => this.traverseNodeParameters(item, collectedArgs));
-		} else if (typeof payload === 'object' && payload !== null) {
-			Object.values(payload).forEach((value) => this.traverseNodeParameters(value, collectedArgs));
-		}
-	}
-
-	/**
-	 * Extracts all $fromAI calls from a given string
-	 * @param str The string to search for $fromAI calls.
-	 * @returns An array of FromAIArgument objects.
-	 *
-	 * This method uses a regular expression to find the start of each $fromAI function call
-	 * in the input string. It then employs a character-by-character parsing approach to
-	 * accurately extract the arguments of each call, handling nested parentheses and quoted strings.
-	 *
-	 * The parsing process:
-	 * 1. Finds the starting position of a $fromAI call using regex.
-	 * 2. Iterates through characters, keeping track of parentheses depth and quote status.
-	 * 3. Handles escaped characters within quotes to avoid premature quote closing.
-	 * 4. Builds the argument string until the matching closing parenthesis is found.
-	 * 5. Parses the extracted argument string into a FromAIArgument object.
-	 * 6. Repeats the process for all $fromAI calls in the input string.
-	 *
-	 */
-	extractFromAICalls(str: string): FromAIArgument[] {
-		const args: FromAIArgument[] = [];
-		// Regular expression to match the start of a $fromAI function call
-		const pattern = /\$fromAI\s*\(\s*/gi;
-		let match: RegExpExecArray | null;
-
-		while ((match = pattern.exec(str)) !== null) {
-			const startIndex = match.index + match[0].length;
-			let current = startIndex;
-			let inQuotes = false;
-			let quoteChar = '';
-			let parenthesesCount = 1;
-			let argsString = '';
-
-			// Parse the arguments string, handling nested parentheses and quotes
-			while (current < str.length && parenthesesCount > 0) {
-				const char = str[current];
-
-				if (inQuotes) {
-					// Handle characters inside quotes, including escaped characters
-					if (char === '\\' && current + 1 < str.length) {
-						argsString += char + str[current + 1];
-						current += 2;
-						continue;
-					}
-
-					if (char === quoteChar) {
-						inQuotes = false;
-						quoteChar = '';
-					}
-					argsString += char;
-				} else {
-					// Handle characters outside quotes
-					if (['"', "'", '`'].includes(char)) {
-						inQuotes = true;
-						quoteChar = char;
-					} else if (char === '(') {
-						parenthesesCount++;
-					} else if (char === ')') {
-						parenthesesCount--;
-					}
-
-					// Only add characters if we're still inside the main parentheses
-					if (parenthesesCount > 0 || char !== ')') {
-						argsString += char;
-					}
-				}
-
-				current++;
-			}
-
-			// If parentheses are balanced, parse the arguments
-			if (parenthesesCount === 0) {
-				try {
-					const parsedArgs = this.parseArguments(argsString);
-					args.push(parsedArgs);
-				} catch (error) {
-					// If parsing fails, throw an ApplicationError with details
-					throw new NodeOperationError(
-						this.ctx.getNode(),
-						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
-					);
-				}
-			} else {
-				// Log an error if parentheses are unbalanced
-				throw new NodeOperationError(
-					this.ctx.getNode(),
-					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
-				);
-			}
-		}
-
-		return args;
-	}
-
-	/**
-	 * Parses the arguments of a single $fromAI function call.
-	 * @param argsString The string containing the function arguments.
-	 * @returns A FromAIArgument object.
-	 */
-	parseArguments(argsString: string): FromAIArgument {
-		// Split arguments by commas not inside quotes
-		const args: string[] = [];
-		let currentArg = '';
-		let inQuotes = false;
-		let quoteChar = '';
-		let escapeNext = false;
-
-		for (let i = 0; i < argsString.length; i++) {
-			const char = argsString[i];
-
-			if (escapeNext) {
-				currentArg += char;
-				escapeNext = false;
-				continue;
-			}
-
-			if (char === '\\') {
-				escapeNext = true;
-				continue;
-			}
-
-			if (['"', "'", '`'].includes(char)) {
-				if (!inQuotes) {
-					inQuotes = true;
-					quoteChar = char;
-					currentArg += char;
-				} else if (char === quoteChar) {
-					inQuotes = false;
-					quoteChar = '';
-					currentArg += char;
-				} else {
-					currentArg += char;
-				}
-				continue;
-			}
-
-			if (char === ',' && !inQuotes) {
-				args.push(currentArg.trim());
-				currentArg = '';
-				continue;
-			}
-
-			currentArg += char;
-		}
-
-		if (currentArg) {
-			args.push(currentArg.trim());
-		}
-
-		// Remove surrounding quotes if present
-		const cleanArgs = args.map((arg) => {
-			const trimmed = arg.trim();
-			if (
-				(trimmed.startsWith("'") && trimmed.endsWith("'")) ||
-				(trimmed.startsWith('`') && trimmed.endsWith('`')) ||
-				(trimmed.startsWith('"') && trimmed.endsWith('"'))
-			) {
-				return trimmed
-					.slice(1, -1)
-					.replace(/\\'/g, "'")
-					.replace(/\\`/g, '`')
-					.replace(/\\"/g, '"')
-					.replace(/\\\\/g, '\\');
-			}
-			return trimmed;
-		});
-
-		const type = cleanArgs?.[2] || 'string';
-
-		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
-			throw new NodeOperationError(this.ctx.getNode(), `Invalid type: ${type}`);
-		}
-
-		return {
-			key: cleanArgs[0] || '',
-			description: cleanArgs[1],
-			type: (cleanArgs?.[2] ?? 'string') as AllowedTypes,
-			defaultValue: this.parseDefaultValue(cleanArgs[3]),
-		};
-	}
-
-	/**
-	 * Parses the default value, preserving its original type.
-	 * @param value The default value as a string.
-	 * @returns The parsed default value in its appropriate type.
-	 */
-	parseDefaultValue(
-		value: string | undefined,
-	): string | number | boolean | Record<string, unknown> | undefined {
-		if (value === undefined || value === '') return undefined;
-		const lowerValue = value.toLowerCase();
-		if (lowerValue === 'true') return true;
-		if (lowerValue === 'false') return false;
-		if (!isNaN(Number(value))) return Number(value);
-		try {
-			return jsonParse(value);
-		} catch {
-			return value;
-		}
-	}
-}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
index 2ce3c43556..3930938370 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
@@ -8,6 +8,7 @@ import { getCurrentWorkflowInputData } from 'n8n-nodes-base/dist/utils/workflowI
 import type {
 	ExecuteWorkflowData,
 	ExecutionError,
+	FromAIArgument,
 	IDataObject,
 	IExecuteWorkflowInfo,
 	INodeExecutionData,
@@ -18,12 +19,15 @@ import type {
 	IWorkflowDataProxyData,
 	ResourceMapperValue,
 } from 'n8n-workflow';
-import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import {
+	generateZodSchema,
+	jsonParse,
+	NodeConnectionType,
+	NodeOperationError,
+	traverseNodeParameters,
+} from 'n8n-workflow';
 import { z } from 'zod';
 
-import type { FromAIArgument } from './FromAIParser';
-import { AIParametersParser } from './FromAIParser';
-
 /**
 	Main class for creating the Workflow tool
 	Processes the node parameters and creates AI Agent tool capable of executing n8n workflows
@@ -90,6 +94,9 @@ export class WorkflowToolService {
 				const errorResponse = `There was an error: "${executionError.message}"`;
 				void this.context.addOutputData(NodeConnectionType.AiTool, index, executionError);
 				return errorResponse;
+			} finally {
+				// @ts-expect-error this accesses a private member on the actual implementation to fix https://linear.app/n8n/issue/ADO-3186/bug-workflowtool-v2-always-uses-first-row-of-input-data
+				this.context.runIndex++;
 			}
 		};
 
@@ -275,8 +282,7 @@ export class WorkflowToolService {
 		description: string,
 		func: (query: string | IDataObject, runManager?: CallbackManagerForToolRun) => Promise<string>,
 	): Promise<DynamicStructuredTool | DynamicTool> {
-		const fromAIParser = new AIParametersParser(this.context);
-		const collectedArguments = await this.extractFromAIParameters(fromAIParser);
+		const collectedArguments = await this.extractFromAIParameters();
 
 		// If there are no `fromAI` arguments, fallback to creating a simple tool
 		if (collectedArguments.length === 0) {
@@ -284,15 +290,13 @@ export class WorkflowToolService {
 		}
 
 		// Otherwise, prepare Zod schema  and create a structured tool
-		const schema = this.createZodSchema(collectedArguments, fromAIParser);
+		const schema = this.createZodSchema(collectedArguments);
 		return new DynamicStructuredTool({ schema, name, description, func });
 	}
 
-	private async extractFromAIParameters(
-		fromAIParser: AIParametersParser,
-	): Promise<FromAIArgument[]> {
+	private async extractFromAIParameters(): Promise<FromAIArgument[]> {
 		const collectedArguments: FromAIArgument[] = [];
-		fromAIParser.traverseNodeParameters(this.context.getNode().parameters, collectedArguments);
+		traverseNodeParameters(this.context.getNode().parameters, collectedArguments);
 
 		const uniqueArgsMap = new Map<string, FromAIArgument>();
 		for (const arg of collectedArguments) {
@@ -302,9 +306,9 @@ export class WorkflowToolService {
 		return Array.from(uniqueArgsMap.values());
 	}
 
-	private createZodSchema(args: FromAIArgument[], parser: AIParametersParser): z.ZodObject<any> {
+	private createZodSchema(args: FromAIArgument[]): z.ZodObject<any> {
 		const schemaObj = args.reduce((acc: Record<string, z.ZodTypeAny>, placeholder) => {
-			acc[placeholder.key] = parser.generateZodSchema(placeholder);
+			acc[placeholder.key] = generateZodSchema(placeholder);
 			return acc;
 		}, {});
 
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
index 469a7d6d4c..6d4275b449 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
@@ -107,7 +107,7 @@ export const versionDescription: INodeTypeDescription = {
 			typeOptions: {
 				loadOptionsDependsOn: ['workflowId.value'],
 				resourceMapper: {
-					localResourceMapperMethod: 'loadWorkflowInputMappings',
+					localResourceMapperMethod: 'loadSubWorkflowInputs',
 					valuesLabel: 'Workflow Inputs',
 					mode: 'map',
 					fieldWords: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
index 0323478ee8..d08bc2bab2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
@@ -1,3 +1,4 @@
+import type { MemoryVectorStore } from 'langchain/vectorstores/memory';
 import type { INodeProperties } from 'n8n-workflow';
 
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
@@ -20,7 +21,7 @@ const insertFields: INodeProperties[] = [
 	},
 ];
 
-export class VectorStoreInMemory extends createVectorStoreNode({
+export class VectorStoreInMemory extends createVectorStoreNode<MemoryVectorStore>({
 	meta: {
 		displayName: 'In-Memory Vector Store',
 		name: 'vectorStoreInMemory',
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
index d9d5ee611a..7b2ab7664d 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
@@ -4,8 +4,8 @@ import {
 	type PGVectorStoreArgs,
 } from '@langchain/community/vectorstores/pgvector';
 import type { EmbeddingsInterface } from '@langchain/core/embeddings';
+import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/transport';
 import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
-import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
 import type { INodeProperties } from 'n8n-workflow';
 import type pg from 'pg';
 
@@ -213,7 +213,7 @@ class ExtendedPGVectorStore extends PGVectorStore {
 	}
 }
 
-export class VectorStorePGVector extends createVectorStoreNode({
+export class VectorStorePGVector extends createVectorStoreNode<ExtendedPGVectorStore>({
 	meta: {
 		description: 'Work with your data in Postgresql with the PGVector extension',
 		icon: 'file:postgres.svg',
@@ -274,6 +274,7 @@ export class VectorStorePGVector extends createVectorStoreNode({
 
 		return await ExtendedPGVectorStore.initialize(embeddings, config);
 	},
+
 	async populateVectorStore(context, embeddings, documents, itemIndex) {
 		// NOTE: if you are to create the HNSW index before use, you need to consider moving the distanceStrategy field to
 		// shared fields, because you need that strategy when creating the index.
@@ -307,6 +308,11 @@ export class VectorStorePGVector extends createVectorStoreNode({
 			metadataColumnName: 'metadata',
 		}) as ColumnOptions;
 
-		await PGVectorStore.fromDocuments(documents, embeddings, config);
+		const vectorStore = await PGVectorStore.fromDocuments(documents, embeddings, config);
+		vectorStore.client?.release();
+	},
+
+	releaseVectorStoreClient(vectorStore) {
+		vectorStore.client?.release();
 	},
 }) {}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
index 5a11acea24..61761a54ec 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
@@ -51,7 +51,7 @@ const insertFields: INodeProperties[] = [
 	},
 ];
 
-export class VectorStorePinecone extends createVectorStoreNode({
+export class VectorStorePinecone extends createVectorStoreNode<PineconeStore>({
 	meta: {
 		displayName: 'Pinecone Vector Store',
 		name: 'vectorStorePinecone',
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
index 988f607ad7..e18cc4988e 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
@@ -79,7 +79,7 @@ const retrieveFields: INodeProperties[] = [
 	},
 ];
 
-export class VectorStoreQdrant extends createVectorStoreNode({
+export class VectorStoreQdrant extends createVectorStoreNode<ExtendedQdrantVectorStore>({
 	meta: {
 		displayName: 'Qdrant Vector Store',
 		name: 'vectorStoreQdrant',
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
index a462ff8cf6..6ec3975ebd 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
@@ -41,7 +41,7 @@ const retrieveFields: INodeProperties[] = [
 
 const updateFields: INodeProperties[] = [...insertFields];
 
-export class VectorStoreSupabase extends createVectorStoreNode({
+export class VectorStoreSupabase extends createVectorStoreNode<SupabaseVectorStore>({
 	meta: {
 		description: 'Work with your data in Supabase Vector Store',
 		icon: 'file:supabase.svg',
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
index 1372d54f6e..5c973002b2 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
@@ -46,7 +46,7 @@ const retrieveFields: INodeProperties[] = [
 	},
 ];
 
-export class VectorStoreZep extends createVectorStoreNode({
+export class VectorStoreZep extends createVectorStoreNode<ZepVectorStore | ZepCloudVectorStore>({
 	meta: {
 		displayName: 'Zep Vector Store',
 		name: 'vectorStoreZep',
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index 441126c985..ecf2e64a81 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -49,7 +49,7 @@ interface NodeMeta {
 	operationModes?: NodeOperationMode[];
 }
 
-export interface VectorStoreNodeConstructorArgs {
+export interface VectorStoreNodeConstructorArgs<T extends VectorStore = VectorStore> {
 	meta: NodeMeta;
 	methods?: {
 		listSearch?: {
@@ -77,7 +77,8 @@ export interface VectorStoreNodeConstructorArgs {
 		filter: Record<string, never> | undefined,
 		embeddings: Embeddings,
 		itemIndex: number,
-	) => Promise<VectorStore>;
+	) => Promise<T>;
+	releaseVectorStoreClient?: (vectorStore: T) => void;
 }
 
 function transformDescriptionForOperationMode(
@@ -90,11 +91,15 @@ function transformDescriptionForOperationMode(
 	}));
 }
 
-function isUpdateSupported(args: VectorStoreNodeConstructorArgs): boolean {
+function isUpdateSupported<T extends VectorStore>(
+	args: VectorStoreNodeConstructorArgs<T>,
+): boolean {
 	return args.meta.operationModes?.includes('update') ?? false;
 }
 
-function getOperationModeOptions(args: VectorStoreNodeConstructorArgs): INodePropertyOptions[] {
+function getOperationModeOptions<T extends VectorStore>(
+	args: VectorStoreNodeConstructorArgs<T>,
+): INodePropertyOptions[] {
 	const enabledOperationModes = args.meta.operationModes ?? DEFAULT_OPERATION_MODES;
 
 	const allOptions = [
@@ -137,7 +142,9 @@ function getOperationModeOptions(args: VectorStoreNodeConstructorArgs): INodePro
 	);
 }
 
-export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
+export const createVectorStoreNode = <T extends VectorStore = VectorStore>(
+	args: VectorStoreNodeConstructorArgs<T>,
+) =>
 	class VectorStoreNodeType implements INodeType {
 		description: INodeTypeDescription = {
 			displayName: args.meta.displayName,
@@ -334,38 +341,42 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						embeddings,
 						itemIndex,
 					);
-					const prompt = this.getNodeParameter('prompt', itemIndex) as string;
-					const topK = this.getNodeParameter('topK', itemIndex, 4) as number;
+					try {
+						const prompt = this.getNodeParameter('prompt', itemIndex) as string;
+						const topK = this.getNodeParameter('topK', itemIndex, 4) as number;
 
-					const embeddedPrompt = await embeddings.embedQuery(prompt);
-					const docs = await vectorStore.similaritySearchVectorWithScore(
-						embeddedPrompt,
-						topK,
-						filter,
-					);
+						const embeddedPrompt = await embeddings.embedQuery(prompt);
+						const docs = await vectorStore.similaritySearchVectorWithScore(
+							embeddedPrompt,
+							topK,
+							filter,
+						);
 
-					const includeDocumentMetadata = this.getNodeParameter(
-						'includeDocumentMetadata',
-						itemIndex,
-						true,
-					) as boolean;
+						const includeDocumentMetadata = this.getNodeParameter(
+							'includeDocumentMetadata',
+							itemIndex,
+							true,
+						) as boolean;
 
-					const serializedDocs = docs.map(([doc, score]) => {
-						const document = {
-							pageContent: doc.pageContent,
-							...(includeDocumentMetadata ? { metadata: doc.metadata } : {}),
-						};
+						const serializedDocs = docs.map(([doc, score]) => {
+							const document = {
+								pageContent: doc.pageContent,
+								...(includeDocumentMetadata ? { metadata: doc.metadata } : {}),
+							};
 
-						return {
-							json: { document, score },
-							pairedItem: {
-								item: itemIndex,
-							},
-						};
-					});
+							return {
+								json: { document, score },
+								pairedItem: {
+									item: itemIndex,
+								},
+							};
+						});
 
-					resultData.push(...serializedDocs);
-					logAiEvent(this, 'ai-vector-store-searched', { query: prompt });
+						resultData.push(...serializedDocs);
+						logAiEvent(this, 'ai-vector-store-searched', { query: prompt });
+					} finally {
+						args.releaseVectorStoreClient?.(vectorStore);
+					}
 				}
 
 				return [resultData];
@@ -392,13 +403,9 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 					);
 					resultData.push(...serializedDocuments);
 
-					try {
-						await args.populateVectorStore(this, embeddings, processedDocuments, itemIndex);
+					await args.populateVectorStore(this, embeddings, processedDocuments, itemIndex);
 
-						logAiEvent(this, 'ai-vector-store-populated');
-					} catch (error) {
-						throw error;
-					}
+					logAiEvent(this, 'ai-vector-store-populated');
 				}
 
 				return [resultData];
@@ -431,27 +438,27 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						itemIndex,
 					);
 
-					const { processedDocuments, serializedDocuments } = await processDocument(
-						loader,
-						itemData,
-						itemIndex,
-					);
-
-					if (processedDocuments?.length !== 1) {
-						throw new NodeOperationError(this.getNode(), 'Single document per item expected');
-					}
-
-					resultData.push(...serializedDocuments);
-
 					try {
+						const { processedDocuments, serializedDocuments } = await processDocument(
+							loader,
+							itemData,
+							itemIndex,
+						);
+
+						if (processedDocuments?.length !== 1) {
+							throw new NodeOperationError(this.getNode(), 'Single document per item expected');
+						}
+
+						resultData.push(...serializedDocuments);
+
 						// Use ids option to upsert instead of insert
 						await vectorStore.addDocuments(processedDocuments, {
 							ids: [documentId],
 						});
 
 						logAiEvent(this, 'ai-vector-store-updated');
-					} catch (error) {
-						throw error;
+					} finally {
+						args.releaseVectorStoreClient?.(vectorStore);
 					}
 				}
 
@@ -476,6 +483,9 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 				const vectorStore = await args.getVectorStoreClient(this, filter, embeddings, itemIndex);
 				return {
 					response: logWrapper(vectorStore, this),
+					closeFunction: async () => {
+						args.releaseVectorStoreClient?.(vectorStore);
+					},
 				};
 			}
 
@@ -499,23 +509,28 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 							embeddings,
 							itemIndex,
 						);
-						const embeddedPrompt = await embeddings.embedQuery(input);
-						const documents = await vectorStore.similaritySearchVectorWithScore(
-							embeddedPrompt,
-							topK,
-							filter,
-						);
-						return documents
-							.map((document) => {
-								if (includeDocumentMetadata) {
-									return { type: 'text', text: JSON.stringify(document[0]) };
-								}
-								return {
-									type: 'text',
-									text: JSON.stringify({ pageContent: document[0].pageContent }),
-								};
-							})
-							.filter((document) => !!document);
+
+						try {
+							const embeddedPrompt = await embeddings.embedQuery(input);
+							const documents = await vectorStore.similaritySearchVectorWithScore(
+								embeddedPrompt,
+								topK,
+								filter,
+							);
+							return documents
+								.map((document) => {
+									if (includeDocumentMetadata) {
+										return { type: 'text', text: JSON.stringify(document[0]) };
+									}
+									return {
+										type: 'text',
+										text: JSON.stringify({ pageContent: document[0].pageContent }),
+									};
+								})
+								.filter((document) => !!document);
+						} finally {
+							args.releaseVectorStoreClient?.(vectorStore);
+						}
 					},
 				});
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
index dcf056618a..33c1b9ef2d 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
@@ -76,9 +76,16 @@ export async function modelSearch(
 	this: ILoadOptionsFunctions,
 	filter?: string,
 ): Promise<INodeListSearchResult> {
+	const credentials = await this.getCredentials<{ url: string }>('openAiApi');
+	const isCustomAPI = credentials.url && !credentials.url.includes('api.openai.com');
+
 	return await getModelSearch(
 		(model) =>
-			model.id.startsWith('gpt-') || model.id.startsWith('ft:') || model.id.startsWith('o1'),
+			isCustomAPI ||
+			model.id.startsWith('gpt-') ||
+			model.id.startsWith('ft:') ||
+			model.id.startsWith('o1') ||
+			model.id.startsWith('o3'),
 	)(this, filter);
 }
 
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index c7cc10aa77..519b9f6ad4 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.74.0",
+  "version": "1.78.0",
   "description": "",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm run watch",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-metadata",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-static-files && pnpm n8n-generate-metadata",
     "format": "biome format --write .",
     "format:check": "biome ci .",
     "lint": "eslint nodes credentials utils --quiet",
@@ -25,12 +25,14 @@
       "dist/credentials/AnthropicApi.credentials.js",
       "dist/credentials/AzureOpenAiApi.credentials.js",
       "dist/credentials/CohereApi.credentials.js",
+      "dist/credentials/DeepSeekApi.credentials.js",
       "dist/credentials/GooglePalmApi.credentials.js",
       "dist/credentials/GroqApi.credentials.js",
       "dist/credentials/HuggingFaceApi.credentials.js",
       "dist/credentials/MotorheadApi.credentials.js",
       "dist/credentials/MistralCloudApi.credentials.js",
       "dist/credentials/OllamaApi.credentials.js",
+      "dist/credentials/OpenRouterApi.credentials.js",
       "dist/credentials/PineconeApi.credentials.js",
       "dist/credentials/QdrantApi.credentials.js",
       "dist/credentials/SerpApi.credentials.js",
@@ -64,11 +66,13 @@
       "dist/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.js",
       "dist/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.js",
       "dist/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.js",
+      "dist/nodes/llms/LmChatDeepSeek/LmChatDeepSeek.node.js",
       "dist/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.js",
       "dist/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.js",
       "dist/nodes/llms/LmChatGroq/LmChatGroq.node.js",
       "dist/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.js",
       "dist/nodes/llms/LMChatOllama/LmChatOllama.node.js",
+      "dist/nodes/llms/LmChatOpenRouter/LmChatOpenRouter.node.js",
       "dist/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.js",
       "dist/nodes/llms/LMOpenAi/LmOpenAi.node.js",
       "dist/nodes/llms/LMCohere/LmCohere.node.js",
@@ -136,17 +140,17 @@
     "@google-cloud/resource-manager": "5.3.0",
     "@google/generative-ai": "0.21.0",
     "@huggingface/inference": "2.8.0",
-    "@langchain/anthropic": "0.3.8",
-    "@langchain/aws": "0.1.2",
-    "@langchain/cohere": "0.3.1",
-    "@langchain/community": "0.3.15",
+    "@langchain/anthropic": "0.3.11",
+    "@langchain/aws": "0.1.3",
+    "@langchain/cohere": "0.3.2",
+    "@langchain/community": "0.3.24",
     "@langchain/core": "catalog:",
-    "@langchain/google-genai": "0.1.4",
-    "@langchain/google-vertexai": "0.1.3",
-    "@langchain/groq": "0.1.2",
+    "@langchain/google-genai": "0.1.6",
+    "@langchain/google-vertexai": "0.1.8",
+    "@langchain/groq": "0.1.3",
     "@langchain/mistralai": "0.2.0",
-    "@langchain/ollama": "0.1.2",
-    "@langchain/openai": "0.3.14",
+    "@langchain/ollama": "0.1.4",
+    "@langchain/openai": "0.3.17",
     "@langchain/pinecone": "0.1.3",
     "@langchain/qdrant": "0.1.1",
     "@langchain/redis": "0.1.0",
@@ -168,13 +172,13 @@
     "generate-schema": "2.6.0",
     "html-to-text": "9.0.5",
     "jsdom": "23.0.1",
-    "langchain": "0.3.6",
+    "langchain": "0.3.11",
     "lodash": "catalog:",
     "mammoth": "1.7.2",
     "mime-types": "2.1.35",
     "n8n-nodes-base": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "openai": "4.73.1",
+    "openai": "4.78.1",
     "pdf-parse": "1.1.1",
     "pg": "8.12.0",
     "redis": "4.6.12",
diff --git a/packages/@n8n/nodes-langchain/types/types.ts b/packages/@n8n/nodes-langchain/types/types.ts
new file mode 100644
index 0000000000..75d1044132
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/types/types.ts
@@ -0,0 +1 @@
+type OpenAICompatibleCredential = { apiKey: string; url: string };
diff --git a/packages/@n8n/storybook/package.json b/packages/@n8n/storybook/package.json
index 6018fbd4b2..9506a7188e 100644
--- a/packages/@n8n/storybook/package.json
+++ b/packages/@n8n/storybook/package.json
@@ -3,19 +3,19 @@
   "private": true,
   "version": "0.0.1",
   "devDependencies": {
-    "@chromatic-com/storybook": "^3.2.2",
-    "@storybook/addon-a11y": "^8.4.6",
-    "@storybook/addon-actions": "^8.4.6",
-    "@storybook/addon-docs": "^8.4.6",
-    "@storybook/addon-essentials": "^8.4.6",
-    "@storybook/addon-interactions": "^8.4.6",
-    "@storybook/addon-links": "^8.4.6",
-    "@storybook/addon-themes": "^8.4.6",
-    "@storybook/blocks": "^8.4.6",
-    "@storybook/test": "^8.4.6",
-    "@storybook/vue3": "^8.4.6",
-    "@storybook/vue3-vite": "^8.4.6",
-    "chromatic": "^11.20.0",
-    "storybook": "^8.4.6"
+    "@chromatic-com/storybook": "^3.2.4",
+    "@storybook/addon-a11y": "^8.5.0",
+    "@storybook/addon-actions": "^8.5.0",
+    "@storybook/addon-docs": "^8.5.0",
+    "@storybook/addon-essentials": "^8.5.0",
+    "@storybook/addon-interactions": "^8.5.0",
+    "@storybook/addon-links": "^8.5.0",
+    "@storybook/addon-themes": "^8.5.0",
+    "@storybook/blocks": "^8.5.0",
+    "@storybook/test": "^8.5.0",
+    "@storybook/vue3": "^8.5.0",
+    "@storybook/vue3-vite": "^8.5.0",
+    "chromatic": "^11.25.0",
+    "storybook": "^8.5.0"
   }
 }
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
index c32ea2714e..b8782a252f 100644
--- a/packages/@n8n/task-runner/package.json
+++ b/packages/@n8n/task-runner/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/task-runner",
-  "version": "1.12.0",
+  "version": "1.16.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "start": "node dist/start.js",
@@ -40,13 +40,13 @@
     "acorn": "8.14.0",
     "acorn-walk": "8.3.4",
     "lodash": "catalog:",
+    "luxon": "catalog:",
     "n8n-core": "workspace:*",
     "n8n-workflow": "workspace:*",
     "nanoid": "catalog:",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@types/lodash": "catalog:",
-    "luxon": "catalog:"
+    "@types/lodash": "catalog:"
   }
 }
diff --git a/packages/@n8n/task-runner/src/__tests__/task-runner-sentry.test.ts b/packages/@n8n/task-runner/src/__tests__/task-runner-sentry.test.ts
new file mode 100644
index 0000000000..6fe14a484a
--- /dev/null
+++ b/packages/@n8n/task-runner/src/__tests__/task-runner-sentry.test.ts
@@ -0,0 +1,178 @@
+import type { ErrorEvent } from '@sentry/types';
+import { mock } from 'jest-mock-extended';
+import type { ErrorReporter } from 'n8n-core';
+
+import { TaskRunnerSentry } from '../task-runner-sentry';
+
+describe('TaskRunnerSentry', () => {
+	afterEach(() => {
+		jest.resetAllMocks();
+	});
+
+	describe('filterOutUserCodeErrors', () => {
+		const sentry = new TaskRunnerSentry(
+			{
+				dsn: 'https://sentry.io/123',
+				n8nVersion: '1.0.0',
+				environment: 'local',
+				deploymentName: 'test',
+			},
+			mock(),
+		);
+
+		it('should filter out user code errors', () => {
+			const event: ErrorEvent = {
+				type: undefined,
+				exception: {
+					values: [
+						{
+							type: 'ReferenceError',
+							value: 'fetch is not defined',
+							stacktrace: {
+								frames: [
+									{
+										filename: 'app:///dist/js-task-runner/js-task-runner.js',
+										module: 'js-task-runner:js-task-runner',
+										function: 'JsTaskRunner.executeTask',
+									},
+									{
+										filename: 'app:///dist/js-task-runner/js-task-runner.js',
+										module: 'js-task-runner:js-task-runner',
+										function: 'JsTaskRunner.runForAllItems',
+									},
+									{
+										filename: '<anonymous>',
+										module: '<anonymous>',
+										function: 'new Promise',
+									},
+									{
+										filename: 'app:///dist/js-task-runner/js-task-runner.js',
+										module: 'js-task-runner:js-task-runner',
+										function: 'result',
+									},
+									{
+										filename: 'node:vm',
+										module: 'node:vm',
+										function: 'runInContext',
+									},
+									{
+										filename: 'node:vm',
+										module: 'node:vm',
+										function: 'Script.runInContext',
+									},
+									{
+										filename: 'evalmachine.<anonymous>',
+										module: 'evalmachine.<anonymous>',
+										function: '?',
+									},
+									{
+										filename: 'evalmachine.<anonymous>',
+										module: 'evalmachine.<anonymous>',
+										function: 'VmCodeWrapper',
+									},
+									{
+										filename: '<anonymous>',
+										module: '<anonymous>',
+										function: 'new Promise',
+									},
+									{
+										filename: 'evalmachine.<anonymous>',
+										module: 'evalmachine.<anonymous>',
+									},
+								],
+							},
+							mechanism: { type: 'onunhandledrejection', handled: false },
+						},
+					],
+				},
+				event_id: '18bb78bb3d9d44c4acf3d774c2cfbfd8',
+				platform: 'node',
+				contexts: {
+					trace: { trace_id: '3c3614d33a6b47f09b85ec7d2710acea', span_id: 'ad00fdf6d6173aeb' },
+					runtime: { name: 'node', version: 'v20.17.0' },
+				},
+			};
+
+			expect(sentry.filterOutUserCodeErrors(event)).toBe(true);
+		});
+	});
+
+	describe('initIfEnabled', () => {
+		const mockErrorReporter = mock<ErrorReporter>();
+
+		it('should not configure sentry if dsn is not set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: '',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.initIfEnabled();
+
+			expect(mockErrorReporter.init).not.toHaveBeenCalled();
+		});
+
+		it('should configure sentry if dsn is set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: 'https://sentry.io/123',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.initIfEnabled();
+
+			expect(mockErrorReporter.init).toHaveBeenCalledWith({
+				dsn: 'https://sentry.io/123',
+				beforeSendFilter: sentry.filterOutUserCodeErrors,
+				release: '1.0.0',
+				environment: 'local',
+				serverName: 'test',
+				serverType: 'task_runner',
+			});
+		});
+	});
+
+	describe('shutdown', () => {
+		const mockErrorReporter = mock<ErrorReporter>();
+
+		it('should not shutdown sentry if dsn is not set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: '',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.shutdown();
+
+			expect(mockErrorReporter.shutdown).not.toHaveBeenCalled();
+		});
+
+		it('should shutdown sentry if dsn is set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: 'https://sentry.io/123',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.shutdown();
+
+			expect(mockErrorReporter.shutdown).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/@n8n/task-runner/src/config/sentry-config.ts b/packages/@n8n/task-runner/src/config/sentry-config.ts
index 691f64244f..ae24221a5e 100644
--- a/packages/@n8n/task-runner/src/config/sentry-config.ts
+++ b/packages/@n8n/task-runner/src/config/sentry-config.ts
@@ -2,9 +2,9 @@ import { Config, Env } from '@n8n/config';
 
 @Config
 export class SentryConfig {
-	/** Sentry DSN */
+	/** Sentry DSN (data source name) */
 	@Env('N8N_SENTRY_DSN')
-	sentryDsn: string = '';
+	dsn: string = '';
 
 	//#region Metadata about the environment
 
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
index 5ebd965e87..a666240098 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/js-task-runner.test.ts
@@ -1,4 +1,4 @@
-import { DateTime } from 'luxon';
+import { DateTime, Duration, Interval } from 'luxon';
 import type { IBinaryData } from 'n8n-workflow';
 import { setGlobalState, type CodeExecutionMode, type IDataObject } from 'n8n-workflow';
 import fs from 'node:fs';
@@ -50,7 +50,7 @@ describe('JsTaskRunner', () => {
 				...jsRunnerOpts,
 			},
 			sentryConfig: {
-				sentryDsn: '',
+				dsn: '',
 				deploymentName: '',
 				environment: '',
 				n8nVersion: '',
@@ -302,6 +302,7 @@ describe('JsTaskRunner', () => {
 				['typeof clearInterval', 'function'],
 				['typeof clearImmediate', 'function'],
 			],
+			eval: [['eval("1+2")', 3]],
 			'JS built-ins': [
 				['typeof btoa', 'function'],
 				['typeof atob', 'function'],
@@ -1341,4 +1342,98 @@ describe('JsTaskRunner', () => {
 			task.cleanup();
 		});
 	});
+
+	describe('prototype pollution prevention', () => {
+		const checkPrototypeIntact = () => {
+			const obj: Record<string, unknown> = {};
+			expect(obj.maliciousKey).toBeUndefined();
+		};
+
+		test('Object.setPrototypeOf should no-op for local object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = {};
+					Object.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('Reflect.setPrototypeOf should no-op for local object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = {};
+					Reflect.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('Object.setPrototypeOf should no-op for incoming object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = $input.first();
+					Object.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('Reflect.setPrototypeOf should no-op for incoming object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = $input.first();
+					Reflect.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('should freeze luxon prototypes', async () => {
+			const outcome = await executeForAllItems({
+				code: `
+				[DateTime, Interval, Duration]
+						.forEach(constructor => {
+								constructor.prototype.maliciousKey = 'value';
+						});
+
+				return []
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([]);
+
+			// @ts-expect-error Non-existing property
+			expect(DateTime.now().maliciousKey).toBeUndefined();
+			// @ts-expect-error Non-existing property
+			expect(Interval.fromISO('P1Y2M10DT2H30M').maliciousKey).toBeUndefined();
+			// @ts-expect-error Non-existing property
+			expect(Duration.fromObject({ hours: 1 }).maliciousKey).toBeUndefined();
+		});
+	});
 });
diff --git a/packages/@n8n/task-runner/src/js-task-runner/__tests__/require-resolver.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/require-resolver.test.ts
new file mode 100644
index 0000000000..16e0f99e7c
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/require-resolver.test.ts
@@ -0,0 +1,78 @@
+import { ApplicationError } from 'n8n-workflow';
+
+import { ExecutionError } from '@/js-task-runner/errors/execution-error';
+
+import { createRequireResolver, type RequireResolverOpts } from '../require-resolver';
+
+describe('require resolver', () => {
+	let defaultOpts: RequireResolverOpts;
+
+	beforeEach(() => {
+		defaultOpts = {
+			allowedBuiltInModules: new Set(['path', 'fs']),
+			allowedExternalModules: new Set(['lodash']),
+		};
+	});
+
+	describe('built-in modules', () => {
+		it('should allow requiring whitelisted built-in modules', () => {
+			const resolver = createRequireResolver(defaultOpts);
+			expect(() => resolver('path')).not.toThrow();
+			expect(() => resolver('fs')).not.toThrow();
+		});
+
+		it('should throw when requiring non-whitelisted built-in modules', () => {
+			const resolver = createRequireResolver(defaultOpts);
+			expect(() => resolver('crypto')).toThrow(ExecutionError);
+		});
+
+		it('should allow all built-in modules when allowedBuiltInModules is "*"', () => {
+			const resolver = createRequireResolver({
+				...defaultOpts,
+				allowedBuiltInModules: '*',
+			});
+
+			expect(() => resolver('path')).not.toThrow();
+			expect(() => resolver('crypto')).not.toThrow();
+			expect(() => resolver('fs')).not.toThrow();
+		});
+	});
+
+	describe('external modules', () => {
+		it('should allow requiring whitelisted external modules', () => {
+			const resolver = createRequireResolver(defaultOpts);
+			expect(() => resolver('lodash')).not.toThrow();
+		});
+
+		it('should throw when requiring non-whitelisted external modules', () => {
+			const resolver = createRequireResolver(defaultOpts);
+			expect(() => resolver('express')).toThrow(
+				new ExecutionError(new ApplicationError("Cannot find module 'express'")),
+			);
+		});
+
+		it('should allow all external modules when allowedExternalModules is "*"', () => {
+			const resolver = createRequireResolver({
+				...defaultOpts,
+				allowedExternalModules: '*',
+			});
+
+			expect(() => resolver('lodash')).not.toThrow();
+			expect(() => resolver('express')).not.toThrow();
+		});
+	});
+
+	describe('error handling', () => {
+		it('should wrap ApplicationError in ExecutionError', () => {
+			const resolver = createRequireResolver(defaultOpts);
+			expect(() => resolver('non-existent-module')).toThrow(ExecutionError);
+		});
+
+		it('should include the module name in the error message', () => {
+			const resolver = createRequireResolver(defaultOpts);
+			expect(() => resolver('non-existent-module')).toThrow(
+				"Cannot find module 'non-existent-module'",
+			);
+		});
+	});
+});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts
index dd866fc381..1f839b38f2 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts
@@ -253,6 +253,7 @@ describe('BuiltInsParser', () => {
 				'$node',
 				'$self',
 				'$parameter',
+				'$rawParameter',
 				'$prevNode',
 				'$runIndex',
 				'$mode',
diff --git a/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts b/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
index ab2cc3a304..25a8f8dfa4 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/js-task-runner.ts
@@ -1,6 +1,7 @@
 import set from 'lodash/set';
+import { DateTime, Duration, Interval } from 'luxon';
 import { getAdditionalKeys } from 'n8n-core';
-import { WorkflowDataProxy, Workflow, ObservableObject } from 'n8n-workflow';
+import { WorkflowDataProxy, Workflow, ObservableObject, Expression } from 'n8n-workflow';
 import type {
 	CodeExecutionMode,
 	IWorkflowExecuteAdditionalData,
@@ -19,7 +20,7 @@ import type {
 } from 'n8n-workflow';
 import * as a from 'node:assert';
 import { inspect } from 'node:util';
-import { runInNewContext, type Context } from 'node:vm';
+import { type Context, createContext, runInContext } from 'node:vm';
 
 import type { MainConfig } from '@/config/main-config';
 import { UnsupportedFunctionError } from '@/js-task-runner/errors/unsupported-function.error';
@@ -97,12 +98,55 @@ export class JsTaskRunner extends TaskRunner {
 		const { jsRunnerConfig } = config;
 
 		const parseModuleAllowList = (moduleList: string) =>
-			moduleList === '*' ? null : new Set(moduleList.split(',').map((x) => x.trim()));
+			moduleList === '*'
+				? '*'
+				: new Set(
+						moduleList
+							.split(',')
+							.map((x) => x.trim())
+							.filter((x) => x !== ''),
+					);
+
+		const allowedBuiltInModules = parseModuleAllowList(jsRunnerConfig.allowedBuiltInModules ?? '');
+		const allowedExternalModules = parseModuleAllowList(
+			jsRunnerConfig.allowedExternalModules ?? '',
+		);
 
 		this.requireResolver = createRequireResolver({
-			allowedBuiltInModules: parseModuleAllowList(jsRunnerConfig.allowedBuiltInModules ?? ''),
-			allowedExternalModules: parseModuleAllowList(jsRunnerConfig.allowedExternalModules ?? ''),
+			allowedBuiltInModules,
+			allowedExternalModules,
 		});
+
+		this.preventPrototypePollution(allowedExternalModules);
+	}
+
+	private preventPrototypePollution(allowedExternalModules: Set<string> | '*') {
+		if (allowedExternalModules instanceof Set) {
+			// This is a workaround to enable the allowed external libraries to mutate
+			// prototypes directly. For example momentjs overrides .toString() directly
+			// on the Moment.prototype, which doesn't work if Object.prototype has been
+			// frozen. This works as long as the overrides are done when the library is
+			// imported.
+			for (const module of allowedExternalModules) {
+				require(module);
+			}
+		}
+
+		// Freeze globals, except for Jest
+		if (process.env.NODE_ENV !== 'test') {
+			Object.getOwnPropertyNames(globalThis)
+				// @ts-expect-error globalThis does not have string in index signature
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
+				.map((name) => globalThis[name])
+				.filter((value) => typeof value === 'function')
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
+				.forEach((fn) => Object.freeze(fn.prototype));
+		}
+
+		// Freeze internal classes
+		[Workflow, Expression, WorkflowDataProxy, DateTime, Interval, Duration]
+			.map((constructor) => constructor.prototype)
+			.forEach(Object.freeze);
 	}
 
 	async executeTask(
@@ -158,10 +202,8 @@ export class JsTaskRunner extends TaskRunner {
 
 	private getNativeVariables() {
 		return {
-			// Exposed Node.js globals in vm2
+			// Exposed Node.js globals
 			Buffer,
-			Function,
-			eval,
 			setTimeout,
 			setInterval,
 			setImmediate,
@@ -205,8 +247,11 @@ export class JsTaskRunner extends TaskRunner {
 
 				signal.addEventListener('abort', abortHandler, { once: true });
 
-				const taskResult = runInNewContext(
-					`globalThis.global = globalThis; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+				const preventPrototypeManipulation =
+					'Object.getPrototypeOf = () => ({}); Reflect.getPrototypeOf = () => ({}); Object.setPrototypeOf = () => false; Reflect.setPrototypeOf = () => false;';
+
+				const taskResult = runInContext(
+					`globalThis.global = globalThis; ${preventPrototypeManipulation}; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
 					context,
 					{ timeout: this.taskTimeout * 1000 },
 				) as Promise<TaskResultData['result']>;
@@ -268,7 +313,7 @@ export class JsTaskRunner extends TaskRunner {
 
 					signal.addEventListener('abort', abortHandler);
 
-					const taskResult = runInNewContext(
+					const taskResult = runInContext(
 						`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
 						context,
 						{ timeout: this.taskTimeout * 1000 },
@@ -463,14 +508,14 @@ export class JsTaskRunner extends TaskRunner {
 	 * @param dataProxy The data proxy object that provides access to built-ins
 	 * @param additionalProperties Additional properties to add to the context
 	 */
-	private buildContext(
+	buildContext(
 		taskId: string,
 		workflow: Workflow,
 		node: INode,
 		dataProxy: IWorkflowDataProxyData,
 		additionalProperties: Record<string, unknown> = {},
 	): Context {
-		const context: Context = {
+		return createContext({
 			[inspect.custom]: () => '[[ExecutionContext]]',
 			require: this.requireResolver,
 			module: {},
@@ -480,8 +525,6 @@ export class JsTaskRunner extends TaskRunner {
 			...dataProxy,
 			...this.buildRpcCallObject(taskId),
 			...additionalProperties,
-		};
-
-		return context;
+		});
 	}
 }
diff --git a/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts b/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts
index ffa00c0441..4facbd365c 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/require-resolver.ts
@@ -6,15 +6,15 @@ import { ExecutionError } from './errors/execution-error';
 export type RequireResolverOpts = {
 	/**
 	 * List of built-in nodejs modules that are allowed to be required in the
-	 * execution sandbox. `null` means all are allowed.
+	 * execution sandbox. `"*"` means all are allowed.
 	 */
-	allowedBuiltInModules: Set<string> | null;
+	allowedBuiltInModules: Set<string> | '*';
 
 	/**
 	 * List of external modules that are allowed to be required in the
-	 * execution sandbox. `null` means all are allowed.
+	 * execution sandbox. `"*"` means all are allowed.
 	 */
-	allowedExternalModules: Set<string> | null;
+	allowedExternalModules: Set<string> | '*';
 };
 
 export type RequireResolver = (request: string) => unknown;
@@ -24,8 +24,8 @@ export function createRequireResolver({
 	allowedExternalModules,
 }: RequireResolverOpts) {
 	return (request: string) => {
-		const checkIsAllowed = (allowList: Set<string> | null, moduleName: string) => {
-			return allowList ? allowList.has(moduleName) : true;
+		const checkIsAllowed = (allowList: Set<string> | '*', moduleName: string) => {
+			return allowList === '*' || allowList.has(moduleName);
 		};
 
 		const isAllowed = isBuiltin(request)
diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
index 536b550d17..35b928e9a8 100644
--- a/packages/@n8n/task-runner/src/start.ts
+++ b/packages/@n8n/task-runner/src/start.ts
@@ -1,16 +1,16 @@
 import './polyfills';
 import { Container } from '@n8n/di';
-import type { ErrorReporter } from 'n8n-core';
 import { ensureError, setGlobalState } from 'n8n-workflow';
 
 import { MainConfig } from './config/main-config';
 import type { HealthCheckServer } from './health-check-server';
 import { JsTaskRunner } from './js-task-runner/js-task-runner';
+import { TaskRunnerSentry } from './task-runner-sentry';
 
 let healthCheckServer: HealthCheckServer | undefined;
 let runner: JsTaskRunner | undefined;
 let isShuttingDown = false;
-let errorReporter: ErrorReporter | undefined;
+let sentry: TaskRunnerSentry | undefined;
 
 function createSignalHandler(signal: string, timeoutInS = 10) {
 	return async function onSignal() {
@@ -33,9 +33,9 @@ function createSignalHandler(signal: string, timeoutInS = 10) {
 				void healthCheckServer?.stop();
 			}
 
-			if (errorReporter) {
-				await errorReporter.shutdown();
-				errorReporter = undefined;
+			if (sentry) {
+				await sentry.shutdown();
+				sentry = undefined;
 			}
 		} catch (e) {
 			const error = ensureError(e);
@@ -54,11 +54,8 @@ void (async function start() {
 		defaultTimezone: config.baseRunnerConfig.timezone,
 	});
 
-	if (config.sentryConfig.sentryDsn) {
-		const { ErrorReporter } = await import('n8n-core');
-		errorReporter = Container.get(ErrorReporter);
-		await errorReporter.init('task_runner', config.sentryConfig.sentryDsn);
-	}
+	sentry = Container.get(TaskRunnerSentry);
+	await sentry.initIfEnabled();
 
 	runner = new JsTaskRunner(config);
 	runner.on('runner:reached-idle-timeout', () => {
diff --git a/packages/@n8n/task-runner/src/task-runner-sentry.ts b/packages/@n8n/task-runner/src/task-runner-sentry.ts
new file mode 100644
index 0000000000..5443a98d5c
--- /dev/null
+++ b/packages/@n8n/task-runner/src/task-runner-sentry.ts
@@ -0,0 +1,62 @@
+import { Service } from '@n8n/di';
+import type { ErrorEvent, Exception } from '@sentry/types';
+import { ErrorReporter } from 'n8n-core';
+
+import { SentryConfig } from './config/sentry-config';
+
+/**
+ * Sentry service for the task runner.
+ */
+@Service()
+export class TaskRunnerSentry {
+	constructor(
+		private readonly config: SentryConfig,
+		private readonly errorReporter: ErrorReporter,
+	) {}
+
+	async initIfEnabled() {
+		const { dsn, n8nVersion, environment, deploymentName } = this.config;
+
+		if (!dsn) return;
+
+		await this.errorReporter.init({
+			serverType: 'task_runner',
+			dsn,
+			release: n8nVersion,
+			environment,
+			serverName: deploymentName,
+			beforeSendFilter: this.filterOutUserCodeErrors,
+		});
+	}
+
+	async shutdown() {
+		if (!this.config.dsn) return;
+
+		await this.errorReporter.shutdown();
+	}
+
+	/**
+	 * Filter out errors originating from user provided code.
+	 * It is possible for users to create code that causes unhandledrejections
+	 * that end up in the sentry error reporting.
+	 */
+	filterOutUserCodeErrors = (event: ErrorEvent) => {
+		const error = event?.exception?.values?.[0];
+
+		return error ? this.isUserCodeError(error) : false;
+	};
+
+	/**
+	 * Check if the error is originating from user provided code.
+	 * It is possible for users to create code that causes unhandledrejections
+	 * that end up in the sentry error reporting.
+	 */
+	private isUserCodeError(error: Exception) {
+		const frames = error.stacktrace?.frames;
+		if (!frames) return false;
+
+		return frames.some(
+			(frame) => frame.filename === 'node:vm' && frame.function === 'runInContext',
+		);
+	}
+}
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index 0864a20a7b..dc4ad37025 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -369,6 +369,8 @@ const config = (module.exports = {
 
 		'n8n-local-rules/no-unused-param-in-catch-clause': 'error',
 
+		'n8n-local-rules/no-useless-catch-throw': 'error',
+
 		'n8n-local-rules/no-plain-errors': 'error',
 
 		// ******************************************************************
diff --git a/packages/@n8n_io/eslint-config/local-rules.js b/packages/@n8n_io/eslint-config/local-rules.js
index 92b0f6669e..d32d72f89c 100644
--- a/packages/@n8n_io/eslint-config/local-rules.js
+++ b/packages/@n8n_io/eslint-config/local-rules.js
@@ -172,6 +172,49 @@ module.exports = {
 		},
 	},
 
+	'no-useless-catch-throw': {
+		meta: {
+			type: 'problem',
+			docs: {
+				description: 'Disallow `try-catch` blocks where the `catch` only contains a `throw error`.',
+				recommended: 'error',
+			},
+			messages: {
+				noUselessCatchThrow: 'Remove useless `catch` block.',
+			},
+			fixable: 'code',
+		},
+		create(context) {
+			return {
+				CatchClause(node) {
+					if (
+						node.body.body.length === 1 &&
+						node.body.body[0].type === 'ThrowStatement' &&
+						node.body.body[0].argument.type === 'Identifier' &&
+						node.body.body[0].argument.name === node.param.name
+					) {
+						context.report({
+							node,
+							messageId: 'noUselessCatchThrow',
+							fix(fixer) {
+								const tryStatement = node.parent;
+								const tryBlock = tryStatement.block;
+								const sourceCode = context.getSourceCode();
+								const tryBlockText = sourceCode.getText(tryBlock);
+								const tryBlockTextWithoutBraces = tryBlockText.slice(1, -1).trim();
+								const indentedTryBlockText = tryBlockTextWithoutBraces
+									.split('\n')
+									.map((line) => line.replace(/\t/, ''))
+									.join('\n');
+								return fixer.replaceText(tryStatement, indentedTryBlockText);
+							},
+						});
+					}
+				},
+			};
+		},
+	},
+
 	'no-skipped-tests': {
 		meta: {
 			type: 'problem',
diff --git a/packages/@n8n_io/eslint-config/local-rules.test.js b/packages/@n8n_io/eslint-config/local-rules.test.js
index 86589ac67f..ca32c37a40 100644
--- a/packages/@n8n_io/eslint-config/local-rules.test.js
+++ b/packages/@n8n_io/eslint-config/local-rules.test.js
@@ -51,3 +51,33 @@ ruleTester.run('no-json-parse-json-stringify', rules['no-json-parse-json-stringi
 		},
 	],
 });
+
+ruleTester.run('no-useless-catch-throw', rules['no-useless-catch-throw'], {
+	valid: [
+		{
+			code: 'try { foo(); } catch (e) { console.error(e); }',
+		},
+		{
+			code: 'try { foo(); } catch (e) { throw new Error("Custom error"); }',
+		},
+	],
+	invalid: [
+		{
+			code: `
+try {
+	// Some comment
+	if (foo) {
+		bar();
+	}
+} catch (e) {
+	throw e;
+}`,
+			errors: [{ messageId: 'noUselessCatchThrow' }],
+			output: `
+// Some comment
+if (foo) {
+	bar();
+}`,
+		},
+	],
+});
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 52bbdd3e6f..7c4f1b9a3c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.74.1",
+  "version": "1.78.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -96,7 +96,7 @@
     "@n8n/task-runner": "workspace:*",
     "@n8n/typeorm": "0.3.20-12",
     "@n8n_io/ai-assistant-sdk": "1.13.0",
-    "@n8n_io/license-sdk": "2.13.1",
+    "@n8n_io/license-sdk": "2.15.1",
     "@oclif/core": "4.0.7",
     "@rudderstack/rudder-sdk-node": "2.0.9",
     "@sentry/node": "catalog:",
@@ -112,7 +112,6 @@
     "convict": "6.2.4",
     "cookie-parser": "1.4.7",
     "csrf": "3.1.0",
-    "curlconverter": "3.21.0",
     "dotenv": "8.6.0",
     "express": "4.21.1",
     "express-async-errors": "3.1.1",
diff --git a/packages/cli/src/__tests__/active-executions.test.ts b/packages/cli/src/__tests__/active-executions.test.ts
index 5432bf5c4a..0ae648a098 100644
--- a/packages/cli/src/__tests__/active-executions.test.ts
+++ b/packages/cli/src/__tests__/active-executions.test.ts
@@ -1,28 +1,29 @@
-import { mock } from 'jest-mock-extended';
+import { captor, mock } from 'jest-mock-extended';
 import type {
+	IDeferredPromise,
 	IExecuteResponsePromiseData,
 	IRun,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
-import { createDeferredPromise } from 'n8n-workflow';
+import { ExecutionCancelledError, randomInt, sleep } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveExecutions } from '@/active-executions';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
+import config from '@/config';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { mockInstance } from '@test/mocking';
 
+jest.mock('n8n-workflow', () => ({
+	...jest.requireActual('n8n-workflow'),
+	sleep: jest.fn(),
+}));
+
 const FAKE_EXECUTION_ID = '15';
 const FAKE_SECOND_EXECUTION_ID = '20';
 
-const updateExistingExecution = jest.fn();
-const createNewExecution = jest.fn(async () => FAKE_EXECUTION_ID);
-
-const executionRepository = mock<ExecutionRepository>({
-	updateExistingExecution,
-	createNewExecution,
-});
+const executionRepository = mock<ExecutionRepository>();
 
 const concurrencyControl = mockInstance(ConcurrencyControlService, {
 	// @ts-expect-error Private property
@@ -31,125 +32,22 @@ const concurrencyControl = mockInstance(ConcurrencyControlService, {
 
 describe('ActiveExecutions', () => {
 	let activeExecutions: ActiveExecutions;
+	let responsePromise: IDeferredPromise<IExecuteResponsePromiseData>;
+	let workflowExecution: PCancelable<IRun>;
+	let postExecutePromise: Promise<IRun | undefined>;
 
-	beforeEach(() => {
-		activeExecutions = new ActiveExecutions(mock(), executionRepository, concurrencyControl);
-	});
+	const fullRunData: IRun = {
+		data: {
+			resultData: {
+				runData: {},
+			},
+		},
+		mode: 'manual',
+		startedAt: new Date(),
+		status: 'new',
+	};
 
-	afterEach(() => {
-		jest.clearAllMocks();
-	});
-
-	test('Should initialize activeExecutions with empty list', () => {
-		expect(activeExecutions.getActiveExecutions().length).toBe(0);
-	});
-
-	test('Should add execution to active execution list', async () => {
-		const newExecution = mockExecutionData();
-		const executionId = await activeExecutions.add(newExecution);
-
-		expect(executionId).toBe(FAKE_EXECUTION_ID);
-		expect(activeExecutions.getActiveExecutions().length).toBe(1);
-		expect(createNewExecution).toHaveBeenCalledTimes(1);
-		expect(updateExistingExecution).toHaveBeenCalledTimes(0);
-	});
-
-	test('Should update execution if add is called with execution ID', async () => {
-		const newExecution = mockExecutionData();
-		const executionId = await activeExecutions.add(newExecution, FAKE_SECOND_EXECUTION_ID);
-
-		expect(executionId).toBe(FAKE_SECOND_EXECUTION_ID);
-		expect(activeExecutions.getActiveExecutions().length).toBe(1);
-		expect(createNewExecution).toHaveBeenCalledTimes(0);
-		expect(updateExistingExecution).toHaveBeenCalledTimes(1);
-	});
-
-	test('Should fail attaching execution to invalid executionId', async () => {
-		const deferredPromise = mockCancelablePromise();
-
-		expect(() => {
-			activeExecutions.attachWorkflowExecution(FAKE_EXECUTION_ID, deferredPromise);
-		}).toThrow();
-	});
-
-	test('Should successfully attach execution to valid executionId', async () => {
-		const newExecution = mockExecutionData();
-		await activeExecutions.add(newExecution, FAKE_EXECUTION_ID);
-		const deferredPromise = mockCancelablePromise();
-
-		expect(() =>
-			activeExecutions.attachWorkflowExecution(FAKE_EXECUTION_ID, deferredPromise),
-		).not.toThrow();
-	});
-
-	test('Should attach and resolve response promise to existing execution', async () => {
-		const newExecution = mockExecutionData();
-		await activeExecutions.add(newExecution, FAKE_EXECUTION_ID);
-		const deferredPromise = mockDeferredPromise();
-		activeExecutions.attachResponsePromise(FAKE_EXECUTION_ID, deferredPromise);
-		const fakeResponse = { data: { resultData: { runData: {} } } };
-		activeExecutions.resolveResponsePromise(FAKE_EXECUTION_ID, fakeResponse);
-
-		await expect(deferredPromise.promise).resolves.toEqual(fakeResponse);
-	});
-
-	test('Should remove an existing execution', async () => {
-		// ARRANGE
-		const newExecution = mockExecutionData();
-		const executionId = await activeExecutions.add(newExecution);
-
-		// ACT
-		activeExecutions.finalizeExecution(executionId);
-
-		// Wait until the next tick to ensure that the post-execution promise has settled
-		await new Promise(setImmediate);
-
-		// ASSERT
-		expect(activeExecutions.getActiveExecutions().length).toBe(0);
-	});
-
-	test('Should not try to resolve a post-execute promise for an inactive execution', async () => {
-		// @ts-expect-error Private method
-		const getExecutionSpy = jest.spyOn(activeExecutions, 'getExecution');
-
-		activeExecutions.finalizeExecution('inactive-execution-id', mockFullRunData());
-
-		expect(getExecutionSpy).not.toHaveBeenCalled();
-	});
-
-	test('Should resolve post execute promise on removal', async () => {
-		const newExecution = mockExecutionData();
-		const executionId = await activeExecutions.add(newExecution);
-		const postExecutePromise = activeExecutions.getPostExecutePromise(executionId);
-		// Force the above to be executed since we cannot await it
-		await new Promise((res) => {
-			setTimeout(res, 100);
-		});
-		const fakeOutput = mockFullRunData();
-		activeExecutions.finalizeExecution(executionId, fakeOutput);
-
-		await expect(postExecutePromise).resolves.toEqual(fakeOutput);
-	});
-
-	test('Should throw error when trying to create a promise with invalid execution', async () => {
-		await expect(activeExecutions.getPostExecutePromise(FAKE_EXECUTION_ID)).rejects.toThrow();
-	});
-
-	test('Should call function to cancel execution when asked to stop', async () => {
-		const newExecution = mockExecutionData();
-		const executionId = await activeExecutions.add(newExecution);
-		const cancelExecution = jest.fn();
-		const cancellablePromise = mockCancelablePromise();
-		cancellablePromise.cancel = cancelExecution;
-		activeExecutions.attachWorkflowExecution(executionId, cancellablePromise);
-		activeExecutions.stopExecution(executionId);
-
-		expect(cancelExecution).toHaveBeenCalledTimes(1);
-	});
-});
-
-function mockExecutionData(): IWorkflowExecutionDataProcess {
-	return {
+	const executionData: IWorkflowExecutionDataProcess = {
 		executionMode: 'manual',
 		workflowData: {
 			id: '123',
@@ -162,22 +60,235 @@ function mockExecutionData(): IWorkflowExecutionDataProcess {
 		},
 		userId: uuid(),
 	};
-}
 
-function mockFullRunData(): IRun {
-	return {
-		data: {
-			resultData: {
-				runData: {},
-			},
-		},
-		mode: 'manual',
-		startedAt: new Date(),
-		status: 'new',
-	};
-}
+	beforeEach(() => {
+		activeExecutions = new ActiveExecutions(mock(), executionRepository, concurrencyControl);
 
-// eslint-disable-next-line @typescript-eslint/promise-function-async
-const mockCancelablePromise = () => new PCancelable<IRun>((resolve) => resolve());
+		executionRepository.createNewExecution.mockResolvedValue(FAKE_EXECUTION_ID);
 
-const mockDeferredPromise = () => createDeferredPromise<IExecuteResponsePromiseData>();
+		workflowExecution = new PCancelable<IRun>((resolve) => resolve());
+		workflowExecution.cancel = jest.fn();
+		responsePromise = mock<IDeferredPromise<IExecuteResponsePromiseData>>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	test('Should initialize activeExecutions with empty list', () => {
+		expect(activeExecutions.getActiveExecutions()).toHaveLength(0);
+	});
+
+	test('Should add execution to active execution list', async () => {
+		const executionId = await activeExecutions.add(executionData);
+
+		expect(executionId).toBe(FAKE_EXECUTION_ID);
+		expect(activeExecutions.getActiveExecutions()).toHaveLength(1);
+		expect(executionRepository.createNewExecution).toHaveBeenCalledTimes(1);
+		expect(executionRepository.updateExistingExecution).toHaveBeenCalledTimes(0);
+	});
+
+	test('Should update execution if add is called with execution ID', async () => {
+		const executionId = await activeExecutions.add(executionData, FAKE_SECOND_EXECUTION_ID);
+
+		expect(executionId).toBe(FAKE_SECOND_EXECUTION_ID);
+		expect(activeExecutions.getActiveExecutions()).toHaveLength(1);
+		expect(executionRepository.createNewExecution).toHaveBeenCalledTimes(0);
+		expect(executionRepository.updateExistingExecution).toHaveBeenCalledTimes(1);
+	});
+
+	describe('attachWorkflowExecution', () => {
+		test('Should fail attaching execution to invalid executionId', async () => {
+			expect(() => {
+				activeExecutions.attachWorkflowExecution(FAKE_EXECUTION_ID, workflowExecution);
+			}).toThrow();
+		});
+
+		test('Should successfully attach execution to valid executionId', async () => {
+			await activeExecutions.add(executionData, FAKE_EXECUTION_ID);
+
+			expect(() =>
+				activeExecutions.attachWorkflowExecution(FAKE_EXECUTION_ID, workflowExecution),
+			).not.toThrow();
+		});
+	});
+
+	test('Should attach and resolve response promise to existing execution', async () => {
+		await activeExecutions.add(executionData, FAKE_EXECUTION_ID);
+		activeExecutions.attachResponsePromise(FAKE_EXECUTION_ID, responsePromise);
+		const fakeResponse = { data: { resultData: { runData: {} } } };
+		activeExecutions.resolveResponsePromise(FAKE_EXECUTION_ID, fakeResponse);
+
+		expect(responsePromise.resolve).toHaveBeenCalledWith(fakeResponse);
+	});
+
+	test('Should copy over startedAt and responsePromise when resuming a waiting execution', async () => {
+		const executionId = await activeExecutions.add(executionData);
+		activeExecutions.setStatus(executionId, 'waiting');
+		activeExecutions.attachResponsePromise(executionId, responsePromise);
+
+		const waitingExecution = activeExecutions.getExecutionOrFail(executionId);
+		expect(waitingExecution.responsePromise).toBeDefined();
+
+		// Resume the execution
+		await activeExecutions.add(executionData, executionId);
+
+		const resumedExecution = activeExecutions.getExecutionOrFail(executionId);
+		expect(resumedExecution.startedAt).toBe(waitingExecution.startedAt);
+		expect(resumedExecution.responsePromise).toBe(responsePromise);
+	});
+
+	describe('finalizeExecution', () => {
+		test('Should not remove a waiting execution', async () => {
+			const executionId = await activeExecutions.add(executionData);
+			activeExecutions.setStatus(executionId, 'waiting');
+			activeExecutions.finalizeExecution(executionId);
+
+			// Wait until the next tick to ensure that the post-execution promise has settled
+			await new Promise(setImmediate);
+
+			// Execution should still be in activeExecutions
+			expect(activeExecutions.getActiveExecutions()).toHaveLength(1);
+			expect(activeExecutions.getStatus(executionId)).toBe('waiting');
+		});
+
+		test('Should remove an existing execution', async () => {
+			const executionId = await activeExecutions.add(executionData);
+
+			activeExecutions.finalizeExecution(executionId);
+
+			await new Promise(setImmediate);
+			expect(activeExecutions.getActiveExecutions()).toHaveLength(0);
+		});
+
+		test('Should not try to resolve a post-execute promise for an inactive execution', async () => {
+			const getExecutionSpy = jest.spyOn(activeExecutions, 'getExecutionOrFail');
+
+			activeExecutions.finalizeExecution('inactive-execution-id', fullRunData);
+
+			expect(getExecutionSpy).not.toHaveBeenCalled();
+		});
+
+		test('Should resolve post execute promise on removal', async () => {
+			const executionId = await activeExecutions.add(executionData);
+			const postExecutePromise = activeExecutions.getPostExecutePromise(executionId);
+
+			await new Promise(setImmediate);
+			activeExecutions.finalizeExecution(executionId, fullRunData);
+
+			await expect(postExecutePromise).resolves.toEqual(fullRunData);
+		});
+	});
+
+	describe('getPostExecutePromise', () => {
+		test('Should throw error when trying to create a promise with invalid execution', async () => {
+			await expect(activeExecutions.getPostExecutePromise(FAKE_EXECUTION_ID)).rejects.toThrow();
+		});
+	});
+
+	describe('stopExecution', () => {
+		let executionId: string;
+
+		beforeEach(async () => {
+			executionId = await activeExecutions.add(executionData);
+			postExecutePromise = activeExecutions.getPostExecutePromise(executionId);
+
+			activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
+			activeExecutions.attachResponsePromise(executionId, responsePromise);
+		});
+
+		test('Should cancel ongoing executions', async () => {
+			activeExecutions.stopExecution(executionId);
+
+			expect(responsePromise.reject).toHaveBeenCalledWith(expect.any(ExecutionCancelledError));
+			expect(workflowExecution.cancel).toHaveBeenCalledTimes(1);
+			await expect(postExecutePromise).rejects.toThrow(ExecutionCancelledError);
+		});
+
+		test('Should cancel waiting executions', async () => {
+			activeExecutions.setStatus(executionId, 'waiting');
+			activeExecutions.stopExecution(executionId);
+
+			expect(responsePromise.reject).toHaveBeenCalledWith(expect.any(ExecutionCancelledError));
+			expect(workflowExecution.cancel).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('shutdown', () => {
+		let newExecutionId1: string, newExecutionId2: string;
+		let waitingExecutionId1: string, waitingExecutionId2: string;
+
+		beforeEach(async () => {
+			config.set('executions.mode', 'regular');
+
+			executionRepository.createNewExecution.mockImplementation(async () =>
+				randomInt(1000, 2000).toString(),
+			);
+
+			(sleep as jest.Mock).mockImplementation(() => {
+				// @ts-expect-error private property
+				activeExecutions.activeExecutions = {};
+			});
+
+			newExecutionId1 = await activeExecutions.add(executionData);
+			activeExecutions.setStatus(newExecutionId1, 'new');
+			activeExecutions.attachResponsePromise(newExecutionId1, responsePromise);
+
+			newExecutionId2 = await activeExecutions.add(executionData);
+			activeExecutions.setStatus(newExecutionId2, 'new');
+
+			waitingExecutionId1 = await activeExecutions.add(executionData);
+			activeExecutions.setStatus(waitingExecutionId1, 'waiting');
+			activeExecutions.attachResponsePromise(waitingExecutionId1, responsePromise);
+
+			waitingExecutionId2 = await activeExecutions.add(executionData);
+			activeExecutions.setStatus(waitingExecutionId2, 'waiting');
+		});
+
+		test('Should cancel only executions with response-promises by default', async () => {
+			const stopExecutionSpy = jest.spyOn(activeExecutions, 'stopExecution');
+
+			expect(activeExecutions.getActiveExecutions()).toHaveLength(4);
+
+			await activeExecutions.shutdown();
+
+			expect(concurrencyControl.disable).toHaveBeenCalled();
+
+			const removeAllCaptor = captor<string[]>();
+			expect(concurrencyControl.removeAll).toHaveBeenCalledWith(removeAllCaptor);
+			expect(removeAllCaptor.value.sort()).toEqual([newExecutionId1, waitingExecutionId1].sort());
+
+			expect(stopExecutionSpy).toHaveBeenCalledTimes(2);
+			expect(stopExecutionSpy).toHaveBeenCalledWith(newExecutionId1);
+			expect(stopExecutionSpy).toHaveBeenCalledWith(waitingExecutionId1);
+			expect(stopExecutionSpy).not.toHaveBeenCalledWith(newExecutionId2);
+			expect(stopExecutionSpy).not.toHaveBeenCalledWith(waitingExecutionId2);
+
+			await new Promise(setImmediate);
+			// the other two executions aren't cancelled, but still removed from memory
+			expect(activeExecutions.getActiveExecutions()).toHaveLength(0);
+		});
+
+		test('Should cancel all executions when cancelAll is true', async () => {
+			const stopExecutionSpy = jest.spyOn(activeExecutions, 'stopExecution');
+
+			expect(activeExecutions.getActiveExecutions()).toHaveLength(4);
+
+			await activeExecutions.shutdown(true);
+
+			expect(concurrencyControl.disable).toHaveBeenCalled();
+
+			const removeAllCaptor = captor<string[]>();
+			expect(concurrencyControl.removeAll).toHaveBeenCalledWith(removeAllCaptor);
+			expect(removeAllCaptor.value.sort()).toEqual(
+				[newExecutionId1, newExecutionId2, waitingExecutionId1, waitingExecutionId2].sort(),
+			);
+
+			expect(stopExecutionSpy).toHaveBeenCalledTimes(4);
+			expect(stopExecutionSpy).toHaveBeenCalledWith(newExecutionId1);
+			expect(stopExecutionSpy).toHaveBeenCalledWith(waitingExecutionId1);
+			expect(stopExecutionSpy).toHaveBeenCalledWith(newExecutionId2);
+			expect(stopExecutionSpy).toHaveBeenCalledWith(waitingExecutionId2);
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/external-hooks.test.ts b/packages/cli/src/__tests__/external-hooks.test.ts
new file mode 100644
index 0000000000..5e4aa6ee89
--- /dev/null
+++ b/packages/cli/src/__tests__/external-hooks.test.ts
@@ -0,0 +1,125 @@
+import type { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import type { ErrorReporter, Logger } from 'n8n-core';
+import type { IWorkflowBase } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+
+import type { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import type { SettingsRepository } from '@/databases/repositories/settings.repository';
+import type { UserRepository } from '@/databases/repositories/user.repository';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { ExternalHooks } from '@/external-hooks';
+
+describe('ExternalHooks', () => {
+	const logger = mock<Logger>();
+	const errorReporter = mock<ErrorReporter>();
+	const globalConfig = mock<GlobalConfig>();
+	const userRepository = mock<UserRepository>();
+	const settingsRepository = mock<SettingsRepository>();
+	const credentialsRepository = mock<CredentialsRepository>();
+	const workflowRepository = mock<WorkflowRepository>();
+
+	const workflowData = mock<IWorkflowBase>({ id: '123', name: 'Test Workflow' });
+	const hookFn = jest.fn();
+
+	let externalHooks: ExternalHooks;
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+		globalConfig.externalHooks.files = [];
+		externalHooks = new ExternalHooks(
+			logger,
+			errorReporter,
+			globalConfig,
+			userRepository,
+			settingsRepository,
+			credentialsRepository,
+			workflowRepository,
+		);
+	});
+
+	describe('init()', () => {
+		it('should not load hooks if no external hook files are configured', async () => {
+			// @ts-expect-error private method
+			const loadHooksSpy = jest.spyOn(externalHooks, 'loadHooks');
+			await externalHooks.init();
+			expect(loadHooksSpy).not.toHaveBeenCalled();
+		});
+
+		it('should throw an error if hook file cannot be loaded', async () => {
+			globalConfig.externalHooks.files = ['/path/to/non-existent-hook.js'];
+
+			jest.mock(
+				'/path/to/non-existent-hook.js',
+				() => {
+					throw new Error('File not found');
+				},
+				{ virtual: true },
+			);
+
+			await expect(externalHooks.init()).rejects.toThrow(ApplicationError);
+		});
+
+		it('should successfully load hooks from valid hook file', async () => {
+			const mockHookFile = {
+				workflow: {
+					create: [hookFn],
+				},
+			};
+
+			globalConfig.externalHooks.files = ['/path/to/valid-hook.js'];
+			jest.mock('/path/to/valid-hook.js', () => mockHookFile, { virtual: true });
+
+			await externalHooks.init();
+
+			// eslint-disable-next-line @typescript-eslint/dot-notation
+			expect(externalHooks['registered']['workflow.create']).toHaveLength(1);
+
+			await externalHooks.run('workflow.create', [workflowData]);
+
+			expect(hookFn).toHaveBeenCalledTimes(1);
+			expect(hookFn).toHaveBeenCalledWith(workflowData);
+		});
+	});
+
+	describe('run()', () => {
+		it('should not throw if no hooks are registered', async () => {
+			await externalHooks.run('n8n.stop');
+		});
+
+		it('should execute registered hooks', async () => {
+			// eslint-disable-next-line @typescript-eslint/dot-notation
+			externalHooks['registered']['workflow.create'] = [hookFn];
+
+			await externalHooks.run('workflow.create', [workflowData]);
+
+			expect(hookFn).toHaveBeenCalledTimes(1);
+
+			const hookInvocationContext = hookFn.mock.instances[0];
+			expect(hookInvocationContext).toHaveProperty('dbCollections');
+			expect(hookInvocationContext.dbCollections).toEqual({
+				User: userRepository,
+				Settings: settingsRepository,
+				Credentials: credentialsRepository,
+				Workflow: workflowRepository,
+			});
+		});
+
+		it('should report error if hook execution fails', async () => {
+			hookFn.mockRejectedValueOnce(new Error('Hook failed'));
+			// eslint-disable-next-line @typescript-eslint/dot-notation
+			externalHooks['registered']['workflow.create'] = [hookFn];
+
+			await expect(externalHooks.run('workflow.create', [workflowData])).rejects.toThrow(
+				ApplicationError,
+			);
+
+			expect(errorReporter.error).toHaveBeenCalledWith(expect.any(ApplicationError), {
+				level: 'fatal',
+			});
+			expect(logger.error).toHaveBeenCalledWith(
+				'There was a problem running hook "workflow.create"',
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/license.test.ts b/packages/cli/src/__tests__/license.test.ts
index aa0aba1d53..fb82f312ee 100644
--- a/packages/cli/src/__tests__/license.test.ts
+++ b/packages/cli/src/__tests__/license.test.ts
@@ -3,7 +3,6 @@ import { LicenseManager } from '@n8n_io/license-sdk';
 import { mock } from 'jest-mock-extended';
 import type { InstanceSettings } from 'n8n-core';
 
-import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import { License } from '@/license';
 import { mockLogger } from '@test/mocking';
@@ -17,6 +16,12 @@ const MOCK_ACTIVATION_KEY = 'activation-key';
 const MOCK_FEATURE_FLAG = 'feat:sharing';
 const MOCK_MAIN_PLAN_ID = '1b765dc4-d39d-4ffe-9885-c56dd67c4b26';
 
+function makeDateWithHourOffset(offsetInHours: number): Date {
+	const date = new Date();
+	date.setHours(date.getHours() + offsetInHours);
+	return date;
+}
+
 const licenseConfig: GlobalConfig['license'] = {
 	serverUrl: MOCK_SERVER_URL,
 	autoRenewalEnabled: true,
@@ -31,6 +36,7 @@ describe('License', () => {
 	const instanceSettings = mock<InstanceSettings>({
 		instanceId: MOCK_INSTANCE_ID,
 		instanceType: 'main',
+		isLeader: true,
 	});
 
 	beforeEach(async () => {
@@ -67,7 +73,7 @@ describe('License', () => {
 
 		license = new License(
 			logger,
-			mock<InstanceSettings>({ instanceType: 'worker' }),
+			mock<InstanceSettings>({ instanceType: 'worker', isLeader: false }),
 			mock(),
 			mock(),
 			mock<GlobalConfig>({ license: licenseConfig }),
@@ -134,7 +140,7 @@ describe('License', () => {
 		expect(LicenseManager.prototype.getManagementJwt).toHaveBeenCalled();
 	});
 
-	test('getMainPlan() returns the right entitlement', async () => {
+	test('getMainPlan() returns the latest main entitlement', async () => {
 		// mock entitlements response
 		License.prototype.getCurrentEntitlements = jest.fn().mockReturnValue([
 			{
@@ -143,8 +149,21 @@ describe('License', () => {
 				productMetadata: {},
 				features: {},
 				featureOverrides: {},
-				validFrom: new Date(),
-				validTo: new Date(),
+				validFrom: makeDateWithHourOffset(-3),
+				validTo: makeDateWithHourOffset(1),
+			},
+			{
+				id: '95b9c852-1349-478d-9ad1-b3f55510e488',
+				productId: '670650f2-72d8-4397-898c-c249906e2cc2',
+				productMetadata: {
+					terms: {
+						isMainPlan: true,
+					},
+				},
+				features: {},
+				featureOverrides: {},
+				validFrom: makeDateWithHourOffset(-2),
+				validTo: makeDateWithHourOffset(1),
 			},
 			{
 				id: MOCK_MAIN_PLAN_ID,
@@ -156,8 +175,8 @@ describe('License', () => {
 				},
 				features: {},
 				featureOverrides: {},
-				validFrom: new Date(),
-				validTo: new Date(),
+				validFrom: makeDateWithHourOffset(-1), // this is the LATEST / newest plan
+				validTo: makeDateWithHourOffset(1),
 			},
 		]);
 		jest.fn(license.getMainPlan).mockReset();
@@ -175,8 +194,8 @@ describe('License', () => {
 				productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
 				features: {},
 				featureOverrides: {},
-				validFrom: new Date(),
-				validTo: new Date(),
+				validFrom: makeDateWithHourOffset(-1),
+				validTo: makeDateWithHourOffset(1),
 			},
 			{
 				id: 'c1aae471-c24e-4874-ad88-b97107de486c',
@@ -184,8 +203,8 @@ describe('License', () => {
 				productMetadata: {}, // has no `productMetadata.terms.isMainPlan`!
 				features: {},
 				featureOverrides: {},
-				validFrom: new Date(),
-				validTo: new Date(),
+				validFrom: makeDateWithHourOffset(-1),
+				validTo: makeDateWithHourOffset(1),
 			},
 		]);
 		jest.fn(license.getMainPlan).mockReset();
@@ -197,94 +216,73 @@ describe('License', () => {
 
 describe('License', () => {
 	describe('init', () => {
-		describe('in single-main setup', () => {
-			describe('with `license.autoRenewEnabled` enabled', () => {
-				it('should enable renewal', async () => {
-					const globalConfig = mock<GlobalConfig>({
-						license: licenseConfig,
-						multiMainSetup: { enabled: false },
-					});
-
-					await new License(
-						mockLogger(),
-						mock<InstanceSettings>({ instanceType: 'main' }),
-						mock(),
-						mock(),
-						globalConfig,
-					).init();
-
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
-					);
-				});
+		it('when leader main with N8N_LICENSE_AUTO_RENEW_ENABLED=true, should enable renewal', async () => {
+			const globalConfig = mock<GlobalConfig>({
+				license: { ...licenseConfig, autoRenewalEnabled: true },
 			});
 
-			describe('with `license.autoRenewEnabled` disabled', () => {
-				it('should disable renewal', async () => {
-					await new License(
-						mockLogger(),
-						mock<InstanceSettings>({ instanceType: 'main' }),
-						mock(),
-						mock(),
-						mock(),
-					).init();
+			await new License(
+				mockLogger(),
+				mock<InstanceSettings>({ instanceType: 'main', isLeader: true }),
+				mock(),
+				mock(),
+				globalConfig,
+			).init();
 
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
-					);
-				});
-			});
+			expect(LicenseManager).toHaveBeenCalledWith(
+				expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
+			);
 		});
 
-		describe('in multi-main setup', () => {
-			describe('with `license.autoRenewEnabled` disabled', () => {
-				test.each(['unset', 'leader', 'follower'])(
-					'if %s status, should disable removal',
-					async (status) => {
-						const globalConfig = mock<GlobalConfig>({
-							license: { ...licenseConfig, autoRenewalEnabled: false },
-							multiMainSetup: { enabled: true },
-						});
-						config.set('multiMainSetup.instanceType', status);
-
-						await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init();
-
-						expect(LicenseManager).toHaveBeenCalledWith(
-							expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
-						);
-					},
-				);
+		it.each([
+			{
+				scenario: 'when leader main with N8N_LICENSE_AUTO_RENEW_ENABLED=false',
+				isLeader: true,
+				autoRenewalEnabled: false,
+			},
+			{
+				scenario: 'when follower main with N8N_LICENSE_AUTO_RENEW_ENABLED=true',
+				isLeader: false,
+				autoRenewalEnabled: true,
+			},
+			{
+				scenario: 'when follower main with N8N_LICENSE_AUTO_RENEW_ENABLED=false',
+				isLeader: false,
+				autoRenewalEnabled: false,
+			},
+		])('$scenario, should disable renewal', async ({ isLeader, autoRenewalEnabled }) => {
+			const globalConfig = mock<GlobalConfig>({
+				license: { ...licenseConfig, autoRenewalEnabled },
 			});
 
-			describe('with `license.autoRenewEnabled` enabled', () => {
-				test.each(['unset', 'follower'])('if %s status, should disable removal', async (status) => {
-					const globalConfig = mock<GlobalConfig>({
-						license: { ...licenseConfig, autoRenewalEnabled: false },
-						multiMainSetup: { enabled: true },
-					});
-					config.set('multiMainSetup.instanceType', status);
+			await new License(
+				mockLogger(),
+				mock<InstanceSettings>({ instanceType: 'main', isLeader }),
+				mock(),
+				mock(),
+				globalConfig,
+			).init();
 
-					await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init();
+			const expectedRenewalSettings =
+				isLeader && autoRenewalEnabled
+					? { autoRenewEnabled: true, renewOnInit: true }
+					: { autoRenewEnabled: false, renewOnInit: false };
 
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
-					);
-				});
+			expect(LicenseManager).toHaveBeenCalledWith(expect.objectContaining(expectedRenewalSettings));
+		});
 
-				it('if leader status, should enable renewal', async () => {
-					const globalConfig = mock<GlobalConfig>({
-						license: licenseConfig,
-						multiMainSetup: { enabled: true },
-					});
-					config.set('multiMainSetup.instanceType', 'leader');
-
-					await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init();
-
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
-					);
-				});
+		it('when CLI command with N8N_LICENSE_AUTO_RENEW_ENABLED=true, should enable renewal', async () => {
+			const globalConfig = mock<GlobalConfig>({
+				license: { ...licenseConfig, autoRenewalEnabled: true },
 			});
+
+			await new License(mockLogger(), mock(), mock(), mock(), globalConfig).init({
+				isCli: true,
+			});
+
+			expect(LicenseManager).toHaveBeenCalledWith(
+				expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
+			);
 		});
 	});
 
@@ -297,7 +295,7 @@ describe('License', () => {
 
 			await license.reinit();
 
-			expect(initSpy).toHaveBeenCalledWith(true);
+			expect(initSpy).toHaveBeenCalledWith({ forceRecreate: true });
 
 			expect(LicenseManager.prototype.reset).toHaveBeenCalled();
 			expect(LicenseManager.prototype.initialize).toHaveBeenCalled();
diff --git a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
index 75aa602301..ddc55ae25e 100644
--- a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
+++ b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
@@ -107,7 +107,7 @@ describe('LoadNodesAndCredentials', () => {
 			};
 			fullNodeWrapper.description.properties = [existingProp];
 			const result = instance.convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(3); // Existing prop + toolDescription + notice
+			expect(result.description.properties).toHaveLength(2); // Existing prop + toolDescription
 			expect(result.description.properties).toContainEqual(existingProp);
 		});
 
@@ -121,9 +121,9 @@ describe('LoadNodesAndCredentials', () => {
 			};
 			fullNodeWrapper.description.properties = [resourceProp];
 			const result = instance.convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(resourceProp);
+			expect(result.description.properties[0].name).toBe('descriptionType');
+			expect(result.description.properties[1].name).toBe('toolDescription');
+			expect(result.description.properties[2]).toEqual(resourceProp);
 		});
 
 		it('should handle nodes with operation property', () => {
@@ -136,9 +136,9 @@ describe('LoadNodesAndCredentials', () => {
 			};
 			fullNodeWrapper.description.properties = [operationProp];
 			const result = instance.convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(operationProp);
+			expect(result.description.properties[0].name).toBe('descriptionType');
+			expect(result.description.properties[1].name).toBe('toolDescription');
+			expect(result.description.properties[2]).toEqual(operationProp);
 		});
 
 		it('should handle nodes with both resource and operation properties', () => {
@@ -158,17 +158,17 @@ describe('LoadNodesAndCredentials', () => {
 			};
 			fullNodeWrapper.description.properties = [resourceProp, operationProp];
 			const result = instance.convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(resourceProp);
-			expect(result.description.properties[4]).toEqual(operationProp);
+			expect(result.description.properties[0].name).toBe('descriptionType');
+			expect(result.description.properties[1].name).toBe('toolDescription');
+			expect(result.description.properties[2]).toEqual(resourceProp);
+			expect(result.description.properties[3]).toEqual(operationProp);
 		});
 
 		it('should handle nodes with empty properties', () => {
 			fullNodeWrapper.description.properties = [];
 			const result = instance.convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(2);
-			expect(result.description.properties[1].name).toBe('toolDescription');
+			expect(result.description.properties).toHaveLength(1);
+			expect(result.description.properties[0].name).toBe('toolDescription');
 		});
 
 		it('should handle nodes with existing codex property', () => {
@@ -211,4 +211,44 @@ describe('LoadNodesAndCredentials', () => {
 			expect(result.description.displayName).toBe('Special @#$% Node Tool');
 		});
 	});
+
+	describe('resolveSchema', () => {
+		let instance: LoadNodesAndCredentials;
+
+		beforeEach(() => {
+			instance = new LoadNodesAndCredentials(mock(), mock(), mock(), mock());
+			instance.knownNodes['n8n-nodes-base.test'] = {
+				className: 'Test',
+				sourcePath: '/nodes-base/dist/nodes/Test/Test.node.js',
+			};
+		});
+
+		it('should return undefined if the node is not known', () => {
+			const result = instance.resolveSchema({
+				node: 'n8n-nodes-base.doesNotExist',
+				version: '1.0.0',
+				resource: 'account',
+				operation: 'get',
+			});
+			expect(result).toBeUndefined();
+		});
+
+		it('should return the correct path if the node is known', () => {
+			const result = instance.resolveSchema({
+				node: 'n8n-nodes-base.test',
+				version: '1.0.0',
+				resource: 'account',
+				operation: 'get',
+			});
+			expect(result).toEqual('/nodes-base/dist/nodes/Test/__schema__/v1.0.0/account/get.json');
+		});
+
+		it('should return the correct path if there is no resource or operation', () => {
+			const result = instance.resolveSchema({
+				node: 'n8n-nodes-base.test',
+				version: '1.0.0',
+			});
+			expect(result).toEqual('/nodes-base/dist/nodes/Test/__schema__/v1.0.0.json');
+		});
+	});
 });
diff --git a/packages/cli/src/__tests__/manual-execution.service.test.ts b/packages/cli/src/__tests__/manual-execution.service.test.ts
index 383a8dc87c..23f69ab821 100644
--- a/packages/cli/src/__tests__/manual-execution.service.test.ts
+++ b/packages/cli/src/__tests__/manual-execution.service.test.ts
@@ -46,5 +46,26 @@ describe('ManualExecutionService', () => {
 				name: 'node2',
 			});
 		});
+
+		it('Should return triggerToStartFrom trigger node', () => {
+			const data = {
+				pinData: {
+					node1: {},
+					node2: {},
+				},
+				triggerToStartFrom: { name: 'node3' },
+			} as unknown as IWorkflowExecutionDataProcess;
+			const workflow = {
+				getNode(nodeName: string) {
+					return {
+						name: nodeName,
+					};
+				},
+			} as unknown as Workflow;
+			const executionStartNode = manualExecutionService.getExecutionStartNode(data, workflow);
+			expect(executionStartNode).toEqual({
+				name: 'node3',
+			});
+		});
 	});
 });
diff --git a/packages/cli/src/__tests__/node-types.test.ts b/packages/cli/src/__tests__/node-types.test.ts
index 78d0c5e18a..5e26cc5665 100644
--- a/packages/cli/src/__tests__/node-types.test.ts
+++ b/packages/cli/src/__tests__/node-types.test.ts
@@ -1,5 +1,6 @@
+import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
-import { UnrecognizedNodeTypeError } from 'n8n-core';
+import { RoutingNode, UnrecognizedNodeTypeError } from 'n8n-core';
 import type {
 	LoadedClass,
 	INodeType,
@@ -11,9 +12,14 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
 
 describe('NodeTypes', () => {
-	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
+	const globalConfig = mock<GlobalConfig>({
+		nodes: { communityPackages: { allowToolUsage: false } },
+	});
+	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>({
+		convertNodeToAiTool: LoadNodesAndCredentials.prototype.convertNodeToAiTool,
+	});
 
-	const nodeTypes: NodeTypes = new NodeTypes(loadNodesAndCredentials);
+	const nodeTypes: NodeTypes = new NodeTypes(globalConfig, loadNodesAndCredentials);
 
 	const nonVersionedNode: LoadedClass<INodeType> = {
 		sourcePath: '',
@@ -22,10 +28,11 @@ describe('NodeTypes', () => {
 				name: 'n8n-nodes-base.nonVersioned',
 				usableAsTool: undefined,
 			}),
+			supplyData: undefined,
 		},
 	};
-	const v1Node = mock<INodeType>();
-	const v2Node = mock<INodeType>();
+	const v1Node = mock<INodeType>({ supplyData: undefined });
+	const v2Node = mock<INodeType>({ supplyData: undefined });
 	const versionedNode: LoadedClass<IVersionedNodeType> = {
 		sourcePath: '',
 		type: {
@@ -43,6 +50,17 @@ describe('NodeTypes', () => {
 			},
 		},
 	};
+	const toolNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.toolNode',
+				displayName: 'TestNode',
+				properties: [],
+			}),
+			supplyData: jest.fn(),
+		},
+	};
 	const toolSupportingNode: LoadedClass<INodeType> = {
 		sourcePath: '',
 		type: {
@@ -52,19 +70,55 @@ describe('NodeTypes', () => {
 				usableAsTool: true,
 				properties: [],
 			}),
+			supplyData: undefined,
+		},
+	};
+	const declarativeNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.declarativeNode',
+				displayName: 'Declarative Node',
+				usableAsTool: true,
+				properties: [],
+			}),
+			execute: undefined,
+			poll: undefined,
+			trigger: undefined,
+			webhook: undefined,
+			methods: undefined,
+			supplyData: undefined,
+		},
+	};
+	const communityNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-community.testNode',
+				displayName: 'TestNode',
+				usableAsTool: true,
+				properties: [],
+			}),
+			supplyData: undefined,
 		},
 	};
 
 	loadNodesAndCredentials.getNode.mockImplementation((fullNodeType) => {
 		const [packageName, nodeType] = fullNodeType.split('.');
-		if (nodeType === 'nonVersioned') return nonVersionedNode;
-		if (nodeType === 'versioned') return versionedNode;
-		if (nodeType === 'testNode') return toolSupportingNode;
+		if (packageName === 'n8n-nodes-base') {
+			if (nodeType === 'nonVersioned') return nonVersionedNode;
+			if (nodeType === 'versioned') return versionedNode;
+			if (nodeType === 'testNode') return toolSupportingNode;
+			if (nodeType === 'declarativeNode') return declarativeNode;
+			if (nodeType === 'toolNode') return toolNode;
+		} else if (fullNodeType === 'n8n-nodes-community.testNode') return communityNode;
 		throw new UnrecognizedNodeTypeError(packageName, nodeType);
 	});
 
 	beforeEach(() => {
 		jest.clearAllMocks();
+		globalConfig.nodes.communityPackages.allowToolUsage = false;
+		loadNodesAndCredentials.loaded.nodes = {};
 	});
 
 	describe('getByName', () => {
@@ -103,18 +157,63 @@ describe('NodeTypes', () => {
 			);
 		});
 
+		it('should throw when a node-type is requested as tool, but the original node is already a tool', () => {
+			expect(() => nodeTypes.getByNameAndVersion('n8n-nodes-base.toolNodeTool')).toThrow(
+				'Node already has a `supplyData` method',
+			);
+		});
+
 		it('should return the tool node-type when requested as tool', () => {
-			// @ts-expect-error don't mock convertNodeToAiTool for now
-			loadNodesAndCredentials.convertNodeToAiTool =
-				LoadNodesAndCredentials.prototype.convertNodeToAiTool;
 			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.testNodeTool');
-			expect(result).not.toEqual(toolSupportingNode);
+			expect(result).not.toEqual(toolSupportingNode.type);
 			expect(result.description.name).toEqual('n8n-nodes-base.testNodeTool');
 			expect(result.description.displayName).toEqual('TestNode Tool');
 			expect(result.description.codex?.categories).toContain('AI');
 			expect(result.description.inputs).toEqual([]);
 			expect(result.description.outputs).toEqual(['ai_tool']);
 		});
+
+		it('should throw when a node-type is requested as tool, but is a community package', () => {
+			expect(() => nodeTypes.getByNameAndVersion('n8n-nodes-community.testNodeTool')).toThrow(
+				'Unrecognized node type: n8n-nodes-community.testNodeTool',
+			);
+		});
+
+		it('should return a tool node-type from a community node,  when requested as tool', () => {
+			globalConfig.nodes.communityPackages.allowToolUsage = true;
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-community.testNodeTool');
+			expect(result).not.toEqual(toolSupportingNode.type);
+			expect(result.description.name).toEqual('n8n-nodes-community.testNodeTool');
+			expect(result.description.displayName).toEqual('TestNode Tool');
+			expect(result.description.codex?.categories).toContain('AI');
+			expect(result.description.inputs).toEqual([]);
+			expect(result.description.outputs).toEqual(['ai_tool']);
+		});
+
+		it('should return a declarative node-type with an `.execute` method', () => {
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.declarativeNode');
+			expect(result).toBe(declarativeNode.type);
+			expect(result.execute).toBeDefined();
+
+			const runNodeSpy = jest.spyOn(RoutingNode.prototype, 'runNode').mockResolvedValue([]);
+			result.execute!.call(mock());
+			expect(runNodeSpy).toHaveBeenCalled();
+		});
+
+		it('should return a declarative node-type as a tool with an `.execute` method', () => {
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.declarativeNodeTool');
+			expect(result).not.toEqual(declarativeNode.type);
+			expect(result.description.name).toEqual('n8n-nodes-base.declarativeNodeTool');
+			expect(result.description.displayName).toEqual('Declarative Node Tool');
+			expect(result.description.codex?.categories).toContain('AI');
+			expect(result.description.inputs).toEqual([]);
+			expect(result.description.outputs).toEqual(['ai_tool']);
+			expect(result.execute).toBeDefined();
+
+			const runNodeSpy = jest.spyOn(RoutingNode.prototype, 'runNode').mockResolvedValue([]);
+			result.execute!.call(mock());
+			expect(runNodeSpy).toHaveBeenCalled();
+		});
 	});
 
 	describe('getWithSourcePath', () => {
@@ -143,7 +242,6 @@ describe('NodeTypes', () => {
 
 	describe('getNodeTypeDescriptions', () => {
 		it('should return descriptions for valid node types', () => {
-			const nodeTypes = new NodeTypes(loadNodesAndCredentials);
 			const result = nodeTypes.getNodeTypeDescriptions([
 				{ name: 'n8n-nodes-base.nonVersioned', version: 1 },
 			]);
@@ -153,7 +251,6 @@ describe('NodeTypes', () => {
 		});
 
 		it('should throw error for invalid node type', () => {
-			const nodeTypes = new NodeTypes(loadNodesAndCredentials);
 			expect(() =>
 				nodeTypes.getNodeTypeDescriptions([{ name: 'n8n-nodes-base.nonExistent', version: 1 }]),
 			).toThrow('Unrecognized node type: n8n-nodes-base.nonExistent');
diff --git a/packages/cli/src/__tests__/project.test-data.ts b/packages/cli/src/__tests__/project.test-data.ts
index 3ffac36fc8..cd176bd291 100644
--- a/packages/cli/src/__tests__/project.test-data.ts
+++ b/packages/cli/src/__tests__/project.test-data.ts
@@ -1,7 +1,7 @@
 import { nanoId, date, firstName, lastName, email } from 'minifaker';
 import 'minifaker/locales/en';
 
-import type { Project, ProjectType } from '@/databases/entities/project';
+import type { Project } from '@/databases/entities/project';
 
 type RawProjectData = Pick<Project, 'name' | 'type' | 'createdAt' | 'updatedAt' | 'id'>;
 
@@ -13,7 +13,7 @@ export const createRawProjectData = (payload: Partial<RawProjectData>): Project
 		updatedAt: date(),
 		id: nanoId.nanoid(),
 		name: projectName,
-		type: 'personal' as ProjectType,
+		type: 'personal',
 		...payload,
 	} as Project;
 };
diff --git a/packages/cli/src/__tests__/workflow-runner.test.ts b/packages/cli/src/__tests__/workflow-runner.test.ts
index 7330f85997..1de4ddef6b 100644
--- a/packages/cli/src/__tests__/workflow-runner.test.ts
+++ b/packages/cli/src/__tests__/workflow-runner.test.ts
@@ -12,17 +12,14 @@ import type {
 	IWorkflowExecutionDataProcess,
 	StartNodeData,
 } from 'n8n-workflow';
-import {
-	Workflow,
-	WorkflowHooks,
-	type ExecutionError,
-	type IWorkflowExecuteHooks,
-} from 'n8n-workflow';
+import { Workflow, type ExecutionError } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
+import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { User } from '@/databases/entities/user';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionNotFoundError } from '@/errors/execution-not-found-error';
 import { Telemetry } from '@/telemetry';
 import { PermissionChecker } from '@/user-management/permission-checker';
@@ -36,25 +33,14 @@ import { setupTestServer } from '@test-integration/utils';
 
 let owner: User;
 let runner: WorkflowRunner;
-let hookFunctions: IWorkflowExecuteHooks;
 setupTestServer({ endpointGroups: [] });
 
 mockInstance(Telemetry);
 
-class Watchers {
-	workflowExecuteAfter = jest.fn();
-}
-const watchers = new Watchers();
-const watchedWorkflowExecuteAfter = jest.spyOn(watchers, 'workflowExecuteAfter');
-
 beforeAll(async () => {
 	owner = await createUser({ role: 'global:owner' });
 
 	runner = Container.get(WorkflowRunner);
-
-	hookFunctions = {
-		workflowExecuteAfter: [watchers.workflowExecuteAfter],
-	};
 });
 
 afterAll(() => {
@@ -67,6 +53,20 @@ beforeEach(async () => {
 });
 
 describe('processError', () => {
+	let workflow: WorkflowEntity;
+	let execution: ExecutionEntity;
+	let hooks: core.ExecutionLifecycleHooks;
+
+	const watcher = mock<{ workflowExecuteAfter: () => Promise<void> }>();
+
+	beforeEach(async () => {
+		jest.clearAllMocks();
+		workflow = await createWorkflow({}, owner);
+		execution = await createExecution({ status: 'success', finished: true }, workflow);
+		hooks = new core.ExecutionLifecycleHooks('webhook', execution.id, workflow);
+		hooks.addHandler('workflowExecuteAfter', watcher.workflowExecuteAfter);
+	});
+
 	test('processError should return early in Bull stalled edge case', async () => {
 		const workflow = await createWorkflow({}, owner);
 		const execution = await createExecution(
@@ -82,9 +82,9 @@ describe('processError', () => {
 			new Date(),
 			'webhook',
 			execution.id,
-			new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+			hooks,
 		);
-		expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(0);
+		expect(watcher.workflowExecuteAfter).toHaveBeenCalledTimes(0);
 	});
 
 	test('processError should return early if the error is `ExecutionNotFoundError`', async () => {
@@ -95,9 +95,9 @@ describe('processError', () => {
 			new Date(),
 			'webhook',
 			execution.id,
-			new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+			hooks,
 		);
-		expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(0);
+		expect(watcher.workflowExecuteAfter).toHaveBeenCalledTimes(0);
 	});
 
 	test('processError should process error', async () => {
@@ -119,9 +119,9 @@ describe('processError', () => {
 			new Date(),
 			'webhook',
 			execution.id,
-			new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+			hooks,
 		);
-		expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(1);
+		expect(watcher.workflowExecuteAfter).toHaveBeenCalledTimes(1);
 	});
 });
 
diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts
index 9056271f64..e0dde622eb 100644
--- a/packages/cli/src/active-executions.ts
+++ b/packages/cli/src/active-executions.ts
@@ -61,9 +61,7 @@ export class ActiveExecutions {
 				workflowId: executionData.workflowData.id,
 			};
 
-			if (executionData.retryOf !== undefined) {
-				fullExecutionData.retryOf = executionData.retryOf.toString();
-			}
+			fullExecutionData.retryOf = executionData.retryOf ?? undefined;
 
 			const workflowId = executionData.workflowData.id;
 			if (workflowId !== undefined && isWorkflowIdValid(workflowId)) {
@@ -94,14 +92,17 @@ export class ActiveExecutions {
 			await this.executionRepository.updateExistingExecution(executionId, execution);
 		}
 
+		const resumingExecution = this.activeExecutions[executionId];
 		const postExecutePromise = createDeferredPromise<IRun | undefined>();
 
-		this.activeExecutions[executionId] = {
+		const execution: IExecutingWorkflowData = {
 			executionData,
-			startedAt: new Date(),
+			startedAt: resumingExecution?.startedAt ?? new Date(),
 			postExecutePromise,
 			status: executionStatus,
+			responsePromise: resumingExecution?.responsePromise,
 		};
+		this.activeExecutions[executionId] = execution;
 
 		// Automatically remove execution once the postExecutePromise settles
 		void postExecutePromise.promise
@@ -111,8 +112,13 @@ export class ActiveExecutions {
 			})
 			.finally(() => {
 				this.concurrencyControl.release({ mode: executionData.executionMode });
-				delete this.activeExecutions[executionId];
-				this.logger.debug('Execution removed', { executionId });
+				if (execution.status === 'waiting') {
+					// Do not hold on a reference to the previous WorkflowExecute instance, since a resuming execution will use a new instance
+					delete execution.workflowExecution;
+				} else {
+					delete this.activeExecutions[executionId];
+					this.logger.debug('Execution removed', { executionId });
+				}
 			});
 
 		this.logger.debug('Execution added', { executionId });
@@ -125,14 +131,14 @@ export class ActiveExecutions {
 	 */
 
 	attachWorkflowExecution(executionId: string, workflowExecution: PCancelable<IRun>) {
-		this.getExecution(executionId).workflowExecution = workflowExecution;
+		this.getExecutionOrFail(executionId).workflowExecution = workflowExecution;
 	}
 
 	attachResponsePromise(
 		executionId: string,
 		responsePromise: IDeferredPromise<IExecuteResponsePromiseData>,
 	): void {
-		this.getExecution(executionId).responsePromise = responsePromise;
+		this.getExecutionOrFail(executionId).responsePromise = responsePromise;
 	}
 
 	resolveResponsePromise(executionId: string, response: IExecuteResponsePromiseData): void {
@@ -147,15 +153,23 @@ export class ActiveExecutions {
 			// There is no execution running with that id
 			return;
 		}
-		execution.workflowExecution?.cancel();
-		execution.postExecutePromise.reject(new ExecutionCancelledError(executionId));
+		const error = new ExecutionCancelledError(executionId);
+		execution.responsePromise?.reject(error);
+		if (execution.status === 'waiting') {
+			// A waiting execution will not have a valid workflowExecution or postExecutePromise
+			// So we can't rely on the `.finally` on the postExecutePromise for the execution removal
+			delete this.activeExecutions[executionId];
+		} else {
+			execution.workflowExecution?.cancel();
+			execution.postExecutePromise.reject(error);
+		}
 		this.logger.debug('Execution cancelled', { executionId });
 	}
 
 	/** Resolve the post-execution promise in an execution. */
 	finalizeExecution(executionId: string, fullRunData?: IRun) {
 		if (!this.has(executionId)) return;
-		const execution = this.getExecution(executionId);
+		const execution = this.getExecutionOrFail(executionId);
 		execution.postExecutePromise.resolve(fullRunData);
 		this.logger.debug('Execution finalized', { executionId });
 	}
@@ -164,7 +178,7 @@ export class ActiveExecutions {
 	 * Returns a promise which will resolve with the data of the execution with the given id
 	 */
 	async getPostExecutePromise(executionId: string): Promise<IRun | undefined> {
-		return await this.getExecution(executionId).postExecutePromise.promise;
+		return await this.getExecutionOrFail(executionId).postExecutePromise.promise;
 	}
 
 	/**
@@ -179,7 +193,7 @@ export class ActiveExecutions {
 			data = this.activeExecutions[id];
 			returnData.push({
 				id,
-				retryOf: data.executionData.retryOf,
+				retryOf: data.executionData.retryOf ?? undefined,
 				startedAt: data.startedAt,
 				mode: data.executionData.executionMode,
 				workflowId: data.executionData.workflowData.id,
@@ -191,32 +205,40 @@ export class ActiveExecutions {
 	}
 
 	setStatus(executionId: string, status: ExecutionStatus) {
-		this.getExecution(executionId).status = status;
+		this.getExecutionOrFail(executionId).status = status;
 	}
 
 	getStatus(executionId: string): ExecutionStatus {
-		return this.getExecution(executionId).status;
+		return this.getExecutionOrFail(executionId).status;
 	}
 
 	/** Wait for all active executions to finish */
 	async shutdown(cancelAll = false) {
-		let executionIds = Object.keys(this.activeExecutions);
-
-		if (config.getEnv('executions.mode') === 'regular') {
+		const isRegularMode = config.getEnv('executions.mode') === 'regular';
+		if (isRegularMode) {
 			// removal of active executions will no longer release capacity back,
 			// so that throttled executions cannot resume during shutdown
 			this.concurrencyControl.disable();
 		}
 
-		if (cancelAll) {
-			if (config.getEnv('executions.mode') === 'regular') {
-				await this.concurrencyControl.removeAll(this.activeExecutions);
+		let executionIds = Object.keys(this.activeExecutions);
+		const toCancel: string[] = [];
+		for (const executionId of executionIds) {
+			const { responsePromise, status } = this.activeExecutions[executionId];
+			if (!!responsePromise || (isRegularMode && cancelAll)) {
+				// Cancel all exectutions that have a response promise, because these promises can't be retained between restarts
+				this.stopExecution(executionId);
+				toCancel.push(executionId);
+			} else if (status === 'waiting' || status === 'new') {
+				// Remove waiting and new executions to not block shutdown
+				delete this.activeExecutions[executionId];
 			}
-
-			executionIds.forEach((executionId) => this.stopExecution(executionId));
 		}
 
+		await this.concurrencyControl.removeAll(toCancel);
+
 		let count = 0;
+		executionIds = Object.keys(this.activeExecutions);
 		while (executionIds.length !== 0) {
 			if (count++ % 4 === 0) {
 				this.logger.info(`Waiting for ${executionIds.length} active executions to finish...`);
@@ -227,7 +249,7 @@ export class ActiveExecutions {
 		}
 	}
 
-	private getExecution(executionId: string): IExecutingWorkflowData {
+	getExecutionOrFail(executionId: string): IExecutingWorkflowData {
 		const execution = this.activeExecutions[executionId];
 		if (!execution) {
 			throw new ExecutionNotFoundError(executionId);
diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts
index a002bc4054..b783724bef 100644
--- a/packages/cli/src/active-workflow-manager.ts
+++ b/packages/cli/src/active-workflow-manager.ts
@@ -7,13 +7,13 @@ import {
 	Logger,
 	PollContext,
 	TriggerContext,
+	type IGetExecutePollFunctions,
+	type IGetExecuteTriggerFunctions,
 } from 'n8n-core';
 import type {
 	ExecutionError,
 	IDeferredPromise,
 	IExecuteResponsePromiseData,
-	IGetExecutePollFunctions,
-	IGetExecuteTriggerFunctions,
 	INode,
 	INodeExecutionData,
 	IRun,
@@ -40,6 +40,7 @@ import {
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
+import { executeErrorWorkflow } from '@/execution-lifecycle/execute-error-workflow';
 import { ExecutionService } from '@/executions/execution.service';
 import { ExternalHooks } from '@/external-hooks';
 import type { IWorkflowDb } from '@/interfaces';
@@ -88,7 +89,7 @@ export class ActiveWorkflowManager {
 
 		await this.addActiveWorkflows('init');
 
-		await this.externalHooks.run('activeWorkflows.initialized', []);
+		await this.externalHooks.run('activeWorkflows.initialized');
 		await this.webhookService.populateCache();
 	}
 
@@ -400,7 +401,7 @@ export class ActiveWorkflowManager {
 			status: 'running',
 		};
 
-		WorkflowExecuteAdditionalData.executeErrorWorkflow(workflowData, fullRunData, mode);
+		executeErrorWorkflow(workflowData, fullRunData, mode);
 	}
 
 	/**
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index 56799c5089..5e07b8e350 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -61,10 +61,15 @@ export abstract class BaseCommand extends Command {
 
 	async init(): Promise<void> {
 		this.errorReporter = Container.get(ErrorReporter);
-		await this.errorReporter.init(
-			this.instanceSettings.instanceType,
-			this.globalConfig.sentry.backendDsn,
-		);
+
+		const { backendDsn, n8nVersion, environment, deploymentName } = this.globalConfig.sentry;
+		await this.errorReporter.init({
+			serverType: this.instanceSettings.instanceType,
+			dsn: backendDsn,
+			environment,
+			release: n8nVersion,
+			serverName: deploymentName,
+		});
 		initExpressionEvaluator();
 
 		process.once('SIGTERM', this.onTerminationSignal('SIGTERM'));
@@ -184,42 +189,10 @@ export abstract class BaseCommand extends Command {
 	private async _initObjectStoreService(options = { isReadOnly: false }) {
 		const objectStoreService = Container.get(ObjectStoreService);
 
-		const { host, bucket, credentials } = this.globalConfig.externalStorage.s3;
-
-		if (host === '') {
-			throw new ApplicationError(
-				'External storage host not configured. Please set `N8N_EXTERNAL_STORAGE_S3_HOST`.',
-			);
-		}
-
-		if (bucket.name === '') {
-			throw new ApplicationError(
-				'External storage bucket name not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_NAME`.',
-			);
-		}
-
-		if (bucket.region === '') {
-			throw new ApplicationError(
-				'External storage bucket region not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_REGION`.',
-			);
-		}
-
-		if (credentials.accessKey === '') {
-			throw new ApplicationError(
-				'External storage access key not configured. Please set `N8N_EXTERNAL_STORAGE_S3_ACCESS_KEY`.',
-			);
-		}
-
-		if (credentials.accessSecret === '') {
-			throw new ApplicationError(
-				'External storage access secret not configured. Please set `N8N_EXTERNAL_STORAGE_S3_ACCESS_SECRET`.',
-			);
-		}
-
 		this.logger.debug('Initializing object store service');
 
 		try {
-			await objectStoreService.init(host, bucket, credentials);
+			await objectStoreService.init();
 			objectStoreService.setReadonly(options.isReadOnly);
 
 			this.logger.debug('Object store init completed');
diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index edbf988434..8d3eb8da94 100644
--- a/packages/cli/src/commands/ldap/reset.ts
+++ b/packages/cli/src/commands/ldap/reset.ts
@@ -110,7 +110,7 @@ export class Reset extends BaseCommand {
 		}
 
 		for (const credential of ownedCredentials) {
-			await Container.get(CredentialsService).delete(credential);
+			await Container.get(CredentialsService).delete(owner, credential.id);
 		}
 
 		await Container.get(AuthProviderSyncHistoryRepository).delete({ providerType: 'ldap' });
diff --git a/packages/cli/src/commands/license/clear.ts b/packages/cli/src/commands/license/clear.ts
index 03a2ea4dd4..732401ed47 100644
--- a/packages/cli/src/commands/license/clear.ts
+++ b/packages/cli/src/commands/license/clear.ts
@@ -16,7 +16,7 @@ export class ClearLicenseCommand extends BaseCommand {
 
 		// Attempt to invoke shutdown() to force any floating entitlements to be released
 		const license = Container.get(License);
-		await license.init();
+		await license.init({ isCli: true });
 		try {
 			await license.shutdown();
 		} catch {
diff --git a/packages/cli/src/commands/license/info.ts b/packages/cli/src/commands/license/info.ts
index cc99e925f7..f99648d0d5 100644
--- a/packages/cli/src/commands/license/info.ts
+++ b/packages/cli/src/commands/license/info.ts
@@ -11,7 +11,7 @@ export class LicenseInfoCommand extends BaseCommand {
 
 	async run() {
 		const license = Container.get(License);
-		await license.init();
+		await license.init({ isCli: true });
 
 		this.logger.info('Printing license information:\n' + license.getInfo());
 	}
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 179c3a8052..a255a95bb9 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -1,6 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import glob from 'fast-glob';
@@ -21,7 +20,6 @@ import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
 import { ExecutionService } from '@/executions/execution.service';
-import { License } from '@/license';
 import { PubSubHandler } from '@/scaling/pubsub/pubsub-handler';
 import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { Server } from '@/server';
@@ -96,7 +94,7 @@ export class Start extends BaseCommand {
 
 			Container.get(WaitTracker).stopTracking();
 
-			await this.externalHooks?.run('n8n.stop', []);
+			await this.externalHooks?.run('n8n.stop');
 
 			await this.activeWorkflowManager.removeAllTriggerAndPollerBasedWorkflows();
 
@@ -192,18 +190,23 @@ export class Start extends BaseCommand {
 		await super.init();
 		this.activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
-		this.instanceSettings.setMultiMainEnabled(
-			config.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled,
-		);
-		await this.initLicense();
+		const isMultiMainEnabled =
+			config.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled;
+
+		this.instanceSettings.setMultiMainEnabled(isMultiMainEnabled);
+
+		/**
+		 * We temporarily license multi-main to allow orchestration to set instance
+		 * role, which is needed by license init. Once the license is initialized,
+		 * the actual value will be used for the license check.
+		 */
+		if (isMultiMainEnabled) this.instanceSettings.setMultiMainLicensed(true);
 
 		await this.initOrchestration();
-		this.logger.debug('Orchestration init complete');
+		await this.initLicense();
 
-		if (!this.globalConfig.license.autoRenewalEnabled && this.instanceSettings.isLeader) {
-			this.logger.warn(
-				'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!',
-			);
+		if (isMultiMainEnabled && !this.license.isMultiMainLicensed()) {
+			throw new FeatureNotLicensedError(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
 		}
 
 		Container.get(WaitTracker).init();
@@ -237,13 +240,6 @@ export class Start extends BaseCommand {
 			return;
 		}
 
-		if (
-			Container.get(GlobalConfig).multiMainSetup.enabled &&
-			!Container.get(License).isMultipleMainInstancesLicensed()
-		) {
-			throw new FeatureNotLicensedError(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
-		}
-
 		const orchestrationService = Container.get(OrchestrationService);
 
 		await orchestrationService.init();
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 8b6f318576..fd1e961b59 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -33,7 +33,7 @@ export class Webhook extends BaseCommand {
 		this.logger.info('\nStopping n8n...');
 
 		try {
-			await this.externalHooks?.run('n8n.stop', []);
+			await this.externalHooks?.run('n8n.stop');
 
 			await Container.get(ActiveExecutions).shutdown();
 		} catch (error) {
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index f5138f1ef3..c6046a7772 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -49,7 +49,7 @@ export class Worker extends BaseCommand {
 		this.logger.info('Stopping worker...');
 
 		try {
-			await this.externalHooks?.run('n8n.stop', []);
+			await this.externalHooks?.run('n8n.stop');
 		} catch (error) {
 			await this.exitWithCrash('Error shutting down worker', error);
 		}
diff --git a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
index 6511ae4d03..6a0ffcac18 100644
--- a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
+++ b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
@@ -1,6 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
 
+import type { ConcurrencyQueueType } from '@/concurrency/concurrency-control.service';
 import {
 	CLOUD_TEMP_PRODUCTION_LIMIT,
 	CLOUD_TEMP_REPORTABLE_THRESHOLDS,
@@ -10,7 +11,6 @@ import config from '@/config';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit.error';
 import type { EventService } from '@/events/event.service';
-import type { IExecutingWorkflowData } from '@/interfaces';
 import type { Telemetry } from '@/telemetry';
 import { mockLogger } from '@test/mocking';
 
@@ -24,61 +24,71 @@ describe('ConcurrencyControlService', () => {
 
 	afterEach(() => {
 		config.set('executions.concurrency.productionLimit', -1);
+		config.set('executions.concurrency.evaluationLimit', -1);
 		config.set('executions.mode', 'integrated');
 
 		jest.clearAllMocks();
 	});
 
 	describe('constructor', () => {
-		it('should be enabled if production cap is positive', () => {
-			/**
-			 * Arrange
-			 */
-			config.set('executions.concurrency.productionLimit', 1);
+		it.each(['production', 'evaluation'])(
+			'should be enabled if %s cap is positive',
+			(type: ConcurrencyQueueType) => {
+				/**
+				 * Arrange
+				 */
+				config.set(`executions.concurrency.${type}Limit`, 1);
 
-			/**
-			 * Act
-			 */
-			const service = new ConcurrencyControlService(
-				logger,
-				executionRepository,
-				telemetry,
-				eventService,
-			);
-
-			/**
-			 * Assert
-			 */
-			// @ts-expect-error Private property
-			expect(service.isEnabled).toBe(true);
-			// @ts-expect-error Private property
-			expect(service.productionQueue).toBeDefined();
-		});
-
-		it('should throw if production cap is 0', () => {
-			/**
-			 * Arrange
-			 */
-			config.set('executions.concurrency.productionLimit', 0);
-
-			try {
 				/**
 				 * Act
 				 */
-				new ConcurrencyControlService(logger, executionRepository, telemetry, eventService);
-			} catch (error) {
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+
 				/**
 				 * Assert
 				 */
-				expect(error).toBeInstanceOf(InvalidConcurrencyLimitError);
-			}
-		});
+				// @ts-expect-error Private property
+				expect(service.isEnabled).toBe(true);
+				// @ts-expect-error Private property
+				expect(service.queues.get(type)).toBeDefined();
+				// @ts-expect-error Private property
+				expect(service.queues.size).toBe(1);
+			},
+		);
 
-		it('should be disabled if production cap is -1', () => {
+		it.each(['production', 'evaluation'])(
+			'should throw if %s cap is 0',
+			(type: ConcurrencyQueueType) => {
+				/**
+				 * Arrange
+				 */
+				config.set(`executions.concurrency.${type}Limit`, 0);
+
+				try {
+					/**
+					 * Act
+					 */
+					new ConcurrencyControlService(logger, executionRepository, telemetry, eventService);
+				} catch (error) {
+					/**
+					 * Assert
+					 */
+					expect(error).toBeInstanceOf(InvalidConcurrencyLimitError);
+				}
+			},
+		);
+
+		it('should be disabled if both production and evaluation caps are -1', () => {
 			/**
 			 * Arrange
 			 */
 			config.set('executions.concurrency.productionLimit', -1);
+			config.set('executions.concurrency.evaluationLimit', -1);
 
 			/**
 			 * Act
@@ -97,28 +107,31 @@ describe('ConcurrencyControlService', () => {
 			expect(service.isEnabled).toBe(false);
 		});
 
-		it('should be disabled if production cap is lower than -1', () => {
-			/**
-			 * Arrange
-			 */
-			config.set('executions.concurrency.productionLimit', -2);
+		it.each(['production', 'evaluation'])(
+			'should be disabled if %s cap is lower than -1',
+			(type: ConcurrencyQueueType) => {
+				/**
+				 * Arrange
+				 */
+				config.set(`executions.concurrency.${type}Limit`, -2);
 
-			/**
-			 * Act
-			 */
-			const service = new ConcurrencyControlService(
-				logger,
-				executionRepository,
-				telemetry,
-				eventService,
-			);
+				/**
+				 * Act
+				 */
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
 
-			/**
-			 * Act
-			 */
-			// @ts-expect-error Private property
-			expect(service.isEnabled).toBe(false);
-		});
+				/**
+				 * Act
+				 */
+				// @ts-expect-error Private property
+				expect(service.isEnabled).toBe(false);
+			},
+		);
 
 		it('should be disabled on queue mode', () => {
 			/**
@@ -203,6 +216,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(enqueueSpy).toHaveBeenCalled();
 			});
+
+			it('should enqueue on evaluation mode', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', 1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
+
+				/**
+				 * Act
+				 */
+				await service.throttle({ mode: 'evaluation', executionId: '1' });
+
+				/**
+				 * Assert
+				 */
+				expect(enqueueSpy).toHaveBeenCalled();
+			});
 		});
 
 		describe('release', () => {
@@ -258,6 +296,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(dequeueSpy).toHaveBeenCalled();
 			});
+
+			it('should dequeue on evaluation mode', () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', 1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
+
+				/**
+				 * Act
+				 */
+				service.release({ mode: 'evaluation' });
+
+				/**
+				 * Assert
+				 */
+				expect(dequeueSpy).toHaveBeenCalled();
+			});
 		});
 
 		describe('remove', () => {
@@ -316,14 +379,12 @@ describe('ConcurrencyControlService', () => {
 					expect(removeSpy).toHaveBeenCalled();
 				},
 			);
-		});
 
-		describe('removeAll', () => {
-			it('should remove all executions from the production queue', async () => {
+			it('should remove an execution on evaluation mode', () => {
 				/**
 				 * Arrange
 				 */
-				config.set('executions.concurrency.productionLimit', 2);
+				config.set('executions.concurrency.evaluationLimit', 1);
 
 				const service = new ConcurrencyControlService(
 					logger,
@@ -331,28 +392,108 @@ describe('ConcurrencyControlService', () => {
 					telemetry,
 					eventService,
 				);
-
-				jest
-					.spyOn(ConcurrencyQueue.prototype, 'getAll')
-					.mockReturnValueOnce(new Set(['1', '2', '3']));
-
 				const removeSpy = jest.spyOn(ConcurrencyQueue.prototype, 'remove');
 
 				/**
 				 * Act
 				 */
-				await service.removeAll({
-					'1': mock<IExecutingWorkflowData>(),
-					'2': mock<IExecutingWorkflowData>(),
-					'3': mock<IExecutingWorkflowData>(),
-				});
+				service.remove({ mode: 'evaluation', executionId: '1' });
 
 				/**
 				 * Assert
 				 */
-				expect(removeSpy).toHaveBeenNthCalledWith(1, '1');
-				expect(removeSpy).toHaveBeenNthCalledWith(2, '2');
-				expect(removeSpy).toHaveBeenNthCalledWith(3, '3');
+				expect(removeSpy).toHaveBeenCalled();
+			});
+		});
+
+		describe('removeAll', () => {
+			it.each(['production', 'evaluation'])(
+				'should remove all executions from the %s queue',
+				async (type: ConcurrencyQueueType) => {
+					/**
+					 * Arrange
+					 */
+					config.set(`executions.concurrency.${type}Limit`, 2);
+
+					const service = new ConcurrencyControlService(
+						logger,
+						executionRepository,
+						telemetry,
+						eventService,
+					);
+
+					jest
+						.spyOn(ConcurrencyQueue.prototype, 'getAll')
+						.mockReturnValueOnce(new Set(['1', '2', '3']));
+
+					const removeSpy = jest.spyOn(ConcurrencyQueue.prototype, 'remove');
+
+					/**
+					 * Act
+					 */
+					await service.removeAll(['1', '2', '3']);
+
+					/**
+					 * Assert
+					 */
+					expect(removeSpy).toHaveBeenNthCalledWith(1, '1');
+					expect(removeSpy).toHaveBeenNthCalledWith(2, '2');
+					expect(removeSpy).toHaveBeenNthCalledWith(3, '3');
+				},
+			);
+		});
+
+		describe('get queue', () => {
+			it('should choose the production queue', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.productionLimit', 2);
+				config.set('executions.concurrency.evaluationLimit', 2);
+
+				/**
+				 * Act
+				 */
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				// @ts-expect-error Private property
+				const queue = service.getQueue('webhook');
+
+				/**
+				 * Assert
+				 */
+				// @ts-expect-error Private property
+				expect(queue).toEqual(service.queues.get('production'));
+			});
+
+			it('should choose the evaluation queue', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.productionLimit', 2);
+				config.set('executions.concurrency.evaluationLimit', 2);
+
+				/**
+				 * Act
+				 */
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				// @ts-expect-error Private property
+				const queue = service.getQueue('evaluation');
+
+				/**
+				 * Assert
+				 */
+				// @ts-expect-error Private property
+				expect(queue).toEqual(service.queues.get('evaluation'));
 			});
 		});
 	});
@@ -388,6 +529,32 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(enqueueSpy).not.toHaveBeenCalled();
 			});
+
+			it('should do nothing for evaluation executions', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', -1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
+
+				/**
+				 * Act
+				 */
+				await service.throttle({ mode: 'evaluation', executionId: '1' });
+				await service.throttle({ mode: 'evaluation', executionId: '2' });
+
+				/**
+				 * Assert
+				 */
+				expect(enqueueSpy).not.toHaveBeenCalled();
+			});
 		});
 
 		describe('release', () => {
@@ -415,6 +582,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(dequeueSpy).not.toHaveBeenCalled();
 			});
+
+			it('should do nothing for evaluation executions', () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', -1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
+
+				/**
+				 * Act
+				 */
+				service.release({ mode: 'evaluation' });
+
+				/**
+				 * Assert
+				 */
+				expect(dequeueSpy).not.toHaveBeenCalled();
+			});
 		});
 
 		describe('remove', () => {
@@ -442,6 +634,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(removeSpy).not.toHaveBeenCalled();
 			});
+
+			it('should do nothing for evaluation executions', () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', -1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const removeSpy = jest.spyOn(ConcurrencyQueue.prototype, 'remove');
+
+				/**
+				 * Act
+				 */
+				service.remove({ mode: 'evaluation', executionId: '1' });
+
+				/**
+				 * Assert
+				 */
+				expect(removeSpy).not.toHaveBeenCalled();
+			});
 		});
 	});
 
@@ -470,14 +687,17 @@ describe('ConcurrencyControlService', () => {
 					 * Act
 					 */
 					// @ts-expect-error Private property
-					service.productionQueue.emit('concurrency-check', {
+					service.queues.get('production').emit('concurrency-check', {
 						capacity: CLOUD_TEMP_PRODUCTION_LIMIT - threshold,
 					});
 
 					/**
 					 * Assert
 					 */
-					expect(telemetry.track).toHaveBeenCalledWith('User hit concurrency limit', { threshold });
+					expect(telemetry.track).toHaveBeenCalledWith('User hit concurrency limit', {
+						threshold,
+						concurrencyQueue: 'production',
+					});
 				},
 			);
 
@@ -500,7 +720,7 @@ describe('ConcurrencyControlService', () => {
 					 * Act
 					 */
 					// @ts-expect-error Private property
-					service.productionQueue.emit('concurrency-check', {
+					service.queues.get('production').emit('concurrency-check', {
 						capacity: CLOUD_TEMP_PRODUCTION_LIMIT - threshold,
 					});
 
@@ -532,7 +752,7 @@ describe('ConcurrencyControlService', () => {
 					 * Act
 					 */
 					// @ts-expect-error Private property
-					service.productionQueue.emit('concurrency-check', {
+					service.queues.get('production').emit('concurrency-check', {
 						capacity: CLOUD_TEMP_PRODUCTION_LIMIT - threshold,
 					});
 
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index 6088d0f4c3..f41a919680 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -1,4 +1,5 @@
 import { Service } from '@n8n/di';
+import { capitalize } from 'lodash';
 import { Logger } from 'n8n-core';
 import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
 
@@ -7,7 +8,6 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito
 import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit.error';
 import { UnknownExecutionModeError } from '@/errors/unknown-execution-mode.error';
 import { EventService } from '@/events/event.service';
-import type { IExecutingWorkflowData } from '@/interfaces';
 import { Telemetry } from '@/telemetry';
 
 import { ConcurrencyQueue } from './concurrency-queue';
@@ -15,13 +15,15 @@ import { ConcurrencyQueue } from './concurrency-queue';
 export const CLOUD_TEMP_PRODUCTION_LIMIT = 999;
 export const CLOUD_TEMP_REPORTABLE_THRESHOLDS = [5, 10, 20, 50, 100, 200];
 
+export type ConcurrencyQueueType = 'production' | 'evaluation';
+
 @Service()
 export class ConcurrencyControlService {
 	private isEnabled: boolean;
 
-	private readonly productionLimit: number;
+	private readonly limits: Map<ConcurrencyQueueType, number>;
 
-	private readonly productionQueue: ConcurrencyQueue;
+	private readonly queues: Map<ConcurrencyQueueType, ConcurrencyQueue>;
 
 	private readonly limitsToReport = CLOUD_TEMP_REPORTABLE_THRESHOLDS.map(
 		(t) => CLOUD_TEMP_PRODUCTION_LIMIT - t,
@@ -35,52 +37,74 @@ export class ConcurrencyControlService {
 	) {
 		this.logger = this.logger.scoped('concurrency');
 
-		this.productionLimit = config.getEnv('executions.concurrency.productionLimit');
+		this.limits = new Map([
+			['production', config.getEnv('executions.concurrency.productionLimit')],
+			['evaluation', config.getEnv('executions.concurrency.evaluationLimit')],
+		]);
 
-		if (this.productionLimit === 0) {
-			throw new InvalidConcurrencyLimitError(this.productionLimit);
-		}
+		this.limits.forEach((limit, type) => {
+			if (limit === 0) {
+				throw new InvalidConcurrencyLimitError(limit);
+			}
 
-		if (this.productionLimit < -1) {
-			this.productionLimit = -1;
-		}
+			if (limit < -1) {
+				this.limits.set(type, -1);
+			}
+		});
 
-		if (this.productionLimit === -1 || config.getEnv('executions.mode') === 'queue') {
+		if (
+			Array.from(this.limits.values()).every((limit) => limit === -1) ||
+			config.getEnv('executions.mode') === 'queue'
+		) {
 			this.isEnabled = false;
 			return;
 		}
 
-		this.productionQueue = new ConcurrencyQueue(this.productionLimit);
+		this.queues = new Map();
+		this.limits.forEach((limit, type) => {
+			if (limit > 0) {
+				this.queues.set(type, new ConcurrencyQueue(limit));
+			}
+		});
 
 		this.logInit();
 
 		this.isEnabled = true;
 
-		this.productionQueue.on('concurrency-check', ({ capacity }) => {
-			if (this.shouldReport(capacity)) {
-				this.telemetry.track('User hit concurrency limit', {
-					threshold: CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
-				});
-			}
-		});
+		this.queues.forEach((queue, type) => {
+			queue.on('concurrency-check', ({ capacity }) => {
+				if (this.shouldReport(capacity)) {
+					this.telemetry.track('User hit concurrency limit', {
+						threshold: CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
+						concurrencyQueue: type,
+					});
+				}
+			});
 
-		this.productionQueue.on('execution-throttled', ({ executionId }) => {
-			this.logger.debug('Execution throttled', { executionId });
-			this.eventService.emit('execution-throttled', { executionId });
-		});
+			queue.on('execution-throttled', ({ executionId }) => {
+				this.logger.debug('Execution throttled', { executionId, type });
+				this.eventService.emit('execution-throttled', { executionId, type });
+			});
 
-		this.productionQueue.on('execution-released', async (executionId) => {
-			this.logger.debug('Execution released', { executionId });
+			queue.on('execution-released', (executionId) => {
+				this.logger.debug('Execution released', { executionId, type });
+			});
 		});
 	}
 
 	/**
-	 * Check whether an execution is in the production queue.
+	 * Check whether an execution is in any of the queues.
 	 */
 	has(executionId: string) {
 		if (!this.isEnabled) return false;
 
-		return this.productionQueue.getAll().has(executionId);
+		for (const queue of this.queues.values()) {
+			if (queue.has(executionId)) {
+				return true;
+			}
+		}
+
+		return false;
 	}
 
 	/**
@@ -89,16 +113,16 @@ export class ConcurrencyControlService {
 	async throttle({ mode, executionId }: { mode: ExecutionMode; executionId: string }) {
 		if (!this.isEnabled || this.isUnlimited(mode)) return;
 
-		await this.productionQueue.enqueue(executionId);
+		await this.getQueue(mode)?.enqueue(executionId);
 	}
 
 	/**
-	 * Release capacity back so the next execution in the production queue can proceed.
+	 * Release capacity back so the next execution in the queue can proceed.
 	 */
 	release({ mode }: { mode: ExecutionMode }) {
 		if (!this.isEnabled || this.isUnlimited(mode)) return;
 
-		this.productionQueue.dequeue();
+		this.getQueue(mode)?.dequeue();
 	}
 
 	/**
@@ -107,7 +131,7 @@ export class ConcurrencyControlService {
 	remove({ mode, executionId }: { mode: ExecutionMode; executionId: string }) {
 		if (!this.isEnabled || this.isUnlimited(mode)) return;
 
-		this.productionQueue.remove(executionId);
+		this.getQueue(mode)?.remove(executionId);
 	}
 
 	/**
@@ -115,24 +139,24 @@ export class ConcurrencyControlService {
 	 * enqueued executions that have response promises, as these cannot
 	 * be re-run via `Start.runEnqueuedExecutions` during startup.
 	 */
-	async removeAll(activeExecutions: { [executionId: string]: IExecutingWorkflowData }) {
+	async removeAll(executionIdsToCancel: string[]) {
 		if (!this.isEnabled) return;
 
-		const enqueuedProductionIds = this.productionQueue.getAll();
+		this.queues.forEach((queue) => {
+			const enqueuedExecutionIds = queue.getAll();
 
-		for (const id of enqueuedProductionIds) {
-			this.productionQueue.remove(id);
-		}
+			for (const id of enqueuedExecutionIds) {
+				queue.remove(id);
+			}
+		});
 
-		const executionIds = Object.entries(activeExecutions)
-			.filter(([_, execution]) => execution.status === 'new' && execution.responsePromise)
-			.map(([executionId, _]) => executionId);
+		if (executionIdsToCancel.length === 0) return;
 
-		if (executionIds.length === 0) return;
+		await this.executionRepository.cancelMany(executionIdsToCancel);
 
-		await this.executionRepository.cancelMany(executionIds);
-
-		this.logger.info('Canceled enqueued executions with response promises', { executionIds });
+		this.logger.info('Canceled enqueued executions with response promises', {
+			executionIds: executionIdsToCancel,
+		});
 	}
 
 	disable() {
@@ -146,15 +170,28 @@ export class ConcurrencyControlService {
 	private logInit() {
 		this.logger.debug('Enabled');
 
-		this.logger.debug(
-			[
-				'Production execution concurrency is',
-				this.productionLimit === -1 ? 'unlimited' : 'limited to ' + this.productionLimit.toString(),
-			].join(' '),
-		);
+		this.limits.forEach((limit, type) => {
+			this.logger.debug(
+				[
+					`${capitalize(type)} execution concurrency is`,
+					limit === -1 ? 'unlimited' : 'limited to ' + limit.toString(),
+				].join(' '),
+			);
+		});
 	}
 
 	private isUnlimited(mode: ExecutionMode) {
+		return this.getQueue(mode) === undefined;
+	}
+
+	private shouldReport(capacity: number) {
+		return config.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
+	}
+
+	/**
+	 * Get the concurrency queue based on the execution mode.
+	 */
+	private getQueue(mode: ExecutionMode) {
 		if (
 			mode === 'error' ||
 			mode === 'integrated' ||
@@ -163,15 +200,13 @@ export class ConcurrencyControlService {
 			mode === 'manual' ||
 			mode === 'retry'
 		) {
-			return true;
+			return undefined;
 		}
 
-		if (mode === 'webhook' || mode === 'trigger') return this.productionLimit === -1;
+		if (mode === 'webhook' || mode === 'trigger') return this.queues.get('production');
+
+		if (mode === 'evaluation') return this.queues.get('evaluation');
 
 		throw new UnknownExecutionModeError(mode);
 	}
-
-	private shouldReport(capacity: number) {
-		return config.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
-	}
 }
diff --git a/packages/cli/src/concurrency/concurrency-queue.ts b/packages/cli/src/concurrency/concurrency-queue.ts
index 900018889a..eac9e478d1 100644
--- a/packages/cli/src/concurrency/concurrency-queue.ts
+++ b/packages/cli/src/concurrency/concurrency-queue.ts
@@ -58,6 +58,10 @@ export class ConcurrencyQueue extends TypedEmitter<ConcurrencyEvents> {
 		return new Set(this.queue.map((item) => item.executionId));
 	}
 
+	has(executionId: string) {
+		return this.queue.some((item) => item.executionId === executionId);
+	}
+
 	private resolveNext() {
 		const item = this.queue.shift();
 
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 8839d180ff..d11fa795db 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -133,3 +133,5 @@ setGlobalState({
 
 // eslint-disable-next-line import/no-default-export
 export default config;
+
+export type Config = typeof config;
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index e5bda7d81b..6041549ec5 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -35,6 +35,12 @@ export const schema = {
 				default: -1,
 				env: 'N8N_CONCURRENCY_PRODUCTION_LIMIT',
 			},
+			evaluationLimit: {
+				doc: 'Max evaluation executions allowed to run concurrently.',
+				format: Number,
+				default: -1,
+				env: 'N8N_CONCURRENCY_EVALUATION_LIMIT',
+			},
 		},
 
 		// A Workflow times out and gets canceled after this time (seconds).
@@ -139,13 +145,6 @@ export const schema = {
 		doc: 'Public URL where the editor is accessible. Also used for emails sent from n8n.',
 	},
 
-	workflowTagsDisabled: {
-		format: Boolean,
-		default: false,
-		env: 'N8N_WORKFLOW_TAGS_DISABLED',
-		doc: 'Disable workflow tags.',
-	},
-
 	userManagement: {
 		jwtSecret: {
 			doc: 'Set a specific JWT secret (optional - n8n can generate one)', // Generated @ start.ts
@@ -190,13 +189,6 @@ export const schema = {
 		env: 'EXTERNAL_FRONTEND_HOOKS_URLS',
 	},
 
-	externalHookFiles: {
-		doc: 'Files containing external hooks. Multiple files can be separated by colon (":")',
-		format: String,
-		default: '',
-		env: 'EXTERNAL_HOOK_FILES',
-	},
-
 	push: {
 		backend: {
 			format: ['sse', 'websocket'] as const,
@@ -356,15 +348,6 @@ export const schema = {
 		},
 	},
 
-	sourceControl: {
-		defaultKeyPairType: {
-			doc: 'Default SSH key type to use when generating SSH keys',
-			format: ['rsa', 'ed25519'] as const,
-			default: 'ed25519',
-			env: 'N8N_SOURCECONTROL_DEFAULT_SSH_KEY_TYPE',
-		},
-	},
-
 	workflowHistory: {
 		enabled: {
 			doc: 'Whether to save workflow history versions',
@@ -387,13 +370,4 @@ export const schema = {
 		env: 'N8N_PROXY_HOPS',
 		doc: 'Number of reverse-proxies n8n is running behind',
 	},
-
-	featureFlags: {
-		partialExecutionVersionDefault: {
-			format: String,
-			default: '0',
-			env: 'PARTIAL_EXECUTION_VERSION_DEFAULT',
-			doc: 'Set this to 1 to enable the new partial execution logic by default.',
-		},
-	},
 };
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index abcf298d3d..6411c91bac 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -104,6 +104,7 @@ export const LICENSE_QUOTAS = {
 	WORKFLOW_HISTORY_PRUNE_LIMIT: 'quota:workflowHistoryPrune',
 	TEAM_PROJECT_LIMIT: 'quota:maxTeamProjects',
 	AI_CREDITS: 'quota:aiCredits',
+	API_KEYS_PER_USER_LIMIT: 'quota:apiKeysPerUserLimit',
 } as const;
 export const UNLIMITED_LICENSE_QUOTA = -1;
 
diff --git a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
index dc40d3357d..eb13081b48 100644
--- a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
@@ -3,8 +3,10 @@ import { mock } from 'jest-mock-extended';
 
 import type { ApiKey } from '@/databases/entities/api-key';
 import type { User } from '@/databases/entities/user';
+import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
 import { EventService } from '@/events/event.service';
-import type { ApiKeysRequest, AuthenticatedRequest } from '@/requests';
+import { License } from '@/license';
+import type { AuthenticatedRequest } from '@/requests';
 import { PublicApiKeyService } from '@/services/public-api-key.service';
 import { mockInstance } from '@test/mocking';
 
@@ -13,6 +15,8 @@ import { ApiKeysController } from '../api-keys.controller';
 describe('ApiKeysController', () => {
 	const publicApiKeyService = mockInstance(PublicApiKeyService);
 	const eventService = mockInstance(EventService);
+	mockInstance(ApiKeyRepository);
+	mockInstance(License);
 	const controller = Container.get(ApiKeysController);
 
 	let req: AuthenticatedRequest;
@@ -28,7 +32,7 @@ describe('ApiKeysController', () => {
 				id: '123',
 				userId: '123',
 				label: 'My API Key',
-				apiKey: 'apiKey********',
+				apiKey: 'apiKey123',
 				createdAt: new Date(),
 			} as ApiKey;
 
@@ -36,14 +40,25 @@ describe('ApiKeysController', () => {
 
 			publicApiKeyService.createPublicApiKeyForUser.mockResolvedValue(apiKeyData);
 
+			publicApiKeyService.redactApiKey.mockImplementation(() => '***123');
+
 			// Act
 
-			const newApiKey = await controller.createAPIKey(req);
+			const newApiKey = await controller.createAPIKey(req, mock(), mock());
 
 			// Assert
 
 			expect(publicApiKeyService.createPublicApiKeyForUser).toHaveBeenCalled();
-			expect(apiKeyData).toEqual(newApiKey);
+			expect(newApiKey).toEqual(
+				expect.objectContaining({
+					id: '123',
+					userId: '123',
+					label: 'My API Key',
+					apiKey: '***123',
+					createdAt: expect.any(Date),
+					rawApiKey: 'apiKey123',
+				}),
+			);
 			expect(eventService.emit).toHaveBeenCalledWith(
 				'public-api-key-created',
 				expect.objectContaining({ user: req.user, publicApi: false }),
@@ -64,7 +79,9 @@ describe('ApiKeysController', () => {
 				updatedAt: new Date(),
 			} as ApiKey;
 
-			publicApiKeyService.getRedactedApiKeysForUser.mockResolvedValue([apiKeyData]);
+			publicApiKeyService.getRedactedApiKeysForUser.mockResolvedValue([
+				{ ...apiKeyData, expiresAt: null },
+			]);
 
 			// Act
 
@@ -72,7 +89,7 @@ describe('ApiKeysController', () => {
 
 			// Assert
 
-			expect(apiKeys).toEqual([apiKeyData]);
+			expect(apiKeys).toEqual([{ ...apiKeyData, expiresAt: null }]);
 			expect(publicApiKeyService.getRedactedApiKeysForUser).toHaveBeenCalledWith(
 				expect.objectContaining({ id: req.user.id }),
 			);
@@ -91,11 +108,11 @@ describe('ApiKeysController', () => {
 				mfaEnabled: false,
 			});
 
-			const req = mock<ApiKeysRequest.DeleteAPIKey>({ user, params: { id: user.id } });
+			const req = mock<AuthenticatedRequest>({ user, params: { id: user.id } });
 
 			// Act
 
-			await controller.deleteAPIKey(req);
+			await controller.deleteAPIKey(req, mock(), user.id);
 
 			publicApiKeyService.deleteApiKeyForUser.mockResolvedValue();
 
diff --git a/packages/cli/src/controllers/__tests__/curl.controller.test.ts b/packages/cli/src/controllers/__tests__/curl.controller.test.ts
deleted file mode 100644
index 0c23d925e4..0000000000
--- a/packages/cli/src/controllers/__tests__/curl.controller.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import type { Request } from 'express';
-import { mock } from 'jest-mock-extended';
-
-import { CurlController } from '@/controllers/curl.controller';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import type { CurlService } from '@/services/curl.service';
-
-describe('CurlController', () => {
-	const service = mock<CurlService>();
-	const controller = new CurlController(service);
-
-	beforeEach(() => jest.clearAllMocks());
-
-	describe('toJson', () => {
-		it('should throw BadRequestError when invalid cURL command is provided', () => {
-			const req = mock<Request>();
-			service.toHttpNodeParameters.mockImplementation(() => {
-				throw new Error();
-			});
-
-			expect(() => controller.toJson(req)).toThrow(BadRequestError);
-		});
-
-		it('should return flattened parameters when valid cURL command is provided', () => {
-			const curlCommand = 'curl -v -X GET https://test.n8n.berlin/users';
-			const req = mock<Request>();
-			req.body = { curlCommand };
-			service.toHttpNodeParameters.mockReturnValue({
-				url: 'https://test.n8n.berlin/users',
-				authentication: 'none',
-				method: 'GET',
-				sendHeaders: false,
-				sendQuery: false,
-				options: {
-					redirect: { redirect: {} },
-					response: { response: {} },
-				},
-				sendBody: false,
-			});
-
-			const result = controller.toJson(req);
-			expect(result).toEqual({
-				'parameters.method': 'GET',
-				'parameters.url': 'https://test.n8n.berlin/users',
-				'parameters.authentication': 'none',
-				'parameters.sendBody': false,
-				'parameters.sendHeaders': false,
-				'parameters.sendQuery': false,
-			});
-		});
-	});
-});
diff --git a/packages/cli/src/controllers/api-keys.controller.ts b/packages/cli/src/controllers/api-keys.controller.ts
index db53a00449..e2a824068a 100644
--- a/packages/cli/src/controllers/api-keys.controller.ts
+++ b/packages/cli/src/controllers/api-keys.controller.ts
@@ -1,9 +1,13 @@
-import { type RequestHandler } from 'express';
+import { CreateApiKeyRequestDto, UpdateApiKeyRequestDto } from '@n8n/api-types';
+import type { RequestHandler } from 'express';
 
-import { Delete, Get, Post, RestController } from '@/decorators';
+import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
+import { Body, Delete, Get, Param, Patch, Post, RestController } from '@/decorators';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
+import { License } from '@/license';
 import { isApiEnabled } from '@/public-api';
-import { ApiKeysRequest, AuthenticatedRequest } from '@/requests';
+import { AuthenticatedRequest } from '@/requests';
 import { PublicApiKeyService } from '@/services/public-api-key.service';
 
 export const isApiEnabledMiddleware: RequestHandler = (_, res, next) => {
@@ -19,18 +23,38 @@ export class ApiKeysController {
 	constructor(
 		private readonly eventService: EventService,
 		private readonly publicApiKeyService: PublicApiKeyService,
+		private readonly apiKeysRepository: ApiKeyRepository,
+		private readonly license: License,
 	) {}
 
 	/**
 	 * Create an API Key
 	 */
 	@Post('/', { middlewares: [isApiEnabledMiddleware] })
-	async createAPIKey(req: AuthenticatedRequest) {
-		const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user);
+	async createAPIKey(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body { label, expiresAt }: CreateApiKeyRequestDto,
+	) {
+		const currentNumberOfApiKeys = await this.apiKeysRepository.countBy({ userId: req.user.id });
+
+		if (currentNumberOfApiKeys >= this.license.getApiKeysPerUserLimit()) {
+			throw new BadRequestError('You have reached the maximum number of API keys allowed.');
+		}
+
+		const newApiKey = await this.publicApiKeyService.createPublicApiKeyForUser(req.user, {
+			label,
+			expiresAt,
+		});
 
 		this.eventService.emit('public-api-key-created', { user: req.user, publicApi: false });
 
-		return newApiKey;
+		return {
+			...newApiKey,
+			apiKey: this.publicApiKeyService.redactApiKey(newApiKey.apiKey),
+			rawApiKey: newApiKey.apiKey,
+			expiresAt,
+		};
 	}
 
 	/**
@@ -46,11 +70,28 @@ export class ApiKeysController {
 	 * Delete an API Key
 	 */
 	@Delete('/:id', { middlewares: [isApiEnabledMiddleware] })
-	async deleteAPIKey(req: ApiKeysRequest.DeleteAPIKey) {
-		await this.publicApiKeyService.deleteApiKeyForUser(req.user, req.params.id);
+	async deleteAPIKey(req: AuthenticatedRequest, _res: Response, @Param('id') apiKeyId: string) {
+		await this.publicApiKeyService.deleteApiKeyForUser(req.user, apiKeyId);
 
 		this.eventService.emit('public-api-key-deleted', { user: req.user, publicApi: false });
 
 		return { success: true };
 	}
+
+	/**
+	 * Patch an API Key
+	 */
+	@Patch('/:id', { middlewares: [isApiEnabledMiddleware] })
+	async updateAPIKey(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Param('id') apiKeyId: string,
+		@Body { label }: UpdateApiKeyRequestDto,
+	) {
+		await this.publicApiKeyService.updateApiKeyForUser(req.user, apiKeyId, {
+			label,
+		});
+
+		return { success: true };
+	}
 }
diff --git a/packages/cli/src/controllers/curl.controller.ts b/packages/cli/src/controllers/curl.controller.ts
deleted file mode 100644
index e7a12b831f..0000000000
--- a/packages/cli/src/controllers/curl.controller.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Request } from 'express';
-
-import { Post, RestController } from '@/decorators';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { CurlService, flattenObject } from '@/services/curl.service';
-
-@RestController('/curl')
-export class CurlController {
-	constructor(private readonly curlService: CurlService) {}
-
-	@Post('/to-json')
-	toJson(req: Request<{}, {}, { curlCommand: string }>) {
-		try {
-			const parameters = this.curlService.toHttpNodeParameters(req.body.curlCommand);
-			return flattenObject(parameters, 'parameters');
-		} catch (e) {
-			throw new BadRequestError('Invalid cURL command');
-		}
-	}
-}
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index c846553d30..90ba208ce1 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -103,13 +103,29 @@ export class E2EController {
 		[LICENSE_FEATURES.AI_CREDITS]: false,
 	};
 
-	private numericFeatures: Record<NumericLicenseFeature, number> = {
+	private static readonly numericFeaturesDefaults: Record<NumericLicenseFeature, number> = {
 		[LICENSE_QUOTAS.TRIGGER_LIMIT]: -1,
 		[LICENSE_QUOTAS.VARIABLES_LIMIT]: -1,
 		[LICENSE_QUOTAS.USERS_LIMIT]: -1,
 		[LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT]: -1,
 		[LICENSE_QUOTAS.TEAM_PROJECT_LIMIT]: 0,
 		[LICENSE_QUOTAS.AI_CREDITS]: 0,
+		[LICENSE_QUOTAS.API_KEYS_PER_USER_LIMIT]: 1,
+	};
+
+	private numericFeatures: Record<NumericLicenseFeature, number> = {
+		[LICENSE_QUOTAS.TRIGGER_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.TRIGGER_LIMIT],
+		[LICENSE_QUOTAS.VARIABLES_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.VARIABLES_LIMIT],
+		[LICENSE_QUOTAS.USERS_LIMIT]: E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.USERS_LIMIT],
+		[LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT],
+		[LICENSE_QUOTAS.TEAM_PROJECT_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.TEAM_PROJECT_LIMIT],
+		[LICENSE_QUOTAS.AI_CREDITS]: E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.AI_CREDITS],
+		[LICENSE_QUOTAS.API_KEYS_PER_USER_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.API_KEYS_PER_USER_LIMIT],
 	};
 
 	constructor(
@@ -181,6 +197,11 @@ export class E2EController {
 		for (const feature of Object.keys(this.enabledFeatures)) {
 			this.enabledFeatures[feature as BooleanLicenseFeature] = false;
 		}
+
+		for (const feature of Object.keys(this.numericFeatures)) {
+			this.numericFeatures[feature as NumericLicenseFeature] =
+				E2EController.numericFeaturesDefaults[feature as NumericLicenseFeature];
+		}
 	}
 
 	private async removeActiveWorkflows() {
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
index 570181aa78..488bcf61ff 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
@@ -4,6 +4,7 @@ import type { Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
 import { Logger } from 'n8n-core';
+import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import nock from 'nock';
 
 import { Time } from '@/constants';
@@ -19,8 +20,11 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
 import type { OAuthRequest } from '@/requests';
 import { SecretsHelper } from '@/secrets-helpers.ee';
+import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import { mockInstance } from '@test/mocking';
 
+jest.mock('@/workflow-execute-additional-data');
+
 describe('OAuth1CredentialController', () => {
 	mockInstance(Logger);
 	mockInstance(ExternalHooks);
@@ -28,6 +32,9 @@ describe('OAuth1CredentialController', () => {
 	mockInstance(VariablesService, {
 		getAllCached: async () => [],
 	});
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
+	(WorkflowExecuteAdditionalData.getBase as jest.Mock).mockReturnValue(additionalData);
+
 	const cipher = mockInstance(Cipher);
 	const credentialsHelper = mockInstance(CredentialsHelper);
 	const credentialsRepository = mockInstance(CredentialsRepository);
@@ -106,6 +113,14 @@ describe('OAuth1CredentialController', () => {
 				}),
 			);
 			expect(cipher.encrypt).toHaveBeenCalledWith({ csrfSecret });
+			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
+				additionalData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				false,
+			);
 		});
 	});
 
@@ -235,6 +250,14 @@ describe('OAuth1CredentialController', () => {
 				}),
 			);
 			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
+				additionalData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				true,
+			);
 		});
 	});
 });
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
index 53bba08c58..d075dcd198 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
@@ -4,9 +4,10 @@ import { type Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
 import { Logger } from 'n8n-core';
+import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import nock from 'nock';
 
-import { Time } from '@/constants';
+import { CREDENTIAL_BLANKING_VALUE, Time } from '@/constants';
 import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller';
 import { CredentialsHelper } from '@/credentials-helper';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
@@ -19,14 +20,20 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
 import type { OAuthRequest } from '@/requests';
 import { SecretsHelper } from '@/secrets-helpers.ee';
+import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import { mockInstance } from '@test/mocking';
 
+jest.mock('@/workflow-execute-additional-data');
+
 describe('OAuth2CredentialController', () => {
 	mockInstance(Logger);
 	mockInstance(SecretsHelper);
 	mockInstance(VariablesService, {
 		getAllCached: async () => [],
 	});
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
+	(WorkflowExecuteAdditionalData.getBase as jest.Mock).mockReturnValue(additionalData);
+
 	const cipher = mockInstance(Cipher);
 	const externalHooks = mockInstance(ExternalHooks);
 	const credentialsHelper = mockInstance(CredentialsHelper);
@@ -108,6 +115,14 @@ describe('OAuth2CredentialController', () => {
 					type: 'oAuth2Api',
 				}),
 			);
+			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
+				additionalData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				false,
+			);
 		});
 	});
 
@@ -237,6 +252,94 @@ describe('OAuth2CredentialController', () => {
 
 			await controller.handleCallback(req, res);
 
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
+				expect.objectContaining({
+					clientId: 'test-client-id',
+					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
+				}),
+			]);
+			expect(cipher.encrypt).toHaveBeenCalledWith({
+				oauthTokenData: { access_token: 'access-token', refresh_token: 'refresh-token' },
+			});
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth2Api',
+				}),
+			);
+			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+			expect(credentialsHelper.getDecrypted).toHaveBeenCalledWith(
+				additionalData,
+				credential,
+				credential.type,
+				'internal',
+				undefined,
+				true,
+			);
+		});
+
+		it('merges oauthTokenData if it already exists', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({
+				csrfSecret,
+				oauthTokenData: { token: true },
+			});
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post(
+					'/token',
+					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
+				)
+				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			await controller.handleCallback(req, res);
+
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
+				expect.objectContaining({
+					clientId: 'test-client-id',
+					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
+				}),
+			]);
+			expect(cipher.encrypt).toHaveBeenCalledWith({
+				oauthTokenData: {
+					token: true,
+					access_token: 'access-token',
+					refresh_token: 'refresh-token',
+				},
+			});
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth2Api',
+				}),
+			);
+			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+		});
+
+		it('overwrites oauthTokenData if it is a string', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({
+				csrfSecret,
+				oauthTokenData: CREDENTIAL_BLANKING_VALUE,
+			});
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post(
+					'/token',
+					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
+				)
+				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			await controller.handleCallback(req, res);
+
 			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
 				expect.objectContaining({
 					clientId: 'test-client-id',
diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
index bac924a023..5098cec28d 100644
--- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
@@ -86,9 +86,30 @@ export abstract class AbstractOAuthController {
 		return await WorkflowExecuteAdditionalData.getBase();
 	}
 
-	protected async getDecryptedData(
+	/**
+	 * Allow decrypted data to evaluate expressions that include $secrets and apply overwrites
+	 */
+	protected async getDecryptedDataForAuthUri(
 		credential: ICredentialsDb,
 		additionalData: IWorkflowExecuteAdditionalData,
+	) {
+		return await this.getDecryptedData(credential, additionalData, false);
+	}
+
+	/**
+	 * Do not apply overwrites here because that removes the CSRF state, and breaks the oauth flow
+	 */
+	protected async getDecryptedDataForCallback(
+		credential: ICredentialsDb,
+		additionalData: IWorkflowExecuteAdditionalData,
+	) {
+		return await this.getDecryptedData(credential, additionalData, true);
+	}
+
+	private async getDecryptedData(
+		credential: ICredentialsDb,
+		additionalData: IWorkflowExecuteAdditionalData,
+		raw: boolean,
 	) {
 		return await this.credentialsHelper.getDecrypted(
 			additionalData,
@@ -96,7 +117,7 @@ export abstract class AbstractOAuthController {
 			credential.type,
 			'internal',
 			undefined,
-			true,
+			raw,
 		);
 	}
 
@@ -183,7 +204,10 @@ export abstract class AbstractOAuthController {
 		}
 
 		const additionalData = await this.getAdditionalData();
-		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+		const decryptedDataOriginal = await this.getDecryptedDataForCallback(
+			credential,
+			additionalData,
+		);
 		const oauthCredentials = this.applyDefaultsAndOverwrites<T>(
 			credential,
 			decryptedDataOriginal,
diff --git a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
index 0211c463a9..fe9d22edd8 100644
--- a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
@@ -35,7 +35,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 	async getAuthUri(req: OAuthRequest.OAuth1Credential.Auth): Promise<string> {
 		const credential = await this.getCredential(req);
 		const additionalData = await this.getAdditionalData();
-		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+		const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
 		const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
 			credential,
 			decryptedDataOriginal,
diff --git a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
index 0f563993ff..b9ed0d1126 100644
--- a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
@@ -23,7 +23,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 	async getAuthUri(req: OAuthRequest.OAuth2Credential.Auth): Promise<string> {
 		const credential = await this.getCredential(req);
 		const additionalData = await this.getAdditionalData();
-		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+		const decryptedDataOriginal = await this.getDecryptedDataForAuthUri(credential, additionalData);
 
 		// At some point in the past we saved hidden scopes to credentials (but shouldn't)
 		// Delete scope before applying defaults to make sure new scopes are present on reconnect
@@ -133,7 +133,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 				set(oauthToken.data, 'callbackQueryString', omit(req.query, 'state', 'code'));
 			}
 
-			if (decryptedDataOriginal.oauthTokenData) {
+			if (typeof decryptedDataOriginal.oauthTokenData === 'object') {
 				// Only overwrite supplied data as some providers do for example just return the
 				// refresh_token on the very first request and not on subsequent ones.
 				Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
diff --git a/packages/cli/src/controllers/project.controller.ts b/packages/cli/src/controllers/project.controller.ts
index ab48f38c5b..665eba9636 100644
--- a/packages/cli/src/controllers/project.controller.ts
+++ b/packages/cli/src/controllers/project.controller.ts
@@ -1,7 +1,9 @@
+import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
 import { combineScopes } from '@n8n/permissions';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Not } from '@n8n/typeorm';
+import { Response } from 'express';
 
 import type { Project } from '@/databases/entities/project';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -14,11 +16,15 @@ import {
 	Patch,
 	ProjectScope,
 	Delete,
+	Body,
+	Param,
+	Query,
 } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
-import { ProjectRequest } from '@/requests';
+import type { ProjectRequest } from '@/requests';
+import { AuthenticatedRequest } from '@/requests';
 import {
 	ProjectService,
 	TeamProjectOverQuotaError,
@@ -36,7 +42,7 @@ export class ProjectController {
 	) {}
 
 	@Get('/')
-	async getAllProjects(req: ProjectRequest.GetAll): Promise<Project[]> {
+	async getAllProjects(req: AuthenticatedRequest): Promise<Project[]> {
 		return await this.projectsService.getAccessibleProjects(req.user);
 	}
 
@@ -49,14 +55,9 @@ export class ProjectController {
 	@GlobalScope('project:create')
 	// Using admin as all plans that contain projects should allow admins at the very least
 	@Licensed('feat:projectRole:admin')
-	async createProject(req: ProjectRequest.Create) {
+	async createProject(req: AuthenticatedRequest, _res: Response, @Body payload: CreateProjectDto) {
 		try {
-			const project = await this.projectsService.createTeamProject(
-				req.body.name,
-				req.user,
-				undefined,
-				req.body.icon,
-			);
+			const project = await this.projectsService.createTeamProject(req.user, payload);
 
 			this.eventService.emit('team-project-created', {
 				userId: req.user.id,
@@ -83,7 +84,8 @@ export class ProjectController {
 
 	@Get('/my-projects')
 	async getMyProjects(
-		req: ProjectRequest.GetMyProjects,
+		req: AuthenticatedRequest,
+		_res: Response,
 	): Promise<ProjectRequest.GetMyProjectsResponse> {
 		const relations = await this.projectsService.getProjectRelationsForUser(req.user);
 		const otherTeamProject = req.user.hasGlobalScope('project:read')
@@ -98,10 +100,7 @@ export class ProjectController {
 		for (const pr of relations) {
 			const result: ProjectRequest.GetMyProjectsResponse[number] = Object.assign(
 				this.projectRepository.create(pr.project),
-				{
-					role: pr.role,
-					scopes: req.query.includeScopes ? ([] as Scope[]) : undefined,
-				},
+				{ role: pr.role, scopes: [] },
 			);
 
 			if (result.scopes) {
@@ -124,7 +123,7 @@ export class ProjectController {
 					// own this relationship in that case we use the global user role
 					// instead of the relation role, which is for another user.
 					role: req.user.role,
-					scopes: req.query.includeScopes ? [] : undefined,
+					scopes: [],
 				},
 			);
 
@@ -148,7 +147,7 @@ export class ProjectController {
 	}
 
 	@Get('/personal')
-	async getPersonalProject(req: ProjectRequest.GetPersonalProject) {
+	async getPersonalProject(req: AuthenticatedRequest) {
 		const project = await this.projectsService.getPersonalProject(req.user);
 		if (!project) {
 			throw new NotFoundError('Could not find a personal project for this user');
@@ -167,10 +166,14 @@ export class ProjectController {
 
 	@Get('/:projectId')
 	@ProjectScope('project:read')
-	async getProject(req: ProjectRequest.Get): Promise<ProjectRequest.ProjectWithRelations> {
+	async getProject(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Param('projectId') projectId: string,
+	): Promise<ProjectRequest.ProjectWithRelations> {
 		const [{ id, name, icon, type }, relations] = await Promise.all([
-			this.projectsService.getProject(req.params.projectId),
-			this.projectsService.getProjectRelations(req.params.projectId),
+			this.projectsService.getProject(projectId),
+			this.projectsService.getProjectRelations(projectId),
 		]);
 		const myRelation = relations.find((r) => r.userId === req.user.id);
 
@@ -197,13 +200,19 @@ export class ProjectController {
 
 	@Patch('/:projectId')
 	@ProjectScope('project:update')
-	async updateProject(req: ProjectRequest.Update) {
-		if (req.body.name) {
-			await this.projectsService.updateProject(req.body.name, req.params.projectId, req.body.icon);
+	async updateProject(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: UpdateProjectDto,
+		@Param('projectId') projectId: string,
+	) {
+		const { name, icon, relations } = payload;
+		if (name || icon) {
+			await this.projectsService.updateProject(projectId, { name, icon });
 		}
-		if (req.body.relations) {
+		if (relations) {
 			try {
-				await this.projectsService.syncProjectRelations(req.params.projectId, req.body.relations);
+				await this.projectsService.syncProjectRelations(projectId, relations);
 			} catch (e) {
 				if (e instanceof UnlicensedProjectRoleError) {
 					throw new BadRequestError(e.message);
@@ -214,25 +223,30 @@ export class ProjectController {
 			this.eventService.emit('team-project-updated', {
 				userId: req.user.id,
 				role: req.user.role,
-				members: req.body.relations,
-				projectId: req.params.projectId,
+				members: relations,
+				projectId,
 			});
 		}
 	}
 
 	@Delete('/:projectId')
 	@ProjectScope('project:delete')
-	async deleteProject(req: ProjectRequest.Delete) {
-		await this.projectsService.deleteProject(req.user, req.params.projectId, {
-			migrateToProject: req.query.transferId,
+	async deleteProject(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Query query: DeleteProjectDto,
+		@Param('projectId') projectId: string,
+	) {
+		await this.projectsService.deleteProject(req.user, projectId, {
+			migrateToProject: query.transferId,
 		});
 
 		this.eventService.emit('team-project-deleted', {
 			userId: req.user.id,
 			role: req.user.role,
-			projectId: req.params.projectId,
-			removalType: req.query.transferId !== undefined ? 'transfer' : 'delete',
-			targetProjectId: req.query.transferId,
+			projectId,
+			removalType: query.transferId !== undefined ? 'transfer' : 'delete',
+			targetProjectId: query.transferId,
 		});
 	}
 }
diff --git a/packages/cli/src/controllers/tags.controller.ts b/packages/cli/src/controllers/tags.controller.ts
index a6551a021d..52432d2d4b 100644
--- a/packages/cli/src/controllers/tags.controller.ts
+++ b/packages/cli/src/controllers/tags.controller.ts
@@ -1,54 +1,60 @@
-import { Request, Response, NextFunction } from 'express';
+import { CreateOrUpdateTagRequestDto, RetrieveTagQueryDto } from '@n8n/api-types';
+import { Response } from 'express';
 
-import config from '@/config';
-import { Delete, Get, Middleware, Patch, Post, RestController, GlobalScope } from '@/decorators';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { TagsRequest } from '@/requests';
+import {
+	Delete,
+	Get,
+	Patch,
+	Post,
+	RestController,
+	GlobalScope,
+	Body,
+	Param,
+	Query,
+} from '@/decorators';
+import { AuthenticatedRequest } from '@/requests';
 import { TagService } from '@/services/tag.service';
 
 @RestController('/tags')
 export class TagsController {
-	private config = config;
-
 	constructor(private readonly tagService: TagService) {}
 
-	// TODO: move this into a new decorator `@IfEnabled('workflowTagsDisabled')`
-	@Middleware()
-	workflowsEnabledMiddleware(_req: Request, _res: Response, next: NextFunction) {
-		if (this.config.getEnv('workflowTagsDisabled'))
-			throw new BadRequestError('Workflow tags are disabled');
-		next();
-	}
-
 	@Get('/')
 	@GlobalScope('tag:list')
-	async getAll(req: TagsRequest.GetAll) {
-		return await this.tagService.getAll({ withUsageCount: req.query.withUsageCount === 'true' });
+	async getAll(_req: AuthenticatedRequest, _res: Response, @Query query: RetrieveTagQueryDto) {
+		return await this.tagService.getAll({ withUsageCount: query.withUsageCount });
 	}
 
 	@Post('/')
 	@GlobalScope('tag:create')
-	async createTag(req: TagsRequest.Create) {
-		const tag = this.tagService.toEntity({ name: req.body.name });
+	async createTag(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: CreateOrUpdateTagRequestDto,
+	) {
+		const { name } = payload;
+		const tag = this.tagService.toEntity({ name });
 
 		return await this.tagService.save(tag, 'create');
 	}
 
 	@Patch('/:id(\\w+)')
 	@GlobalScope('tag:update')
-	async updateTag(req: TagsRequest.Update) {
-		const newTag = this.tagService.toEntity({ id: req.params.id, name: req.body.name.trim() });
+	async updateTag(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Param('id') tagId: string,
+		@Body payload: CreateOrUpdateTagRequestDto,
+	) {
+		const newTag = this.tagService.toEntity({ id: tagId, name: payload.name });
 
 		return await this.tagService.save(newTag, 'update');
 	}
 
 	@Delete('/:id(\\w+)')
 	@GlobalScope('tag:delete')
-	async deleteTag(req: TagsRequest.Delete) {
-		const { id } = req.params;
-
-		await this.tagService.delete(id);
-
+	async deleteTag(_req: AuthenticatedRequest, _res: Response, @Param('id') tagId: string) {
+		await this.tagService.delete(tagId);
 		return true;
 	}
 }
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index 3177c2c23b..80d38fcfcd 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -240,7 +240,7 @@ export class UsersController {
 		}
 
 		for (const credential of ownedCredentials) {
-			await this.credentialsService.delete(credential);
+			await this.credentialsService.delete(userToDelete, credential.id);
 		}
 
 		await this.userService.getManager().transaction(async (trx) => {
diff --git a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
index 13e72e8003..68d2f26750 100644
--- a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
+++ b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
@@ -33,7 +33,7 @@ describe('CredentialsController', () => {
 	});
 
 	describe('createCredentials', () => {
-		it('it should create new credentials and emit "credentials-created"', async () => {
+		it('should create new credentials and emit "credentials-created"', async () => {
 			// Arrange
 
 			const newCredentialsPayload = createNewCredentialsPayload();
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 4cc0b500f2..6b4fd8472a 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -198,7 +198,7 @@ export class CredentialsController {
 			throw new BadRequestError('Managed credentials cannot be updated');
 		}
 
-		const decryptedData = this.credentialsService.decrypt(credential);
+		const decryptedData = this.credentialsService.decrypt(credential, true);
 		const preparedCredentialData = await this.credentialsService.prepareUpdateData(
 			req.body,
 			decryptedData,
@@ -251,7 +251,7 @@ export class CredentialsController {
 			);
 		}
 
-		await this.credentialsService.delete(credential);
+		await this.credentialsService.delete(req.user, credential.id);
 
 		this.eventService.emit('credentials-deleted', {
 			user: req.user,
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index e0939beccb..18d01a198a 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -20,7 +20,6 @@ import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialTypes } from '@/credential-types';
 import { createCredentialsFromCredentialsEntity } from '@/credentials-helper';
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { ProjectRelation } from '@/databases/entities/project-relation';
 import { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
@@ -85,23 +84,6 @@ export class CredentialsService {
 			listQueryOptions.includeData = true;
 		}
 
-		let projectRelations: ProjectRelation[] | undefined = undefined;
-		if (includeScopes) {
-			projectRelations = await this.projectService.getProjectRelationsForUser(user);
-			if (listQueryOptions.filter?.projectId && user.hasGlobalScope('credential:list')) {
-				// Only instance owners and admins have the credential:list scope
-				// Those users should be able to use _all_ credentials within their workflows.
-				// TODO: Change this so we filter by `workflowId` in this case. Require a slight FE change
-				const projectRelation = projectRelations.find(
-					(relation) => relation.projectId === listQueryOptions.filter?.projectId,
-				);
-				if (projectRelation?.role === 'project:personalOwner') {
-					// Will not affect team projects as these have admins, not owners.
-					delete listQueryOptions.filter?.projectId;
-				}
-			}
-		}
-
 		if (returnAll) {
 			let credentials = await this.credentialsRepository.findMany(listQueryOptions);
 
@@ -123,9 +105,8 @@ export class CredentialsService {
 			}
 
 			if (includeScopes) {
-				credentials = credentials.map((c) =>
-					this.roleService.addScopes(c, user, projectRelations!),
-				);
+				const projectRelations = await this.projectService.getProjectRelationsForUser(user);
+				credentials = credentials.map((c) => this.roleService.addScopes(c, user, projectRelations));
 			}
 
 			if (includeData) {
@@ -179,7 +160,8 @@ export class CredentialsService {
 		}
 
 		if (includeScopes) {
-			credentials = credentials.map((c) => this.roleService.addScopes(c, user, projectRelations!));
+			const projectRelations = await this.projectService.getProjectRelationsForUser(user);
+			credentials = credentials.map((c) => this.roleService.addScopes(c, user, projectRelations));
 		}
 
 		if (includeData) {
@@ -424,10 +406,26 @@ export class CredentialsService {
 		return result;
 	}
 
-	async delete(credentials: CredentialsEntity) {
-		await this.externalHooks.run('credentials.delete', [credentials.id]);
+	/**
+	 * Deletes a credential.
+	 *
+	 * If the user does not have permission to delete the credential this does
+	 * nothing and returns void.
+	 */
+	async delete(user: User, credentialId: string) {
+		await this.externalHooks.run('credentials.delete', [credentialId]);
 
-		await this.credentialsRepository.remove(credentials);
+		const credential = await this.sharedCredentialsRepository.findCredentialForUser(
+			credentialId,
+			user,
+			['credential:delete'],
+		);
+
+		if (!credential) {
+			return;
+		}
+
+		await this.credentialsRepository.remove(credential);
 	}
 
 	async test(user: User, credentials: ICredentialsDecrypted) {
diff --git a/packages/cli/src/curlconverter.d.ts b/packages/cli/src/curlconverter.d.ts
deleted file mode 100644
index 8808f9b5c7..0000000000
--- a/packages/cli/src/curlconverter.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module 'curlconverter' {
-	export function toJsonString(data: string): string;
-}
diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts
index e6a1dedb3f..1393b6a305 100644
--- a/packages/cli/src/databases/entities/index.ts
+++ b/packages/cli/src/databases/entities/index.ts
@@ -20,6 +20,7 @@ import { Settings } from './settings';
 import { SharedCredentials } from './shared-credentials';
 import { SharedWorkflow } from './shared-workflow';
 import { TagEntity } from './tag-entity';
+import { TestCaseExecution } from './test-case-execution.ee';
 import { TestDefinition } from './test-definition.ee';
 import { TestMetric } from './test-metric.ee';
 import { TestRun } from './test-run.ee';
@@ -64,4 +65,5 @@ export const entities = {
 	TestDefinition,
 	TestMetric,
 	TestRun,
+	TestCaseExecution,
 };
diff --git a/packages/cli/src/databases/entities/project-relation.ts b/packages/cli/src/databases/entities/project-relation.ts
index 736ef2b223..eb73b62502 100644
--- a/packages/cli/src/databases/entities/project-relation.ts
+++ b/packages/cli/src/databases/entities/project-relation.ts
@@ -1,19 +1,13 @@
+import { ProjectRole } from '@n8n/api-types';
 import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 
 import { WithTimestamps } from './abstract-entity';
 import { Project } from './project';
 import { User } from './user';
 
-// personalOwner is only used for personal projects
-export type ProjectRole =
-	| 'project:personalOwner'
-	| 'project:admin'
-	| 'project:editor'
-	| 'project:viewer';
-
 @Entity()
 export class ProjectRelation extends WithTimestamps {
-	@Column()
+	@Column({ type: 'varchar' })
 	role: ProjectRole;
 
 	@ManyToOne('User', 'projectRelations')
diff --git a/packages/cli/src/databases/entities/project.ts b/packages/cli/src/databases/entities/project.ts
index aa867807fd..48f86fe0e9 100644
--- a/packages/cli/src/databases/entities/project.ts
+++ b/packages/cli/src/databases/entities/project.ts
@@ -1,3 +1,4 @@
+import { ProjectIcon, ProjectType } from '@n8n/api-types';
 import { Column, Entity, OneToMany } from '@n8n/typeorm';
 
 import { WithTimestampsAndStringId } from './abstract-entity';
@@ -5,15 +6,12 @@ import type { ProjectRelation } from './project-relation';
 import type { SharedCredentials } from './shared-credentials';
 import type { SharedWorkflow } from './shared-workflow';
 
-export type ProjectType = 'personal' | 'team';
-export type ProjectIcon = { type: 'emoji' | 'icon'; value: string } | null;
-
 @Entity()
 export class Project extends WithTimestampsAndStringId {
 	@Column({ length: 255 })
 	name: string;
 
-	@Column({ length: 36 })
+	@Column({ type: 'varchar', length: 36 })
 	type: ProjectType;
 
 	@Column({ type: 'json', nullable: true })
diff --git a/packages/cli/src/databases/entities/test-case-execution.ee.ts b/packages/cli/src/databases/entities/test-case-execution.ee.ts
new file mode 100644
index 0000000000..dc15ae63b5
--- /dev/null
+++ b/packages/cli/src/databases/entities/test-case-execution.ee.ts
@@ -0,0 +1,68 @@
+import { Column, Entity, ManyToOne, OneToOne } from '@n8n/typeorm';
+
+import {
+	datetimeColumnType,
+	jsonColumnType,
+	WithStringId,
+} from '@/databases/entities/abstract-entity';
+import type { ExecutionEntity } from '@/databases/entities/execution-entity';
+import { TestRun } from '@/databases/entities/test-run.ee';
+
+export type TestCaseRunMetrics = Record<string, number | boolean>;
+
+/**
+ * This entity represents the linking between the test runs and individual executions.
+ * It stores status, links to past, new and evaluation executions, and metrics produced by individual evaluation wf executions
+ * Entries in this table are meant to outlive the execution entities, which might be pruned over time.
+ * This allows us to keep track of the details of test runs' status and metrics even after the executions are deleted.
+ */
+@Entity({ name: 'test_case_execution' })
+export class TestCaseExecution extends WithStringId {
+	@ManyToOne('TestRun')
+	testRun: TestRun;
+
+	@ManyToOne('ExecutionEntity', {
+		onDelete: 'SET NULL',
+		nullable: true,
+	})
+	pastExecution: ExecutionEntity | null;
+
+	@Column({ type: 'varchar', nullable: true })
+	pastExecutionId: string | null;
+
+	@OneToOne('ExecutionEntity', {
+		onDelete: 'SET NULL',
+		nullable: true,
+	})
+	execution: ExecutionEntity | null;
+
+	@Column({ type: 'varchar', nullable: true })
+	executionId: string | null;
+
+	@OneToOne('ExecutionEntity', {
+		onDelete: 'SET NULL',
+		nullable: true,
+	})
+	evaluationExecution: ExecutionEntity | null;
+
+	@Column({ type: 'varchar', nullable: true })
+	evaluationExecutionId: string | null;
+
+	@Column()
+	status: 'new' | 'running' | 'evaluation_running' | 'success' | 'error' | 'cancelled';
+
+	@Column({ type: datetimeColumnType, nullable: true })
+	runAt: Date | null;
+
+	@Column({ type: datetimeColumnType, nullable: true })
+	completedAt: Date | null;
+
+	@Column('varchar', { nullable: true })
+	errorCode: string | null;
+
+	@Column(jsonColumnType, { nullable: true })
+	errorDetails: Record<string, unknown>;
+
+	@Column(jsonColumnType, { nullable: true })
+	metrics: TestCaseRunMetrics;
+}
diff --git a/packages/cli/src/databases/entities/test-run.ee.ts b/packages/cli/src/databases/entities/test-run.ee.ts
index 39d8e16ddd..79c7bc9f07 100644
--- a/packages/cli/src/databases/entities/test-run.ee.ts
+++ b/packages/cli/src/databases/entities/test-run.ee.ts
@@ -7,7 +7,7 @@ import {
 } from '@/databases/entities/abstract-entity';
 import { TestDefinition } from '@/databases/entities/test-definition.ee';
 
-type TestRunStatus = 'new' | 'running' | 'completed' | 'error';
+type TestRunStatus = 'new' | 'running' | 'completed' | 'error' | 'cancelled';
 
 export type AggregatedTestRunMetrics = Record<string, number | boolean>;
 
diff --git a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
index fe101fac7a..d7b8a2d47c 100644
--- a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
+++ b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
@@ -1,7 +1,7 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { ApplicationError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import type { MigrationContext, ReversibleMigration } from '@/databases/types';
 import { generateNanoId } from '@/databases/utils/generators';
diff --git a/packages/cli/src/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts b/packages/cli/src/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts
new file mode 100644
index 0000000000..f7e840cb49
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1736947513045-CreateTestCaseExecutionTable.ts
@@ -0,0 +1,47 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const testCaseExecutionTableName = 'test_case_execution';
+
+export class CreateTestCaseExecutionTable1736947513045 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(testCaseExecutionTableName)
+			.withColumns(
+				column('id').varchar(36).primary.notNull,
+				column('testRunId').varchar(36).notNull,
+				column('pastExecutionId').int, // Might be null if execution was deleted after the test run
+				column('executionId').int, // Execution of the workflow under test. Might be null if execution was deleted after the test run
+				column('evaluationExecutionId').int, // Execution of the evaluation workflow. Might be null if execution was deleted after the test run, or if the test run was cancelled
+				column('status').varchar().notNull,
+				column('runAt').timestamp(),
+				column('completedAt').timestamp(),
+				column('errorCode').varchar(),
+				column('errorDetails').json,
+				column('metrics').json,
+			)
+			.withIndexOn('testRunId')
+			.withForeignKey('testRunId', {
+				tableName: 'test_run',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			})
+			.withForeignKey('pastExecutionId', {
+				tableName: 'execution_entity',
+				columnName: 'id',
+				onDelete: 'SET NULL',
+			})
+			.withForeignKey('executionId', {
+				tableName: 'execution_entity',
+				columnName: 'id',
+				onDelete: 'SET NULL',
+			})
+			.withForeignKey('evaluationExecutionId', {
+				tableName: 'execution_entity',
+				columnName: 'id',
+				onDelete: 'SET NULL',
+			}).withTimestamps;
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(testCaseExecutionTableName);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index b76409c0c1..32b1dd9751 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -77,6 +77,7 @@ import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRu
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
 import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
 import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
+import { CreateTestCaseExecutionTable1736947513045 } from '../common/1736947513045-CreateTestCaseExecutionTable';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -156,4 +157,5 @@ export const mysqlMigrations: Migration[] = [
 	AddManagedColumnToCredentialsTable1734479635324,
 	AddProjectIcons1729607673469,
 	AddStatsColumnsToTestRun1736172058779,
+	CreateTestCaseExecutionTable1736947513045,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 7cf90bde5b..c5547271b7 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -77,6 +77,7 @@ import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRu
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
 import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
 import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
+import { CreateTestCaseExecutionTable1736947513045 } from '../common/1736947513045-CreateTestCaseExecutionTable';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -156,4 +157,5 @@ export const postgresMigrations: Migration[] = [
 	AddManagedColumnToCredentialsTable1734479635324,
 	AddProjectIcons1729607673469,
 	AddStatsColumnsToTestRun1736172058779,
+	CreateTestCaseExecutionTable1736947513045,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 363a6e47c3..b8b8e26d3d 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -74,6 +74,7 @@ import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRu
 import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
 import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
 import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
+import { CreateTestCaseExecutionTable1736947513045 } from '../common/1736947513045-CreateTestCaseExecutionTable';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -150,6 +151,7 @@ const sqliteMigrations: Migration[] = [
 	AddManagedColumnToCredentialsTable1734479635324,
 	AddProjectIcons1729607673469,
 	AddStatsColumnsToTestRun1736172058779,
+	CreateTestCaseExecutionTable1736947513045,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
index 8e36f0189b..a6195b4f67 100644
--- a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
@@ -1,13 +1,16 @@
 import { GlobalConfig } from '@n8n/config';
+import type { SqliteConfig } from '@n8n/config/src/configs/database.config';
 import { Container } from '@n8n/di';
 import type { SelectQueryBuilder } from '@n8n/typeorm';
 import { Not, LessThanOrEqual } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
 import { BinaryDataService } from 'n8n-core';
+import type { IRunExecutionData, IWorkflowBase } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
 import { ExecutionEntity } from '@/databases/entities/execution-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { IExecutionResponse } from '@/interfaces';
 import { mockInstance, mockEntityManager } from '@test/mocking';
 
 describe('ExecutionRepository', () => {
@@ -68,4 +71,39 @@ describe('ExecutionRepository', () => {
 			expect(binaryDataService.deleteMany).toHaveBeenCalledWith([{ executionId: '1', workflowId }]);
 		});
 	});
+
+	describe('updateExistingExecution', () => {
+		test.each(['sqlite', 'postgresdb', 'mysqldb'] as const)(
+			'should update execution and data in transaction on %s',
+			async (dbType) => {
+				globalConfig.database.type = dbType;
+				globalConfig.database.sqlite = mock<SqliteConfig>({ poolSize: 1 });
+
+				const executionId = '1';
+				const execution = mock<IExecutionResponse>({
+					id: executionId,
+					data: mock<IRunExecutionData>(),
+					workflowData: mock<IWorkflowBase>(),
+					status: 'success',
+				});
+
+				const txCallback = jest.fn();
+				entityManager.transaction.mockImplementation(async (cb) => {
+					// @ts-expect-error Mock
+					await cb(entityManager);
+					txCallback();
+				});
+
+				await executionRepository.updateExistingExecution(executionId, execution);
+
+				expect(entityManager.transaction).toHaveBeenCalled();
+				expect(entityManager.update).toHaveBeenCalledWith(
+					ExecutionEntity,
+					{ id: executionId },
+					expect.objectContaining({ status: 'success' }),
+				);
+				expect(txCallback).toHaveBeenCalledTimes(1);
+			},
+		);
+	});
 });
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index 160b7ace87..9c24cea5c2 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -45,7 +45,7 @@ import type {
 import { separate } from '@/utils';
 
 import { ExecutionDataRepository } from './execution-data.repository';
-import type { ExecutionData } from '../entities/execution-data';
+import { ExecutionData } from '../entities/execution-data';
 import { ExecutionEntity } from '../entities/execution-entity';
 import { ExecutionMetadata } from '../entities/execution-metadata';
 import { SharedWorkflow } from '../entities/shared-workflow';
@@ -287,6 +287,15 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		const { executionData, metadata, annotation, ...rest } = execution;
 		const serializedAnnotation = this.serializeAnnotation(annotation);
 
+		if (execution.status === 'success' && executionData?.data === '[]') {
+			this.errorReporter.error('Found successful execution where data is empty stringified array', {
+				extra: {
+					executionId: execution.id,
+					workflowId: executionData?.workflowData.id,
+				},
+			});
+		}
+
 		return {
 			...rest,
 			...(options?.includeData && {
@@ -378,21 +387,42 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			customData,
 			...executionInformation
 		} = execution;
-		if (Object.keys(executionInformation).length > 0) {
-			await this.update({ id: executionId }, executionInformation);
+
+		const executionData: Partial<ExecutionData> = {};
+
+		if (workflowData) executionData.workflowData = workflowData;
+		if (data) executionData.data = stringify(data);
+
+		const { type: dbType, sqlite: sqliteConfig } = this.globalConfig.database;
+
+		if (dbType === 'sqlite' && sqliteConfig.poolSize === 0) {
+			// TODO: Delete this block of code once the sqlite legacy (non-pooling) driver is dropped.
+			// In the non-pooling sqlite driver we can't use transactions, because that creates nested transactions under highly concurrent loads, leading to errors in the database
+
+			if (Object.keys(executionInformation).length > 0) {
+				await this.update({ id: executionId }, executionInformation);
+			}
+
+			if (Object.keys(executionData).length > 0) {
+				// @ts-expect-error Fix typing
+				await this.executionDataRepository.update({ executionId }, executionData);
+			}
+
+			return;
 		}
 
-		if (data || workflowData) {
-			const executionData: Partial<ExecutionData> = {};
-			if (workflowData) {
-				executionData.workflowData = workflowData;
+		// All other database drivers should update executions and execution-data atomically
+
+		await this.manager.transaction(async (tx) => {
+			if (Object.keys(executionInformation).length > 0) {
+				await tx.update(ExecutionEntity, { id: executionId }, executionInformation);
 			}
-			if (data) {
-				executionData.data = stringify(data);
+
+			if (Object.keys(executionData).length > 0) {
+				// @ts-expect-error Fix typing
+				await tx.update(ExecutionData, { executionId }, executionData);
 			}
-			// @ts-ignore
-			await this.executionDataRepository.update({ executionId }, executionData);
-		}
+		});
 	}
 
 	async deleteExecutionsByFilter(
diff --git a/packages/cli/src/databases/repositories/project-relation.repository.ts b/packages/cli/src/databases/repositories/project-relation.repository.ts
index 75aaed76df..89e5028b19 100644
--- a/packages/cli/src/databases/repositories/project-relation.repository.ts
+++ b/packages/cli/src/databases/repositories/project-relation.repository.ts
@@ -1,7 +1,8 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 
-import { ProjectRelation, type ProjectRole } from '../entities/project-relation';
+import { ProjectRelation } from '../entities/project-relation';
 
 @Service()
 export class ProjectRelationRepository extends Repository<ProjectRelation> {
diff --git a/packages/cli/src/databases/repositories/shared-credentials.repository.ts b/packages/cli/src/databases/repositories/shared-credentials.repository.ts
index d7e074595c..f696a3bd59 100644
--- a/packages/cli/src/databases/repositories/shared-credentials.repository.ts
+++ b/packages/cli/src/databases/repositories/shared-credentials.repository.ts
@@ -1,3 +1,4 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import type { EntityManager, FindOptionsRelations, FindOptionsWhere } from '@n8n/typeorm';
@@ -6,7 +7,6 @@ import { DataSource, In, Not, Repository } from '@n8n/typeorm';
 import { RoleService } from '@/services/role.service';
 
 import type { Project } from '../entities/project';
-import type { ProjectRole } from '../entities/project-relation';
 import { type CredentialSharingRole, SharedCredentials } from '../entities/shared-credentials';
 import type { User } from '../entities/user';
 
diff --git a/packages/cli/src/databases/repositories/test-case-execution.repository.ee.ts b/packages/cli/src/databases/repositories/test-case-execution.repository.ee.ts
new file mode 100644
index 0000000000..c9798c8941
--- /dev/null
+++ b/packages/cli/src/databases/repositories/test-case-execution.repository.ee.ts
@@ -0,0 +1,99 @@
+import { Service } from '@n8n/di';
+import type { EntityManager } from '@n8n/typeorm';
+import { DataSource, In, Not, Repository } from '@n8n/typeorm';
+import type { DeepPartial } from '@n8n/typeorm/common/DeepPartial';
+
+import { TestCaseExecution } from '@/databases/entities/test-case-execution.ee';
+
+@Service()
+export class TestCaseExecutionRepository extends Repository<TestCaseExecution> {
+	constructor(dataSource: DataSource) {
+		super(TestCaseExecution, dataSource.manager);
+	}
+
+	async createBatch(testRunId: string, pastExecutionIds: string[]) {
+		const mappings = this.create(
+			pastExecutionIds.map<DeepPartial<TestCaseExecution>>((id) => ({
+				testRun: {
+					id: testRunId,
+				},
+				pastExecution: {
+					id,
+				},
+				status: 'new',
+			})),
+		);
+
+		return await this.save(mappings);
+	}
+
+	async markAsRunning(testRunId: string, pastExecutionId: string, executionId: string) {
+		return await this.update(
+			{ testRun: { id: testRunId }, pastExecutionId },
+			{
+				status: 'running',
+				executionId,
+				runAt: new Date(),
+			},
+		);
+	}
+
+	async markAsEvaluationRunning(
+		testRunId: string,
+		pastExecutionId: string,
+		evaluationExecutionId: string,
+	) {
+		return await this.update(
+			{ testRun: { id: testRunId }, pastExecutionId },
+			{
+				status: 'evaluation_running',
+				evaluationExecutionId,
+			},
+		);
+	}
+
+	async markAsCompleted(
+		testRunId: string,
+		pastExecutionId: string,
+		metrics: Record<string, number>,
+		trx?: EntityManager,
+	) {
+		trx = trx ?? this.manager;
+
+		return await trx.update(
+			TestCaseExecution,
+			{ testRun: { id: testRunId }, pastExecutionId },
+			{
+				status: 'success',
+				completedAt: new Date(),
+				metrics,
+			},
+		);
+	}
+
+	async markAllPendingAsCancelled(testRunId: string, trx?: EntityManager) {
+		trx = trx ?? this.manager;
+
+		return await trx.update(
+			TestCaseExecution,
+			{ testRun: { id: testRunId }, status: Not(In(['success', 'error', 'cancelled'])) },
+			{
+				status: 'cancelled',
+				completedAt: new Date(),
+			},
+		);
+	}
+
+	async markAsFailed(testRunId: string, pastExecutionId: string, trx?: EntityManager) {
+		trx = trx ?? this.manager;
+
+		return await trx.update(
+			TestCaseExecution,
+			{ testRun: { id: testRunId }, pastExecutionId },
+			{
+				status: 'error',
+				completedAt: new Date(),
+			},
+		);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/test-run.repository.ee.ts b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
index 037844734f..1f2039acee 100644
--- a/packages/cli/src/databases/repositories/test-run.repository.ee.ts
+++ b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
@@ -1,5 +1,5 @@
 import { Service } from '@n8n/di';
-import type { FindManyOptions } from '@n8n/typeorm';
+import type { EntityManager, FindManyOptions } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
 
 import type { AggregatedTestRunMetrics } from '@/databases/entities/test-run.ee';
@@ -35,12 +35,19 @@ export class TestRunRepository extends Repository<TestRun> {
 		return await this.update(id, { status: 'completed', completedAt: new Date(), metrics });
 	}
 
-	async incrementPassed(id: string) {
-		return await this.increment({ id }, 'passedCases', 1);
+	async markAsCancelled(id: string, trx?: EntityManager) {
+		trx = trx ?? this.manager;
+		return await trx.update(TestRun, id, { status: 'cancelled' });
 	}
 
-	async incrementFailed(id: string) {
-		return await this.increment({ id }, 'failedCases', 1);
+	async incrementPassed(id: string, trx?: EntityManager) {
+		trx = trx ?? this.manager;
+		return await trx.increment(TestRun, { id }, 'passedCases', 1);
+	}
+
+	async incrementFailed(id: string, trx?: EntityManager) {
+		trx = trx ?? this.manager;
+		return await trx.increment(TestRun, { id }, 'failedCases', 1);
 	}
 
 	async getMany(testDefinitionId: string, options: ListQuery.Options) {
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index 7edabdde96..5099a0b526 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -12,7 +12,6 @@ import {
 	type FindOptionsRelations,
 } from '@n8n/typeorm';
 
-import config from '@/config';
 import type { ListQuery } from '@/requests';
 import { isStringArray } from '@/utils';
 
@@ -45,10 +44,12 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		});
 	}
 
-	async getActiveIds() {
+	async getActiveIds({ maxResults }: { maxResults?: number } = {}) {
 		const activeWorkflows = await this.find({
 			select: ['id'],
 			where: { active: true },
+			// 'take' and 'order' are only needed when maxResults is provided:
+			...(maxResults ? { take: maxResults, order: { createdAt: 'ASC' } } : {}),
 		});
 		return activeWorkflows.map((workflow) => workflow.id);
 	}
@@ -132,7 +133,7 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 
 		const relations: string[] = [];
 
-		const areTagsEnabled = !config.getEnv('workflowTagsDisabled');
+		const areTagsEnabled = !this.globalConfig.tags.disabled;
 		const isDefaultSelect = options?.select === undefined;
 		const areTagsRequested = isDefaultSelect || options?.select?.tags === true;
 		const isOwnedByIncluded = isDefaultSelect || options?.select?.ownedBy === true;
@@ -157,6 +158,11 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 			findManyOptions.order = { updatedAt: 'ASC' };
 		}
 
+		if (options.sortBy) {
+			const [column, order] = options.sortBy.split(':');
+			findManyOptions.order = { [column]: order };
+		}
+
 		if (relations.length > 0) {
 			findManyOptions.relations = relations;
 		}
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts
index 2e5a5e63e3..96f2f8ecdb 100644
--- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts
@@ -1,86 +1,261 @@
+import type { SourceControlledFile } from '@n8n/api-types';
 import { Container } from '@n8n/di';
-import mock from 'jest-mock-extended/lib/Mock';
+import { mock, captor } from 'jest-mock-extended';
 import { Cipher, type InstanceSettings } from 'n8n-core';
-import { ApplicationError, deepCopy } from 'n8n-workflow';
+import fsp from 'node:fs/promises';
 
-import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { SharedCredentials } from '@/databases/entities/shared-credentials';
-import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { mockInstance } from '@test/mocking';
+import type { SharedWorkflow } from '@/databases/entities/shared-workflow';
+import type { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
+import type { TagRepository } from '@/databases/repositories/tag.repository';
+import type { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
+import type { VariablesService } from '../../variables/variables.service.ee';
 import { SourceControlExportService } from '../source-control-export.service.ee';
-import type { SourceControlledFile } from '../types/source-controlled-file';
-
-// https://github.com/jestjs/jest/issues/4715
-function deepSpyOn<O extends object, M extends keyof O>(object: O, methodName: M) {
-	const spy = jest.fn();
-
-	const originalMethod = object[methodName];
-
-	if (typeof originalMethod !== 'function') {
-		throw new ApplicationError(`${methodName.toString()} is not a function`, { level: 'warning' });
-	}
-
-	object[methodName] = function (...args: unknown[]) {
-		const clonedArgs = deepCopy(args);
-		spy(...clonedArgs);
-		return originalMethod.apply(this, args);
-	} as O[M];
-
-	return spy;
-}
 
 describe('SourceControlExportService', () => {
+	const cipher = Container.get(Cipher);
+	const sharedCredentialsRepository = mock<SharedCredentialsRepository>();
+	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const tagRepository = mock<TagRepository>();
+	const workflowTagMappingRepository = mock<WorkflowTagMappingRepository>();
+	const variablesService = mock<VariablesService>();
+
 	const service = new SourceControlExportService(
 		mock(),
-		mock(),
-		mock(),
-		mock<InstanceSettings>({ n8nFolder: '' }),
+		variablesService,
+		tagRepository,
+		sharedCredentialsRepository,
+		sharedWorkflowRepository,
+		workflowRepository,
+		workflowTagMappingRepository,
+		mock<InstanceSettings>({ n8nFolder: '/mock/n8n' }),
 	);
 
-	describe('exportCredentialsToWorkFolder', () => {
-		it('should export credentials to work folder', async () => {
-			/**
-			 * Arrange
-			 */
-			// @ts-expect-error Private method
-			const replaceSpy = deepSpyOn(service, 'replaceCredentialData');
+	const fsWriteFile = jest.spyOn(fsp, 'writeFile');
 
-			mockInstance(SharedCredentialsRepository).findByCredentialIds.mockResolvedValue([
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('exportCredentialsToWorkFolder', () => {
+		const credentialData = {
+			authUrl: 'test',
+			accessTokenUrl: 'test',
+			clientId: 'test',
+			clientSecret: 'test',
+			oauthTokenData: {
+				access_token: 'test',
+				token_type: 'test',
+				expires_in: 123,
+				refresh_token: 'test',
+			},
+		};
+
+		const mockCredentials = mock({
+			id: 'cred1',
+			name: 'Test Credential',
+			type: 'oauth2',
+			data: cipher.encrypt(credentialData),
+		});
+
+		it('should export credentials to work folder', async () => {
+			sharedCredentialsRepository.findByCredentialIds.mockResolvedValue([
 				mock<SharedCredentials>({
-					credentials: mock<CredentialsEntity>({
-						data: Container.get(Cipher).encrypt(
-							JSON.stringify({
-								authUrl: 'test',
-								accessTokenUrl: 'test',
-								clientId: 'test',
-								clientSecret: 'test',
-								oauthTokenData: {
-									access_token: 'test',
-									token_type: 'test',
-									expires_in: 123,
-									refresh_token: 'test',
-								},
-							}),
-						),
+					credentials: mockCredentials,
+					project: mock({
+						type: 'personal',
+						projectRelations: [
+							{
+								role: 'project:personalOwner',
+								user: mock({ email: 'user@example.com' }),
+							},
+						],
 					}),
 				}),
 			]);
 
-			/**
-			 * Act
-			 */
-			await service.exportCredentialsToWorkFolder([mock<SourceControlledFile>()]);
+			// Act
+			const result = await service.exportCredentialsToWorkFolder([mock()]);
 
-			/**
-			 * Assert
-			 */
-			expect(replaceSpy).toHaveBeenCalledWith({
-				authUrl: 'test',
-				accessTokenUrl: 'test',
-				clientId: 'test',
-				clientSecret: 'test',
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+
+			const dataCaptor = captor<string>();
+			expect(fsWriteFile).toHaveBeenCalledWith(
+				'/mock/n8n/git/credential_stubs/cred1.json',
+				dataCaptor,
+			);
+			expect(JSON.parse(dataCaptor.value)).toEqual({
+				id: 'cred1',
+				name: 'Test Credential',
+				type: 'oauth2',
+				data: {
+					authUrl: '',
+					accessTokenUrl: '',
+					clientId: '',
+					clientSecret: '',
+				},
+				ownedBy: {
+					type: 'personal',
+					personalEmail: 'user@example.com',
+				},
 			});
 		});
+
+		it('should handle team project credentials', async () => {
+			sharedCredentialsRepository.findByCredentialIds.mockResolvedValue([
+				mock<SharedCredentials>({
+					credentials: mockCredentials,
+					project: mock({
+						type: 'team',
+						id: 'team1',
+						name: 'Test Team',
+					}),
+				}),
+			]);
+
+			// Act
+			const result = await service.exportCredentialsToWorkFolder([
+				mock<SourceControlledFile>({ id: 'cred1' }),
+			]);
+
+			// Assert
+			expect(result.count).toBe(1);
+
+			const dataCaptor = captor<string>();
+			expect(fsWriteFile).toHaveBeenCalledWith(
+				'/mock/n8n/git/credential_stubs/cred1.json',
+				dataCaptor,
+			);
+			expect(JSON.parse(dataCaptor.value)).toEqual({
+				id: 'cred1',
+				name: 'Test Credential',
+				type: 'oauth2',
+				data: {
+					authUrl: '',
+					accessTokenUrl: '',
+					clientId: '',
+					clientSecret: '',
+				},
+				ownedBy: {
+					type: 'team',
+					teamId: 'team1',
+					teamName: 'Test Team',
+				},
+			});
+		});
+
+		it('should handle missing credentials', async () => {
+			// Arrange
+			sharedCredentialsRepository.findByCredentialIds.mockResolvedValue([]);
+
+			// Act
+			const result = await service.exportCredentialsToWorkFolder([
+				mock<SourceControlledFile>({ id: 'cred1' }),
+			]);
+
+			// Assert
+			expect(result.missingIds).toHaveLength(1);
+			expect(result.missingIds?.[0]).toBe('cred1');
+		});
+	});
+
+	describe('exportTagsToWorkFolder', () => {
+		it('should export tags to work folder', async () => {
+			// Arrange
+			tagRepository.find.mockResolvedValue([mock()]);
+			workflowTagMappingRepository.find.mockResolvedValue([mock()]);
+
+			// Act
+			const result = await service.exportTagsToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+		});
+
+		it('should not export empty tags', async () => {
+			// Arrange
+			tagRepository.find.mockResolvedValue([]);
+
+			// Act
+			const result = await service.exportTagsToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(0);
+			expect(result.files).toHaveLength(0);
+		});
+	});
+
+	describe('exportVariablesToWorkFolder', () => {
+		it('should export variables to work folder', async () => {
+			// Arrange
+			variablesService.getAllCached.mockResolvedValue([mock()]);
+
+			// Act
+			const result = await service.exportVariablesToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+		});
+
+		it('should not export empty variables', async () => {
+			// Arrange
+			variablesService.getAllCached.mockResolvedValue([]);
+
+			// Act
+			const result = await service.exportVariablesToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(0);
+			expect(result.files).toHaveLength(0);
+		});
+	});
+
+	describe('exportWorkflowsToWorkFolder', () => {
+		it('should export workflows to work folder', async () => {
+			// Arrange
+			workflowRepository.findByIds.mockResolvedValue([mock()]);
+			sharedWorkflowRepository.findByWorkflowIds.mockResolvedValue([
+				mock<SharedWorkflow>({
+					project: mock({
+						type: 'personal',
+						projectRelations: [{ role: 'project:personalOwner', user: mock() }],
+					}),
+					workflow: mock(),
+				}),
+			]);
+
+			// Act
+			const result = await service.exportWorkflowsToWorkFolder([mock()]);
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+		});
+
+		it('should throw an error if workflow has no owner', async () => {
+			// Arrange
+			sharedWorkflowRepository.findByWorkflowIds.mockResolvedValue([
+				mock<SharedWorkflow>({
+					project: mock({
+						type: 'personal',
+						projectRelations: [],
+					}),
+					workflow: mock({
+						display: () => 'TestWorkflow',
+					}),
+				}),
+			]);
+
+			// Act & Assert
+			await expect(service.exportWorkflowsToWorkFolder([mock()])).rejects.toThrow(
+				'Workflow TestWorkflow has no owner',
+			);
+		});
 	});
 });
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts
index c6d1b3857b..4824b85ba6 100644
--- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts
@@ -1,5 +1,7 @@
+import type { SourceControlledFile } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import { constants as fsConstants, accessSync } from 'fs';
+import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 import path from 'path';
 
@@ -15,11 +17,8 @@ import {
 	getTrackingInformationFromPullResult,
 	sourceControlFoldersExistCheck,
 } from '@/environments.ee/source-control/source-control-helper.ee';
-import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
-import type { SourceControlPreferences } from '@/environments.ee/source-control/types/source-control-preferences';
-import type { SourceControlledFile } from '@/environments.ee/source-control/types/source-controlled-file';
-import { License } from '@/license';
-import { mockInstance } from '@test/mocking';
+import type { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
+import type { License } from '@/license';
 
 const pushResult: SourceControlledFile[] = [
 	{
@@ -151,12 +150,13 @@ const pullResult: SourceControlledFile[] = [
 	},
 ];
 
-const license = mockInstance(License);
+const license = mock<License>();
+const sourceControlPreferencesService = mock<SourceControlPreferencesService>();
 
 beforeAll(async () => {
 	jest.resetAllMocks();
 	license.isSourceControlLicensed.mockReturnValue(true);
-	Container.get(SourceControlPreferencesService).getPreferences = () => ({
+	sourceControlPreferencesService.getPreferences.mockReturnValue({
 		branchName: 'main',
 		connected: true,
 		repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
@@ -245,17 +245,4 @@ describe('Source Control', () => {
 			workflowUpdates: 3,
 		});
 	});
-
-	it('should class validate correct preferences', async () => {
-		const validPreferences: Partial<SourceControlPreferences> = {
-			branchName: 'main',
-			repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
-			branchReadOnly: false,
-			branchColor: '#5296D6',
-		};
-		const validationResult = await Container.get(
-			SourceControlPreferencesService,
-		).validateSourceControlPreferences(validPreferences);
-		expect(validationResult).toBeTruthy();
-	});
 });
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
new file mode 100644
index 0000000000..cc817368cd
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
@@ -0,0 +1,183 @@
+import * as fastGlob from 'fast-glob';
+import { mock } from 'jest-mock-extended';
+import { type InstanceSettings } from 'n8n-core';
+import fsp from 'node:fs/promises';
+
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+import { SourceControlImportService } from '../source-control-import.service.ee';
+
+jest.mock('fast-glob');
+
+describe('SourceControlImportService', () => {
+	const workflowRepository = mock<WorkflowRepository>();
+	const service = new SourceControlImportService(
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		workflowRepository,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock<InstanceSettings>({ n8nFolder: '/mock/n8n' }),
+	);
+
+	const globMock = fastGlob.default as unknown as jest.Mock<Promise<string[]>, string[]>;
+	const fsReadFile = jest.spyOn(fsp, 'readFile');
+
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('getRemoteVersionIdsFromFiles', () => {
+		const mockWorkflowFile = '/mock/workflow1.json';
+		it('should parse workflow files correctly', async () => {
+			globMock.mockResolvedValue([mockWorkflowFile]);
+
+			const mockWorkflowData = {
+				id: 'workflow1',
+				versionId: 'v1',
+				name: 'Test Workflow',
+			};
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockWorkflowData));
+
+			const result = await service.getRemoteVersionIdsFromFiles();
+			expect(fsReadFile).toHaveBeenCalledWith(mockWorkflowFile, { encoding: 'utf8' });
+
+			expect(result).toHaveLength(1);
+			expect(result[0]).toEqual(
+				expect.objectContaining({
+					id: 'workflow1',
+					versionId: 'v1',
+					name: 'Test Workflow',
+				}),
+			);
+		});
+
+		it('should filter out files without valid workflow data', async () => {
+			globMock.mockResolvedValue(['/mock/invalid.json']);
+
+			fsReadFile.mockResolvedValue('{}');
+
+			const result = await service.getRemoteVersionIdsFromFiles();
+
+			expect(result).toHaveLength(0);
+		});
+	});
+
+	describe('getRemoteCredentialsFromFiles', () => {
+		it('should parse credential files correctly', async () => {
+			globMock.mockResolvedValue(['/mock/credential1.json']);
+
+			const mockCredentialData = {
+				id: 'cred1',
+				name: 'Test Credential',
+				type: 'oauth2',
+			};
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockCredentialData));
+
+			const result = await service.getRemoteCredentialsFromFiles();
+
+			expect(result).toHaveLength(1);
+			expect(result[0]).toEqual(
+				expect.objectContaining({
+					id: 'cred1',
+					name: 'Test Credential',
+					type: 'oauth2',
+				}),
+			);
+		});
+
+		it('should filter out files without valid credential data', async () => {
+			globMock.mockResolvedValue(['/mock/invalid.json']);
+			fsReadFile.mockResolvedValue('{}');
+
+			const result = await service.getRemoteCredentialsFromFiles();
+
+			expect(result).toHaveLength(0);
+		});
+	});
+
+	describe('getRemoteVariablesFromFile', () => {
+		it('should parse variables file correctly', async () => {
+			globMock.mockResolvedValue(['/mock/variables.json']);
+
+			const mockVariablesData = [
+				{ key: 'VAR1', value: 'value1' },
+				{ key: 'VAR2', value: 'value2' },
+			];
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockVariablesData));
+
+			const result = await service.getRemoteVariablesFromFile();
+
+			expect(result).toEqual(mockVariablesData);
+		});
+
+		it('should return empty array if no variables file found', async () => {
+			globMock.mockResolvedValue([]);
+
+			const result = await service.getRemoteVariablesFromFile();
+
+			expect(result).toHaveLength(0);
+		});
+	});
+
+	describe('getRemoteTagsAndMappingsFromFile', () => {
+		it('should parse tags and mappings file correctly', async () => {
+			globMock.mockResolvedValue(['/mock/tags.json']);
+
+			const mockTagsData = {
+				tags: [{ id: 'tag1', name: 'Tag 1' }],
+				mappings: [{ workflowId: 'workflow1', tagId: 'tag1' }],
+			};
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockTagsData));
+
+			const result = await service.getRemoteTagsAndMappingsFromFile();
+
+			expect(result.tags).toEqual(mockTagsData.tags);
+			expect(result.mappings).toEqual(mockTagsData.mappings);
+		});
+
+		it('should return empty tags and mappings if no file found', async () => {
+			globMock.mockResolvedValue([]);
+
+			const result = await service.getRemoteTagsAndMappingsFromFile();
+
+			expect(result.tags).toHaveLength(0);
+			expect(result.mappings).toHaveLength(0);
+		});
+	});
+
+	describe('getLocalVersionIdsFromDb', () => {
+		const now = new Date();
+		jest.useFakeTimers({ now });
+
+		it('should replace invalid updatedAt with current timestamp', async () => {
+			const mockWorkflows = [
+				{
+					id: 'workflow1',
+					name: 'Test Workflow',
+					updatedAt: 'invalid-date',
+				},
+			] as unknown as WorkflowEntity[];
+
+			workflowRepository.find.mockResolvedValue(mockWorkflows);
+
+			const result = await service.getLocalVersionIdsFromDb();
+
+			expect(result[0].updatedAt).toBe(now.toISOString());
+		});
+	});
+});
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-preferences.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-preferences.service.ee.test.ts
new file mode 100644
index 0000000000..d35c7ac9c7
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-preferences.service.ee.test.ts
@@ -0,0 +1,27 @@
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+
+import { SourceControlPreferencesService } from '../source-control-preferences.service.ee';
+import type { SourceControlPreferences } from '../types/source-control-preferences';
+
+describe('SourceControlPreferencesService', () => {
+	const instanceSettings = mock<InstanceSettings>({ n8nFolder: '' });
+	const service = new SourceControlPreferencesService(
+		instanceSettings,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+	);
+
+	it('should class validate correct preferences', async () => {
+		const validPreferences: Partial<SourceControlPreferences> = {
+			branchName: 'main',
+			repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
+			branchReadOnly: false,
+			branchColor: '#5296D6',
+		};
+		const validationResult = await service.validateSourceControlPreferences(validPreferences);
+		expect(validationResult).toBeTruthy();
+	});
+});
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts
index 9024a0a32c..43a13ed6ba 100644
--- a/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts
@@ -1,30 +1,46 @@
+import type { SourceControlledFile } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 
+import type { TagEntity } from '@/databases/entities/tag-entity';
+import type { User } from '@/databases/entities/user';
+import type { Variables } from '@/databases/entities/variables';
+import type { TagRepository } from '@/databases/repositories/tag.repository';
 import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
 import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';
 
+import type { SourceControlImportService } from '../source-control-import.service.ee';
+import type { ExportableCredential } from '../types/exportable-credential';
+import type { SourceControlWorkflowVersionId } from '../types/source-control-workflow-version-id';
+
 describe('SourceControlService', () => {
 	const preferencesService = new SourceControlPreferencesService(
 		Container.get(InstanceSettings),
 		mock(),
 		mock(),
+		mock(),
+		mock(),
 	);
+	const sourceControlImportService = mock<SourceControlImportService>();
+	const tagRepository = mock<TagRepository>();
 	const sourceControlService = new SourceControlService(
 		mock(),
 		mock(),
 		preferencesService,
 		mock(),
-		mock(),
-		mock(),
+		sourceControlImportService,
+		tagRepository,
 		mock(),
 	);
 
+	beforeEach(() => {
+		jest.resetAllMocks();
+		jest.spyOn(sourceControlService, 'sanityCheck').mockResolvedValue(undefined);
+	});
+
 	describe('pushWorkfolder', () => {
 		it('should throw an error if a file is given that is not in the workfolder', async () => {
-			jest.spyOn(sourceControlService, 'sanityCheck').mockResolvedValue(undefined);
-
 			await expect(
 				sourceControlService.pushWorkfolder({
 					fileNames: [
@@ -44,4 +60,155 @@ describe('SourceControlService', () => {
 			).rejects.toThrow('File path /etc/passwd is invalid');
 		});
 	});
+
+	describe('pullWorkfolder', () => {
+		it('does not filter locally created credentials', async () => {
+			// ARRANGE
+			const user = mock<User>();
+			const statuses = [
+				mock<SourceControlledFile>({
+					status: 'created',
+					location: 'local',
+					type: 'credential',
+				}),
+				mock<SourceControlledFile>({
+					status: 'created',
+					location: 'local',
+					type: 'workflow',
+				}),
+			];
+			jest.spyOn(sourceControlService, 'getStatus').mockResolvedValueOnce(statuses);
+
+			// ACT
+			const result = await sourceControlService.pullWorkfolder(user, {});
+
+			// ASSERT
+			expect(result).toMatchObject({ statusCode: 409, statusResult: statuses });
+		});
+
+		it('does not filter remotely deleted credentials', async () => {
+			// ARRANGE
+			const user = mock<User>();
+			const statuses = [
+				mock<SourceControlledFile>({
+					status: 'deleted',
+					location: 'remote',
+					type: 'credential',
+				}),
+				mock<SourceControlledFile>({
+					status: 'created',
+					location: 'local',
+					type: 'workflow',
+				}),
+			];
+			jest.spyOn(sourceControlService, 'getStatus').mockResolvedValueOnce(statuses);
+
+			// ACT
+			const result = await sourceControlService.pullWorkfolder(user, {});
+
+			// ASSERT
+			expect(result).toMatchObject({ statusCode: 409, statusResult: statuses });
+		});
+
+		it('should throw an error if a file is given that is not in the workfolder', async () => {
+			await expect(
+				sourceControlService.pushWorkfolder({
+					fileNames: [
+						{
+							file: '/etc/passwd',
+							id: 'test',
+							name: 'secret-file',
+							type: 'file',
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: new Date().toISOString(),
+							pushed: false,
+						},
+					],
+				}),
+			).rejects.toThrow('File path /etc/passwd is invalid');
+		});
+	});
+
+	describe('getStatus', () => {
+		it('conflict depends on the value of `direction`', async () => {
+			// ARRANGE
+
+			// Define a credential that does only exist locally.
+			// Pulling this would delete it so it should be marked as a conflict.
+			// Pushing this is conflict free.
+			sourceControlImportService.getRemoteVersionIdsFromFiles.mockResolvedValue([]);
+			sourceControlImportService.getLocalVersionIdsFromDb.mockResolvedValue([
+				mock<SourceControlWorkflowVersionId>(),
+			]);
+
+			// Define a credential that does only exist locally.
+			// Pulling this would delete it so it should be marked as a conflict.
+			// Pushing this is conflict free.
+			sourceControlImportService.getRemoteCredentialsFromFiles.mockResolvedValue([]);
+			sourceControlImportService.getLocalCredentialsFromDb.mockResolvedValue([
+				mock<ExportableCredential & { filename: string }>(),
+			]);
+
+			// Define a variable that does only exist locally.
+			// Pulling this would delete it so it should be marked as a conflict.
+			// Pushing this is conflict free.
+			sourceControlImportService.getRemoteVariablesFromFile.mockResolvedValue([]);
+			sourceControlImportService.getLocalVariablesFromDb.mockResolvedValue([mock<Variables>()]);
+
+			// Define a tag that does only exist locally.
+			// Pulling this would delete it so it should be marked as a conflict.
+			// Pushing this is conflict free.
+			const tag = mock<TagEntity>({ updatedAt: new Date() });
+			tagRepository.find.mockResolvedValue([tag]);
+			sourceControlImportService.getRemoteTagsAndMappingsFromFile.mockResolvedValue({
+				tags: [],
+				mappings: [],
+			});
+			sourceControlImportService.getLocalTagsAndMappingsFromDb.mockResolvedValue({
+				tags: [tag],
+				mappings: [],
+			});
+
+			// ACT
+			const pullResult = await sourceControlService.getStatus({
+				direction: 'pull',
+				verbose: false,
+				preferLocalVersion: false,
+			});
+
+			const pushResult = await sourceControlService.getStatus({
+				direction: 'push',
+				verbose: false,
+				preferLocalVersion: false,
+			});
+
+			// ASSERT
+			console.log(pullResult);
+			console.log(pushResult);
+
+			if (!Array.isArray(pullResult)) {
+				fail('Expected pullResult to be an array.');
+			}
+			if (!Array.isArray(pushResult)) {
+				fail('Expected pushResult to be an array.');
+			}
+
+			expect(pullResult).toHaveLength(4);
+			expect(pushResult).toHaveLength(4);
+
+			expect(pullResult.find((i) => i.type === 'workflow')).toHaveProperty('conflict', true);
+			expect(pushResult.find((i) => i.type === 'workflow')).toHaveProperty('conflict', false);
+
+			expect(pullResult.find((i) => i.type === 'credential')).toHaveProperty('conflict', true);
+			expect(pushResult.find((i) => i.type === 'credential')).toHaveProperty('conflict', false);
+
+			expect(pullResult.find((i) => i.type === 'variables')).toHaveProperty('conflict', true);
+			expect(pushResult.find((i) => i.type === 'variables')).toHaveProperty('conflict', false);
+
+			expect(pullResult.find((i) => i.type === 'tags')).toHaveProperty('conflict', true);
+			expect(pushResult.find((i) => i.type === 'tags')).toHaveProperty('conflict', false);
+		});
+	});
 });
diff --git a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
index 4980460318..ec8e4efd22 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
@@ -1,4 +1,5 @@
-import { Container, Service } from '@n8n/di';
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import { rmSync } from 'fs';
 import { Credentials, InstanceSettings, Logger } from 'n8n-core';
 import { ApplicationError, type ICredentialDataDecryptedObject } from 'n8n-workflow';
@@ -29,7 +30,6 @@ import type { ExportResult } from './types/export-result';
 import type { ExportableCredential } from './types/exportable-credential';
 import type { ExportableWorkflow } from './types/exportable-workflow';
 import type { ResourceOwner } from './types/resource-owner';
-import type { SourceControlledFile } from './types/source-controlled-file';
 import { VariablesService } from '../variables/variables.service.ee';
 
 @Service()
@@ -44,6 +44,10 @@ export class SourceControlExportService {
 		private readonly logger: Logger,
 		private readonly variablesService: VariablesService,
 		private readonly tagRepository: TagRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowTagMappingRepository: WorkflowTagMappingRepository,
 		instanceSettings: InstanceSettings,
 	) {
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
@@ -106,17 +110,16 @@ export class SourceControlExportService {
 		try {
 			sourceControlFoldersExistCheck([this.workflowExportFolder]);
 			const workflowIds = candidates.map((e) => e.id);
-			const sharedWorkflows =
-				await Container.get(SharedWorkflowRepository).findByWorkflowIds(workflowIds);
-			const workflows = await Container.get(WorkflowRepository).findByIds(workflowIds);
+			const sharedWorkflows = await this.sharedWorkflowRepository.findByWorkflowIds(workflowIds);
+			const workflows = await this.workflowRepository.findByIds(workflowIds);
 
 			// determine owner of each workflow to be exported
 			const owners: Record<string, ResourceOwner> = {};
-			sharedWorkflows.forEach((e) => {
-				const project = e.project;
+			sharedWorkflows.forEach((sharedWorkflow) => {
+				const project = sharedWorkflow.project;
 
 				if (!project) {
-					throw new ApplicationError(`Workflow ${e.workflow.display()} has no owner`);
+					throw new ApplicationError(`Workflow ${sharedWorkflow.workflow.display()} has no owner`);
 				}
 
 				if (project.type === 'personal') {
@@ -124,14 +127,16 @@ export class SourceControlExportService {
 						(pr) => pr.role === 'project:personalOwner',
 					);
 					if (!ownerRelation) {
-						throw new ApplicationError(`Workflow ${e.workflow.display()} has no owner`);
+						throw new ApplicationError(
+							`Workflow ${sharedWorkflow.workflow.display()} has no owner`,
+						);
 					}
-					owners[e.workflowId] = {
+					owners[sharedWorkflow.workflowId] = {
 						type: 'personal',
 						personalEmail: ownerRelation.user.email,
 					};
 				} else if (project.type === 'team') {
-					owners[e.workflowId] = {
+					owners[sharedWorkflow.workflowId] = {
 						type: 'team',
 						teamId: project.id,
 						teamName: project.name,
@@ -156,6 +161,7 @@ export class SourceControlExportService {
 				})),
 			};
 		} catch (error) {
+			if (error instanceof ApplicationError) throw error;
 			throw new ApplicationError('Failed to export workflows to work folder', { cause: error });
 		}
 	}
@@ -204,7 +210,7 @@ export class SourceControlExportService {
 					files: [],
 				};
 			}
-			const mappings = await Container.get(WorkflowTagMappingRepository).find();
+			const mappings = await this.workflowTagMappingRepository.find();
 			const fileName = path.join(this.gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
 			await fsWriteFile(
 				fileName,
@@ -260,9 +266,10 @@ export class SourceControlExportService {
 		try {
 			sourceControlFoldersExistCheck([this.credentialExportFolder]);
 			const credentialIds = candidates.map((e) => e.id);
-			const credentialsToBeExported = await Container.get(
-				SharedCredentialsRepository,
-			).findByCredentialIds(credentialIds, 'credential:owner');
+			const credentialsToBeExported = await this.sharedCredentialsRepository.findByCredentialIds(
+				credentialIds,
+				'credential:owner',
+			);
 			let missingIds: string[] = [];
 			if (credentialsToBeExported.length !== credentialIds.length) {
 				const foundCredentialIds = credentialsToBeExported.map((e) => e.credentialsId);
diff --git a/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
index 031155a5b5..45ca38ed96 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
@@ -1,3 +1,4 @@
+import type { SourceControlledFile } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import { generateKeyPairSync } from 'crypto';
 import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
@@ -16,7 +17,6 @@ import {
 } from './constants';
 import type { KeyPair } from './types/key-pair';
 import type { KeyPairType } from './types/key-pair-type';
-import type { SourceControlledFile } from './types/source-controlled-file';
 
 export function stringContainsExpression(testString: string): boolean {
 	return /^=.*\{\{.*\}\}/.test(testString);
diff --git a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
index 8da041297b..3c416c0b4c 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
@@ -1,4 +1,5 @@
-import { Container, Service } from '@n8n/di';
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import glob from 'fast-glob';
@@ -8,9 +9,11 @@ import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
+import { CredentialsService } from '@/credentials/credentials.service';
 import type { Project } from '@/databases/entities/project';
 import { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { TagEntity } from '@/databases/entities/tag-entity';
+import type { User } from '@/databases/entities/user';
 import type { Variables } from '@/databases/entities/variables';
 import type { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
@@ -24,7 +27,9 @@ import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { IWorkflowToImport } from '@/interfaces';
 import { isUniqueConstraintError } from '@/response-helper';
+import { TagService } from '@/services/tag.service';
 import { assertNever } from '@/utils';
+import { WorkflowService } from '@/workflows/workflow.service';
 
 import {
 	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
@@ -37,7 +42,6 @@ import { getCredentialExportPath, getWorkflowExportPath } from './source-control
 import type { ExportableCredential } from './types/exportable-credential';
 import type { ResourceOwner } from './types/resource-owner';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
-import type { SourceControlledFile } from './types/source-controlled-file';
 import { VariablesService } from '../variables/variables.service.ee';
 
 @Service()
@@ -53,7 +57,18 @@ export class SourceControlImportService {
 		private readonly errorReporter: ErrorReporter,
 		private readonly variablesService: VariablesService,
 		private readonly activeWorkflowManager: ActiveWorkflowManager,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly projectRepository: ProjectRepository,
 		private readonly tagRepository: TagRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly userRepository: UserRepository,
+		private readonly variablesRepository: VariablesRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowTagMappingRepository: WorkflowTagMappingRepository,
+		private readonly workflowService: WorkflowService,
+		private readonly credentialsService: CredentialsService,
+		private readonly tagService: TagService,
 		instanceSettings: InstanceSettings,
 	) {
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
@@ -91,7 +106,7 @@ export class SourceControlImportService {
 	}
 
 	async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
-		const localWorkflows = await Container.get(WorkflowRepository).find({
+		const localWorkflows = await this.workflowRepository.find({
 			select: ['id', 'name', 'versionId', 'updatedAt'],
 		});
 		return localWorkflows.map((local) => {
@@ -146,7 +161,7 @@ export class SourceControlImportService {
 	}
 
 	async getLocalCredentialsFromDb(): Promise<Array<ExportableCredential & { filename: string }>> {
-		const localCredentials = await Container.get(CredentialsRepository).find({
+		const localCredentials = await this.credentialsRepository.find({
 			select: ['id', 'name', 'type'],
 		});
 		return localCredentials.map((local) => ({
@@ -201,24 +216,22 @@ export class SourceControlImportService {
 		const localTags = await this.tagRepository.find({
 			select: ['id', 'name'],
 		});
-		const localMappings = await Container.get(WorkflowTagMappingRepository).find({
+		const localMappings = await this.workflowTagMappingRepository.find({
 			select: ['workflowId', 'tagId'],
 		});
 		return { tags: localTags, mappings: localMappings };
 	}
 
 	async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
-		const personalProject =
-			await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(userId);
+		const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(userId);
 		const workflowManager = this.activeWorkflowManager;
 		const candidateIds = candidates.map((c) => c.id);
-		const existingWorkflows = await Container.get(WorkflowRepository).findByIds(candidateIds, {
+		const existingWorkflows = await this.workflowRepository.findByIds(candidateIds, {
 			fields: ['id', 'name', 'versionId', 'active'],
 		});
-		const allSharedWorkflows = await Container.get(SharedWorkflowRepository).findWithFields(
-			candidateIds,
-			{ select: ['workflowId', 'role', 'projectId'] },
-		);
+		const allSharedWorkflows = await this.sharedWorkflowRepository.findWithFields(candidateIds, {
+			select: ['workflowId', 'role', 'projectId'],
+		});
 		const importWorkflowsResult = [];
 
 		// Due to SQLite concurrency issues, we cannot save all workflows at once
@@ -235,9 +248,7 @@ export class SourceControlImportService {
 			const existingWorkflow = existingWorkflows.find((e) => e.id === importedWorkflow.id);
 			importedWorkflow.active = existingWorkflow?.active ?? false;
 			this.logger.debug(`Updating workflow id ${importedWorkflow.id ?? 'new'}`);
-			const upsertResult = await Container.get(WorkflowRepository).upsert({ ...importedWorkflow }, [
-				'id',
-			]);
+			const upsertResult = await this.workflowRepository.upsert({ ...importedWorkflow }, ['id']);
 			if (upsertResult?.identifiers?.length !== 1) {
 				throw new ApplicationError('Failed to upsert workflow', {
 					extra: { workflowId: importedWorkflow.id ?? 'new' },
@@ -253,7 +264,7 @@ export class SourceControlImportService {
 					? await this.findOrCreateOwnerProject(importedWorkflow.owner)
 					: null;
 
-				await Container.get(SharedWorkflowRepository).upsert(
+				await this.sharedWorkflowRepository.upsert(
 					{
 						workflowId: importedWorkflow.id,
 						projectId: remoteOwnerProject?.id ?? personalProject.id,
@@ -276,7 +287,7 @@ export class SourceControlImportService {
 					const error = ensureError(e);
 					this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, { error });
 				} finally {
-					await Container.get(WorkflowRepository).update(
+					await this.workflowRepository.update(
 						{ id: existingWorkflow.id },
 						{ versionId: importedWorkflow.versionId },
 					);
@@ -295,16 +306,15 @@ export class SourceControlImportService {
 	}
 
 	async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
-		const personalProject =
-			await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(userId);
+		const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(userId);
 		const candidateIds = candidates.map((c) => c.id);
-		const existingCredentials = await Container.get(CredentialsRepository).find({
+		const existingCredentials = await this.credentialsRepository.find({
 			where: {
 				id: In(candidateIds),
 			},
 			select: ['id', 'name', 'type', 'data'],
 		});
-		const existingSharedCredentials = await Container.get(SharedCredentialsRepository).find({
+		const existingSharedCredentials = await this.sharedCredentialsRepository.find({
 			select: ['credentialsId', 'role'],
 			where: {
 				credentialsId: In(candidateIds),
@@ -336,7 +346,7 @@ export class SourceControlImportService {
 				}
 
 				this.logger.debug(`Updating credential id ${newCredentialObject.id as string}`);
-				await Container.get(CredentialsRepository).upsert(newCredentialObject, ['id']);
+				await this.credentialsRepository.upsert(newCredentialObject, ['id']);
 
 				const isOwnedLocally = existingSharedCredentials.some(
 					(c) => c.credentialsId === credential.id && c.role === 'credential:owner',
@@ -352,7 +362,7 @@ export class SourceControlImportService {
 					newSharedCredential.projectId = remoteOwnerProject?.id ?? personalProject.id;
 					newSharedCredential.role = 'credential:owner';
 
-					await Container.get(SharedCredentialsRepository).upsert({ ...newSharedCredential }, [
+					await this.sharedCredentialsRepository.upsert({ ...newSharedCredential }, [
 						'credentialsId',
 						'projectId',
 					]);
@@ -388,7 +398,7 @@ export class SourceControlImportService {
 
 		const existingWorkflowIds = new Set(
 			(
-				await Container.get(WorkflowRepository).find({
+				await this.workflowRepository.find({
 					select: ['id'],
 				})
 			).map((e) => e.id),
@@ -417,7 +427,7 @@ export class SourceControlImportService {
 		await Promise.all(
 			mappedTags.mappings.map(async (mapping) => {
 				if (!existingWorkflowIds.has(String(mapping.workflowId))) return;
-				await Container.get(WorkflowTagMappingRepository).upsert(
+				await this.workflowTagMappingRepository.upsert(
 					{ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) },
 					{
 						skipUpdateIfNoValuesChanged: true,
@@ -464,12 +474,12 @@ export class SourceControlImportService {
 				overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
 			}
 			try {
-				await Container.get(VariablesRepository).upsert({ ...variable }, ['id']);
+				await this.variablesRepository.upsert({ ...variable }, ['id']);
 			} catch (errorUpsert) {
 				if (isUniqueConstraintError(errorUpsert as Error)) {
 					this.logger.debug(`Variable ${variable.key} already exists, updating instead`);
 					try {
-						await Container.get(VariablesRepository).update({ key: variable.key }, { ...variable });
+						await this.variablesRepository.update({ key: variable.key }, { ...variable });
 					} catch (errorUpdate) {
 						this.logger.debug(`Failed to update variable ${variable.key}, skipping`);
 						this.logger.debug((errorUpdate as Error).message);
@@ -484,11 +494,11 @@ export class SourceControlImportService {
 		if (overriddenKeys.length > 0 && valueOverrides) {
 			for (const key of overriddenKeys) {
 				result.imported.push(key);
-				const newVariable = Container.get(VariablesRepository).create({
+				const newVariable = this.variablesRepository.create({
 					key,
 					value: valueOverrides[key],
 				});
-				await Container.get(VariablesRepository).save(newVariable, { transaction: false });
+				await this.variablesRepository.save(newVariable, { transaction: false });
 			}
 		}
 
@@ -497,33 +507,55 @@ export class SourceControlImportService {
 		return result;
 	}
 
+	async deleteWorkflowsNotInWorkfolder(user: User, candidates: SourceControlledFile[]) {
+		for (const candidate of candidates) {
+			await this.workflowService.delete(user, candidate.id);
+		}
+	}
+
+	async deleteCredentialsNotInWorkfolder(user: User, candidates: SourceControlledFile[]) {
+		for (const candidate of candidates) {
+			await this.credentialsService.delete(user, candidate.id);
+		}
+	}
+
+	async deleteVariablesNotInWorkfolder(candidates: SourceControlledFile[]) {
+		for (const candidate of candidates) {
+			await this.variablesService.delete(candidate.id);
+		}
+	}
+
+	async deleteTagsNotInWorkfolder(candidates: SourceControlledFile[]) {
+		for (const candidate of candidates) {
+			await this.tagService.delete(candidate.id);
+		}
+	}
+
 	private async findOrCreateOwnerProject(owner: ResourceOwner): Promise<Project | null> {
-		const projectRepository = Container.get(ProjectRepository);
-		const userRepository = Container.get(UserRepository);
 		if (typeof owner === 'string' || owner.type === 'personal') {
 			const email = typeof owner === 'string' ? owner : owner.personalEmail;
-			const user = await userRepository.findOne({
+			const user = await this.userRepository.findOne({
 				where: { email },
 			});
 			if (!user) {
 				return null;
 			}
-			return await projectRepository.getPersonalProjectForUserOrFail(user.id);
+			return await this.projectRepository.getPersonalProjectForUserOrFail(user.id);
 		} else if (owner.type === 'team') {
-			let teamProject = await projectRepository.findOne({
+			let teamProject = await this.projectRepository.findOne({
 				where: { id: owner.teamId },
 			});
 			if (!teamProject) {
 				try {
-					teamProject = await projectRepository.save(
-						projectRepository.create({
+					teamProject = await this.projectRepository.save(
+						this.projectRepository.create({
 							id: owner.teamId,
 							name: owner.teamName,
 							type: 'team',
 						}),
 					);
 				} catch (e) {
-					teamProject = await projectRepository.findOne({
+					teamProject = await this.projectRepository.findOne({
 						where: { id: owner.teamId },
 					});
 					if (!teamProject) {
diff --git a/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
index e530d9d530..d424a844b2 100644
--- a/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
@@ -1,4 +1,4 @@
-import { Container, Service } from '@n8n/di';
+import { Service } from '@n8n/di';
 import type { ValidationError } from 'class-validator';
 import { validate } from 'class-validator';
 import { rm as fsRm } from 'fs/promises';
@@ -7,7 +7,6 @@ import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { writeFile, chmod, readFile } from 'node:fs/promises';
 import path from 'path';
 
-import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 
 import {
@@ -17,6 +16,7 @@ import {
 	SOURCE_CONTROL_PREFERENCES_DB_KEY,
 } from './constants';
 import { generateSshKeyPair, isSourceControlLicensed } from './source-control-helper.ee';
+import { SourceControlConfig } from './source-control.config';
 import type { KeyPairType } from './types/key-pair-type';
 import { SourceControlPreferences } from './types/source-control-preferences';
 
@@ -34,6 +34,8 @@ export class SourceControlPreferencesService {
 		private readonly instanceSettings: InstanceSettings,
 		private readonly logger: Logger,
 		private readonly cipher: Cipher,
+		private readonly settingsRepository: SettingsRepository,
+		private readonly sourceControlConfig: SourceControlConfig,
 	) {
 		this.sshFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_SSH_FOLDER);
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
@@ -64,9 +66,7 @@ export class SourceControlPreferencesService {
 	}
 
 	private async getKeyPairFromDatabase() {
-		const dbSetting = await Container.get(SettingsRepository).findByKey(
-			'features.sourceControl.sshKeys',
-		);
+		const dbSetting = await this.settingsRepository.findByKey('features.sourceControl.sshKeys');
 
 		if (!dbSetting?.value) return null;
 
@@ -120,7 +120,7 @@ export class SourceControlPreferencesService {
 	async deleteKeyPair() {
 		try {
 			await fsRm(this.sshFolder, { recursive: true });
-			await Container.get(SettingsRepository).delete({ key: 'features.sourceControl.sshKeys' });
+			await this.settingsRepository.delete({ key: 'features.sourceControl.sshKeys' });
 		} catch (e) {
 			const error = e instanceof Error ? e : new Error(`${e}`);
 			this.logger.error(`Failed to delete SSH key pair: ${error.message}`);
@@ -133,14 +133,12 @@ export class SourceControlPreferencesService {
 	async generateAndSaveKeyPair(keyPairType?: KeyPairType): Promise<SourceControlPreferences> {
 		if (!keyPairType) {
 			keyPairType =
-				this.getPreferences().keyGeneratorType ??
-				(config.get('sourceControl.defaultKeyPairType') as KeyPairType) ??
-				'ed25519';
+				this.getPreferences().keyGeneratorType ?? this.sourceControlConfig.defaultKeyPairType;
 		}
 		const keyPair = await generateSshKeyPair(keyPairType);
 
 		try {
-			await Container.get(SettingsRepository).save({
+			await this.settingsRepository.save({
 				key: 'features.sourceControl.sshKeys',
 				value: JSON.stringify({
 					encryptedPrivateKey: this.cipher.encrypt(keyPair.privateKey),
@@ -211,7 +209,7 @@ export class SourceControlPreferencesService {
 		if (saveToDb) {
 			const settingsValue = JSON.stringify(this._sourceControlPreferences);
 			try {
-				await Container.get(SettingsRepository).save(
+				await this.settingsRepository.save(
 					{
 						key: SOURCE_CONTROL_PREFERENCES_DB_KEY,
 						value: settingsValue,
@@ -229,7 +227,7 @@ export class SourceControlPreferencesService {
 	async loadFromDbAndApplySourceControlPreferences(): Promise<
 		SourceControlPreferences | undefined
 	> {
-		const loadedPreferences = await Container.get(SettingsRepository).findOne({
+		const loadedPreferences = await this.settingsRepository.findOne({
 			where: { key: SOURCE_CONTROL_PREFERENCES_DB_KEY },
 		});
 		if (loadedPreferences) {
diff --git a/packages/cli/src/environments.ee/source-control/source-control.config.ts b/packages/cli/src/environments.ee/source-control/source-control.config.ts
new file mode 100644
index 0000000000..04d12dce4f
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/source-control.config.ts
@@ -0,0 +1,8 @@
+import { Config, Env } from '@n8n/config';
+
+@Config
+export class SourceControlConfig {
+	/** Default SSH key type to use when generating SSH keys. */
+	@Env('N8N_SOURCECONTROL_DEFAULT_SSH_KEY_TYPE')
+	defaultKeyPairType: 'ed25519' | 'rsa' = 'ed25519';
+}
diff --git a/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts
index 7b8b2a7266..1f243a1447 100644
--- a/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts
@@ -1,9 +1,12 @@
+import { PullWorkFolderRequestDto, PushWorkFolderRequestDto } from '@n8n/api-types';
+import type { SourceControlledFile } from '@n8n/api-types';
 import express from 'express';
 import type { PullResult } from 'simple-git';
 
-import { Get, Post, Patch, RestController, GlobalScope } from '@/decorators';
+import { Get, Post, Patch, RestController, GlobalScope, Body } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
+import { AuthenticatedRequest } from '@/requests';
 
 import { SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
 import {
@@ -17,7 +20,6 @@ import type { ImportResult } from './types/import-result';
 import { SourceControlRequest } from './types/requests';
 import { SourceControlGetStatus } from './types/source-control-get-status';
 import type { SourceControlPreferences } from './types/source-control-preferences';
-import type { SourceControlledFile } from './types/source-controlled-file';
 
 @RestController('/source-control')
 export class SourceControlController {
@@ -164,19 +166,16 @@ export class SourceControlController {
 	@Post('/push-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
 	@GlobalScope('sourceControl:push')
 	async pushWorkfolder(
-		req: SourceControlRequest.PushWorkFolder,
+		req: AuthenticatedRequest,
 		res: express.Response,
+		@Body payload: PushWorkFolderRequestDto,
 	): Promise<SourceControlledFile[]> {
-		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
-			throw new BadRequestError('Cannot push onto read-only branch.');
-		}
-
 		try {
 			await this.sourceControlService.setGitUserDetails(
 				`${req.user.firstName} ${req.user.lastName}`,
 				req.user.email,
 			);
-			const result = await this.sourceControlService.pushWorkfolder(req.body);
+			const result = await this.sourceControlService.pushWorkfolder(payload);
 			res.statusCode = result.statusCode;
 			return result.statusResult;
 		} catch (error) {
@@ -187,15 +186,12 @@ export class SourceControlController {
 	@Post('/pull-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
 	@GlobalScope('sourceControl:pull')
 	async pullWorkfolder(
-		req: SourceControlRequest.PullWorkFolder,
+		req: AuthenticatedRequest,
 		res: express.Response,
+		@Body payload: PullWorkFolderRequestDto,
 	): Promise<SourceControlledFile[] | ImportResult | PullResult | undefined> {
 		try {
-			const result = await this.sourceControlService.pullWorkfolder({
-				force: req.body.force,
-				variables: req.body.variables,
-				userId: req.user.id,
-			});
+			const result = await this.sourceControlService.pullWorkfolder(req.user, payload);
 			res.statusCode = result.statusCode;
 			return result.statusResult;
 		} catch (error) {
diff --git a/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
index 3952b6d6b5..2bd040ee3a 100644
--- a/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
@@ -1,3 +1,8 @@
+import type {
+	PullWorkFolderRequestDto,
+	PushWorkFolderRequestDto,
+	SourceControlledFile,
+} from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import { writeFileSync } from 'fs';
 import { Logger } from 'n8n-core';
@@ -34,10 +39,7 @@ import type { ExportableCredential } from './types/exportable-credential';
 import type { ImportResult } from './types/import-result';
 import type { SourceControlGetStatus } from './types/source-control-get-status';
 import type { SourceControlPreferences } from './types/source-control-preferences';
-import type { SourceControllPullOptions } from './types/source-control-pull-work-folder';
-import type { SourceControlPushWorkFolder } from './types/source-control-push-work-folder';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
-import type { SourceControlledFile } from './types/source-controlled-file';
 
 @Service()
 export class SourceControlService {
@@ -207,7 +209,7 @@ export class SourceControlService {
 		return;
 	}
 
-	async pushWorkfolder(options: SourceControlPushWorkFolder): Promise<{
+	async pushWorkfolder(options: PushWorkFolderRequestDto): Promise<{
 		statusCode: number;
 		pushResult: PushResult | undefined;
 		statusResult: SourceControlledFile[];
@@ -299,7 +301,7 @@ export class SourceControlService {
 			}
 		}
 
-		await this.gitService.commit(options.message ?? 'Updated Workfolder');
+		await this.gitService.commit(options.commitMessage ?? 'Updated Workfolder');
 
 		const pushResult = await this.gitService.push({
 			branch: this.sourceControlPreferencesService.getBranchName(),
@@ -320,8 +322,45 @@ export class SourceControlService {
 		};
 	}
 
+	private getConflicts(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((file) => file.conflict || file.status === 'modified');
+	}
+
+	private getWorkflowsToImport(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((e) => e.type === 'workflow' && e.status !== 'deleted');
+	}
+
+	private getWorkflowsToDelete(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((e) => e.type === 'workflow' && e.status === 'deleted');
+	}
+
+	private getCredentialsToImport(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((e) => e.type === 'credential' && e.status !== 'deleted');
+	}
+
+	private getCredentialsToDelete(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((e) => e.type === 'credential' && e.status === 'deleted');
+	}
+
+	private getTagsToImport(files: SourceControlledFile[]): SourceControlledFile | undefined {
+		return files.find((e) => e.type === 'tags' && e.status !== 'deleted');
+	}
+
+	private getTagsToDelete(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((e) => e.type === 'tags' && e.status === 'deleted');
+	}
+
+	private getVariablesToImport(files: SourceControlledFile[]): SourceControlledFile | undefined {
+		return files.find((e) => e.type === 'variables' && e.status !== 'deleted');
+	}
+
+	private getVariablesToDelete(files: SourceControlledFile[]): SourceControlledFile[] {
+		return files.filter((e) => e.type === 'variables' && e.status === 'deleted');
+	}
+
 	async pullWorkfolder(
-		options: SourceControllPullOptions,
+		user: User,
+		options: PullWorkFolderRequestDto,
 	): Promise<{ statusCode: number; statusResult: SourceControlledFile[] }> {
 		await this.sanityCheck();
 
@@ -331,58 +370,51 @@ export class SourceControlService {
 			preferLocalVersion: false,
 		})) as SourceControlledFile[];
 
-		// filter out items that will not effect a local change and thus should not
-		// trigger a conflict warning in the frontend
-		const filteredResult = statusResult.filter((e) => {
-			// locally created credentials will not create a conflict on pull
-			if (e.status === 'created' && e.location === 'local') {
-				return false;
-			}
-			// remotely deleted credentials will not delete local credentials
-			if (e.type === 'credential' && e.status === 'deleted') {
-				return false;
-			}
-			return true;
-		});
-
 		if (options.force !== true) {
-			const possibleConflicts = filteredResult?.filter(
-				(file) => (file.conflict || file.status === 'modified') && file.type === 'workflow',
-			);
+			const possibleConflicts = this.getConflicts(statusResult);
 			if (possibleConflicts?.length > 0) {
 				await this.gitService.resetBranch();
 				return {
 					statusCode: 409,
-					statusResult: filteredResult,
+					statusResult,
 				};
 			}
 		}
 
-		const workflowsToBeImported = statusResult.filter(
-			(e) => e.type === 'workflow' && e.status !== 'deleted',
-		);
+		const workflowsToBeImported = this.getWorkflowsToImport(statusResult);
 		await this.sourceControlImportService.importWorkflowFromWorkFolder(
 			workflowsToBeImported,
-			options.userId,
+			user.id,
 		);
-
-		const credentialsToBeImported = statusResult.filter(
-			(e) => e.type === 'credential' && e.status !== 'deleted',
+		const workflowsToBeDeleted = this.getWorkflowsToDelete(statusResult);
+		await this.sourceControlImportService.deleteWorkflowsNotInWorkfolder(
+			user,
+			workflowsToBeDeleted,
 		);
+		const credentialsToBeImported = this.getCredentialsToImport(statusResult);
 		await this.sourceControlImportService.importCredentialsFromWorkFolder(
 			credentialsToBeImported,
-			options.userId,
+			user.id,
+		);
+		const credentialsToBeDeleted = this.getCredentialsToDelete(statusResult);
+		await this.sourceControlImportService.deleteCredentialsNotInWorkfolder(
+			user,
+			credentialsToBeDeleted,
 		);
 
-		const tagsToBeImported = statusResult.find((e) => e.type === 'tags');
+		const tagsToBeImported = this.getTagsToImport(statusResult);
 		if (tagsToBeImported) {
 			await this.sourceControlImportService.importTagsFromWorkFolder(tagsToBeImported);
 		}
+		const tagsToBeDeleted = this.getTagsToDelete(statusResult);
+		await this.sourceControlImportService.deleteTagsNotInWorkfolder(tagsToBeDeleted);
 
-		const variablesToBeImported = statusResult.find((e) => e.type === 'variables');
+		const variablesToBeImported = this.getVariablesToImport(statusResult);
 		if (variablesToBeImported) {
 			await this.sourceControlImportService.importVariablesFromWorkFolder(variablesToBeImported);
 		}
+		const variablesToBeDeleted = this.getVariablesToDelete(statusResult);
+		await this.sourceControlImportService.deleteVariablesNotInWorkfolder(variablesToBeDeleted);
 
 		// #region Tracking Information
 		this.eventService.emit(
@@ -393,7 +425,7 @@ export class SourceControlService {
 
 		return {
 			statusCode: 200,
-			statusResult: filteredResult,
+			statusResult,
 		};
 	}
 
@@ -533,7 +565,7 @@ export class SourceControlService {
 				type: 'workflow',
 				status: options.direction === 'push' ? 'created' : 'deleted',
 				location: options.direction === 'push' ? 'local' : 'remote',
-				conflict: false,
+				conflict: options.direction === 'push' ? false : true,
 				file: item.filename,
 				updatedAt: item.updatedAt ?? new Date().toISOString(),
 			});
@@ -614,7 +646,7 @@ export class SourceControlService {
 				type: 'credential',
 				status: options.direction === 'push' ? 'created' : 'deleted',
 				location: options.direction === 'push' ? 'local' : 'remote',
-				conflict: false,
+				conflict: options.direction === 'push' ? false : true,
 				file: item.filename,
 				updatedAt: new Date().toISOString(),
 			});
@@ -666,26 +698,47 @@ export class SourceControlService {
 			}
 		});
 
-		if (
-			varMissingInLocal.length > 0 ||
-			varMissingInRemote.length > 0 ||
-			varModifiedInEither.length > 0
-		) {
-			if (options.direction === 'pull' && varRemoteIds.length === 0) {
-				// if there's nothing to pull, don't show difference as modified
-			} else {
-				sourceControlledFiles.push({
-					id: 'variables',
-					name: 'variables',
-					type: 'variables',
-					status: 'modified',
-					location: options.direction === 'push' ? 'local' : 'remote',
-					conflict: false,
-					file: getVariablesPath(this.gitFolder),
-					updatedAt: new Date().toISOString(),
-				});
-			}
-		}
+		varMissingInLocal.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.key,
+				type: 'variables',
+				status: options.direction === 'push' ? 'deleted' : 'created',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: getVariablesPath(this.gitFolder),
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
+		varMissingInRemote.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.key,
+				type: 'variables',
+				status: options.direction === 'push' ? 'created' : 'deleted',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				// if the we pull and the file is missing in the remote, we will delete
+				// it locally, which is communicated by marking this as a conflict
+				conflict: options.direction === 'push' ? false : true,
+				file: getVariablesPath(this.gitFolder),
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
+		varModifiedInEither.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.key,
+				type: 'variables',
+				status: 'modified',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: true,
+				file: getVariablesPath(this.gitFolder),
+				updatedAt: new Date().toISOString(),
+			});
+		});
+
 		return {
 			varMissingInLocal,
 			varMissingInRemote,
@@ -740,32 +793,44 @@ export class SourceControlService {
 				) === -1,
 		);
 
-		if (
-			tagsMissingInLocal.length > 0 ||
-			tagsMissingInRemote.length > 0 ||
-			tagsModifiedInEither.length > 0 ||
-			mappingsMissingInLocal.length > 0 ||
-			mappingsMissingInRemote.length > 0
-		) {
-			if (
-				options.direction === 'pull' &&
-				tagMappingsRemote.tags.length === 0 &&
-				tagMappingsRemote.mappings.length === 0
-			) {
-				// if there's nothing to pull, don't show difference as modified
-			} else {
-				sourceControlledFiles.push({
-					id: 'mappings',
-					name: 'tags',
-					type: 'tags',
-					status: 'modified',
-					location: options.direction === 'push' ? 'local' : 'remote',
-					conflict: false,
-					file: getTagsPath(this.gitFolder),
-					updatedAt: lastUpdatedTag[0]?.updatedAt.toISOString(),
-				});
-			}
-		}
+		tagsMissingInLocal.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name,
+				type: 'tags',
+				status: options.direction === 'push' ? 'deleted' : 'created',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: false,
+				file: getTagsPath(this.gitFolder),
+				updatedAt: lastUpdatedTag[0]?.updatedAt.toISOString(),
+			});
+		});
+		tagsMissingInRemote.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name,
+				type: 'tags',
+				status: options.direction === 'push' ? 'created' : 'deleted',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: options.direction === 'push' ? false : true,
+				file: getTagsPath(this.gitFolder),
+				updatedAt: lastUpdatedTag[0]?.updatedAt.toISOString(),
+			});
+		});
+
+		tagsModifiedInEither.forEach((item) => {
+			sourceControlledFiles.push({
+				id: item.id,
+				name: item.name,
+				type: 'tags',
+				status: 'modified',
+				location: options.direction === 'push' ? 'local' : 'remote',
+				conflict: true,
+				file: getTagsPath(this.gitFolder),
+				updatedAt: lastUpdatedTag[0]?.updatedAt.toISOString(),
+			});
+		});
+
 		return {
 			tagsMissingInLocal,
 			tagsMissingInRemote,
diff --git a/packages/cli/src/environments.ee/source-control/types/requests.ts b/packages/cli/src/environments.ee/source-control/types/requests.ts
index 4f5d583f40..75c6c1995d 100644
--- a/packages/cli/src/environments.ee/source-control/types/requests.ts
+++ b/packages/cli/src/environments.ee/source-control/types/requests.ts
@@ -5,9 +5,7 @@ import type { SourceControlDisconnect } from './source-control-disconnect';
 import type { SourceControlGenerateKeyPair } from './source-control-generate-key-pair';
 import type { SourceControlGetStatus } from './source-control-get-status';
 import type { SourceControlPreferences } from './source-control-preferences';
-import type { SourceControlPullWorkFolder } from './source-control-pull-work-folder';
 import type { SourceControlPush } from './source-control-push';
-import type { SourceControlPushWorkFolder } from './source-control-push-work-folder';
 import type { SourceControlSetBranch } from './source-control-set-branch';
 import type { SourceControlSetReadOnly } from './source-control-set-read-only';
 import type { SourceControlStage } from './source-control-stage';
@@ -20,8 +18,6 @@ export declare namespace SourceControlRequest {
 	type Stage = AuthenticatedRequest<{}, {}, SourceControlStage, {}>;
 	type Push = AuthenticatedRequest<{}, {}, SourceControlPush, {}>;
 	type Disconnect = AuthenticatedRequest<{}, {}, SourceControlDisconnect, {}>;
-	type PushWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPushWorkFolder, {}>;
-	type PullWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPullWorkFolder, {}>;
 	type GetStatus = AuthenticatedRequest<{}, {}, {}, SourceControlGetStatus>;
 	type GenerateKeyPair = AuthenticatedRequest<{}, {}, SourceControlGenerateKeyPair, {}>;
 }
diff --git a/packages/cli/src/environments.ee/source-control/types/source-control-pull-work-folder.ts b/packages/cli/src/environments.ee/source-control/types/source-control-pull-work-folder.ts
deleted file mode 100644
index b87c970f0e..0000000000
--- a/packages/cli/src/environments.ee/source-control/types/source-control-pull-work-folder.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator';
-
-export class SourceControlPullWorkFolder {
-	@IsBoolean()
-	@IsOptional()
-	force?: boolean;
-
-	@IsBoolean()
-	@IsOptional()
-	importAfterPull?: boolean = true;
-
-	@IsString({ each: true })
-	@IsOptional()
-	files?: Set<string>;
-
-	@IsObject()
-	@IsOptional()
-	variables?: { [key: string]: string };
-}
-
-export class SourceControllPullOptions {
-	/** ID of user performing a source control pull. */
-	userId: string;
-
-	force?: boolean;
-
-	variables?: { [key: string]: string };
-}
diff --git a/packages/cli/src/environments.ee/source-control/types/source-control-push-work-folder.ts b/packages/cli/src/environments.ee/source-control/types/source-control-push-work-folder.ts
deleted file mode 100644
index 55c8e178c4..0000000000
--- a/packages/cli/src/environments.ee/source-control/types/source-control-push-work-folder.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { IsBoolean, IsOptional, IsString } from 'class-validator';
-
-import type { SourceControlledFile } from './source-controlled-file';
-
-export class SourceControlPushWorkFolder {
-	@IsBoolean()
-	@IsOptional()
-	force?: boolean;
-
-	@IsString({ each: true })
-	fileNames: SourceControlledFile[];
-
-	@IsString()
-	@IsOptional()
-	message?: string;
-
-	@IsBoolean()
-	@IsOptional()
-	skipDiff?: boolean;
-}
diff --git a/packages/cli/src/environments.ee/source-control/types/source-controlled-file.ts b/packages/cli/src/environments.ee/source-control/types/source-controlled-file.ts
deleted file mode 100644
index 5bbf75921b..0000000000
--- a/packages/cli/src/environments.ee/source-control/types/source-controlled-file.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export type SourceControlledFileStatus =
-	| 'new'
-	| 'modified'
-	| 'deleted'
-	| 'created'
-	| 'renamed'
-	| 'conflicted'
-	| 'ignored'
-	| 'staged'
-	| 'unknown';
-export type SourceControlledFileLocation = 'local' | 'remote';
-export type SourceControlledFileType = 'credential' | 'workflow' | 'tags' | 'variables' | 'file';
-export type SourceControlledFile = {
-	file: string;
-	id: string;
-	name: string;
-	type: SourceControlledFileType;
-	status: SourceControlledFileStatus;
-	location: SourceControlledFileLocation;
-	conflict: boolean;
-	updatedAt: string;
-	pushed?: boolean;
-};
diff --git a/packages/cli/src/environments.ee/variables/environment-helpers.ts b/packages/cli/src/environments.ee/variables/environment-helpers.ts
deleted file mode 100644
index dd9a17c95b..0000000000
--- a/packages/cli/src/environments.ee/variables/environment-helpers.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Container } from '@n8n/di';
-
-import { License } from '@/license';
-
-export function isVariablesEnabled(): boolean {
-	const license = Container.get(License);
-	return license.isVariablesEnabled();
-}
-
-export function canCreateNewVariable(variableCount: number): boolean {
-	if (!isVariablesEnabled()) {
-		return false;
-	}
-	const license = Container.get(License);
-	// This defaults to -1 which is what we want if we've enabled
-	// variables via the config
-	const limit = license.getVariablesLimit();
-	if (limit === -1) {
-		return true;
-	}
-	return limit > variableCount;
-}
-
-export function getVariablesLimit(): number {
-	const license = Container.get(License);
-	return license.getVariablesLimit();
-}
diff --git a/packages/cli/src/environments.ee/variables/variables.service.ee.ts b/packages/cli/src/environments.ee/variables/variables.service.ee.ts
index ebb134efd3..f59880fe60 100644
--- a/packages/cli/src/environments.ee/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments.ee/variables/variables.service.ee.ts
@@ -1,4 +1,4 @@
-import { Container, Service } from '@n8n/di';
+import { Service } from '@n8n/di';
 
 import type { Variables } from '@/databases/entities/variables';
 import { VariablesRepository } from '@/databases/repositories/variables.repository';
@@ -6,23 +6,21 @@ import { generateNanoId } from '@/databases/utils/generators';
 import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
 import { VariableValidationError } from '@/errors/variable-validation.error';
 import { EventService } from '@/events/event.service';
+import { License } from '@/license';
 import { CacheService } from '@/services/cache/cache.service';
 
-import { canCreateNewVariable } from './environment-helpers';
-
 @Service()
 export class VariablesService {
 	constructor(
-		protected cacheService: CacheService,
-		protected variablesRepository: VariablesRepository,
+		private readonly cacheService: CacheService,
+		private readonly variablesRepository: VariablesRepository,
 		private readonly eventService: EventService,
+		private readonly license: License,
 	) {}
 
 	async getAllCached(state?: 'empty'): Promise<Variables[]> {
 		let variables = await this.cacheService.get('variables', {
-			async refreshFn() {
-				return await Container.get(VariablesService).findAll();
-			},
+			refreshFn: async () => await this.findAll(),
 		});
 
 		if (variables === undefined) {
@@ -77,7 +75,7 @@ export class VariablesService {
 	}
 
 	async create(variable: Omit<Variables, 'id'>): Promise<Variables> {
-		if (!canCreateNewVariable(await this.getCount())) {
+		if (!this.canCreateNewVariable(await this.getCount())) {
 			throw new VariableCountLimitReachedError('Variables limit reached');
 		}
 		this.validateVariable(variable);
@@ -100,4 +98,17 @@ export class VariablesService {
 		await this.updateCache();
 		return (await this.getCached(id))!;
 	}
+
+	private canCreateNewVariable(variableCount: number): boolean {
+		if (!this.license.isVariablesEnabled()) {
+			return false;
+		}
+		// This defaults to -1 which is what we want if we've enabled
+		// variables via the config
+		const limit = this.license.getVariablesLimit();
+		if (limit === -1) {
+			return true;
+		}
+		return limit > variableCount;
+	}
 }
diff --git a/packages/cli/src/errors/max-stalled-count.error.ts b/packages/cli/src/errors/max-stalled-count.error.ts
index 653ca18eac..38f73023a7 100644
--- a/packages/cli/src/errors/max-stalled-count.error.ts
+++ b/packages/cli/src/errors/max-stalled-count.error.ts
@@ -5,9 +5,12 @@ import { ApplicationError } from 'n8n-workflow';
  */
 export class MaxStalledCountError extends ApplicationError {
 	constructor(cause: Error) {
-		super('The execution has reached the maximum number of attempts and will no longer retry.', {
-			level: 'warning',
-			cause,
-		});
+		super(
+			'This execution failed to be processed too many times and will no longer retry. To allow this execution to complete, please break down your workflow or scale up your workers or adjust your worker settings.',
+			{
+				level: 'warning',
+				cause,
+			},
+		);
 	}
 }
diff --git a/packages/cli/src/errors/response-errors/not-implemented.error.ts b/packages/cli/src/errors/response-errors/not-implemented.error.ts
new file mode 100644
index 0000000000..f6c66391ff
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/not-implemented.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class NotImplementedError extends ResponseError {
+	constructor(message: string, hint: string | undefined = undefined) {
+		super(message, 501, 501, hint);
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts b/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts
index b7441a2763..36d9715acc 100644
--- a/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts
@@ -92,4 +92,8 @@ export declare namespace TestRunsRequest {
 	type GetOne = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
 
 	type Delete = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
+
+	type Cancel = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
+
+	type GetCases = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
 }
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
index cc3c3bc33b..7cfe7b3705 100644
--- a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
@@ -13,17 +13,23 @@ import type { TestMetric } from '@/databases/entities/test-metric.ee';
 import type { TestRun } from '@/databases/entities/test-run.ee';
 import type { User } from '@/databases/entities/user';
 import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { TestCaseExecutionRepository } from '@/databases/repositories/test-case-execution.repository.ee';
 import type { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
 import type { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
+import type { Telemetry } from '@/telemetry';
 import type { WorkflowRunner } from '@/workflow-runner';
-import { mockInstance } from '@test/mocking';
+import { mockInstance, mockLogger } from '@test/mocking';
 import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
 
 import { TestRunnerService } from '../test-runner.service.ee';
 
+jest.mock('@/db', () => ({
+	transaction: (cb: any) => cb(),
+}));
+
 const wfUnderTestJson = JSON.parse(
 	readFileSync(path.join(__dirname, './mock-data/workflow.under-test.json'), { encoding: 'utf-8' }),
 );
@@ -129,6 +135,16 @@ function mockEvaluationExecutionData(metrics: Record<string, GenericValue>) {
 	});
 }
 
+const errorReporter = mock<ErrorReporter>();
+const logger = mockLogger();
+const telemetry = mock<Telemetry>();
+
+async function mockLongExecutionPromise(data: IRun, delay: number): Promise<IRun> {
+	return await new Promise((resolve) => {
+		setTimeout(() => resolve(data), delay);
+	});
+}
+
 describe('TestRunnerService', () => {
 	const executionRepository = mock<ExecutionRepository>();
 	const workflowRepository = mock<WorkflowRepository>();
@@ -136,6 +152,7 @@ describe('TestRunnerService', () => {
 	const activeExecutions = mock<ActiveExecutions>();
 	const testRunRepository = mock<TestRunRepository>();
 	const testMetricRepository = mock<TestMetricRepository>();
+	const testCaseExecutionRepository = mock<TestCaseExecutionRepository>();
 
 	const mockNodeTypes = mockInstance(NodeTypes);
 	mockInstance(LoadNodesAndCredentials, {
@@ -165,25 +182,24 @@ describe('TestRunnerService', () => {
 	});
 
 	afterEach(() => {
-		activeExecutions.getPostExecutePromise.mockClear();
-		workflowRunner.run.mockClear();
-		testRunRepository.createTestRun.mockClear();
-		testRunRepository.markAsRunning.mockClear();
-		testRunRepository.markAsCompleted.mockClear();
+		jest.resetAllMocks();
 		testRunRepository.incrementFailed.mockClear();
 		testRunRepository.incrementPassed.mockClear();
 	});
 
 	test('should create an instance of TestRunnerService', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		expect(testRunnerService).toBeInstanceOf(TestRunnerService);
@@ -191,14 +207,17 @@ describe('TestRunnerService', () => {
 
 	test('should create and run test cases from past executions', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -229,14 +248,17 @@ describe('TestRunnerService', () => {
 
 	test('should run both workflow under test and evaluation workflow', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -330,14 +352,17 @@ describe('TestRunnerService', () => {
 
 	test('should properly count passed and failed executions', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -388,14 +413,17 @@ describe('TestRunnerService', () => {
 
 	test('should properly count failed test executions', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -442,14 +470,17 @@ describe('TestRunnerService', () => {
 
 	test('should properly count failed evaluations', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -500,14 +531,17 @@ describe('TestRunnerService', () => {
 
 	test('should specify correct start nodes when running workflow under test', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
@@ -574,14 +608,17 @@ describe('TestRunnerService', () => {
 
 	test('should properly choose trigger and start nodes', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		const startNodesData = (testRunnerService as any).getStartNodesData(
@@ -599,14 +636,17 @@ describe('TestRunnerService', () => {
 
 	test('should properly choose trigger and start nodes 2', async () => {
 		const testRunnerService = new TestRunnerService(
+			logger,
+			telemetry,
 			workflowRepository,
 			workflowRunner,
 			executionRepository,
 			activeExecutions,
 			testRunRepository,
+			testCaseExecutionRepository,
 			testMetricRepository,
 			mockNodeTypes,
-			mock<ErrorReporter>(),
+			errorReporter,
 		);
 
 		const startNodesData = (testRunnerService as any).getStartNodesData(
@@ -621,4 +661,89 @@ describe('TestRunnerService', () => {
 			}),
 		});
 	});
+
+	describe('Test Run cancellation', () => {
+		beforeAll(() => {
+			jest.useFakeTimers();
+		});
+
+		test('should cancel test run', async () => {
+			const testRunnerService = new TestRunnerService(
+				logger,
+				telemetry,
+				workflowRepository,
+				workflowRunner,
+				executionRepository,
+				activeExecutions,
+				testRunRepository,
+				testCaseExecutionRepository,
+				testMetricRepository,
+				mockNodeTypes,
+				errorReporter,
+			);
+
+			workflowRepository.findById.calledWith('workflow-under-test-id').mockResolvedValueOnce({
+				id: 'workflow-under-test-id',
+				...wfUnderTestJson,
+			});
+
+			workflowRepository.findById.calledWith('evaluation-workflow-id').mockResolvedValueOnce({
+				id: 'evaluation-workflow-id',
+				...wfEvaluationJson,
+			});
+
+			workflowRunner.run.mockResolvedValueOnce('some-execution-id');
+			workflowRunner.run.mockResolvedValueOnce('some-execution-id-2');
+			workflowRunner.run.mockResolvedValueOnce('some-execution-id-3');
+			workflowRunner.run.mockResolvedValueOnce('some-execution-id-4');
+
+			// Mock long execution of workflow under test
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id')
+				.mockReturnValue(mockLongExecutionPromise(mockExecutionData(), 1000));
+
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id-3')
+				.mockReturnValue(mockLongExecutionPromise(mockExecutionData(), 1000));
+
+			// Mock executions of evaluation workflow
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id-2')
+				.mockReturnValue(
+					mockLongExecutionPromise(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }), 1000),
+				);
+
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id-4')
+				.mockReturnValue(
+					mockLongExecutionPromise(mockEvaluationExecutionData({ metric1: 0.5 }), 1000),
+				);
+
+			// Do not await here to test canceling
+			void testRunnerService.runTest(
+				mock<User>(),
+				mock<TestDefinition>({
+					workflowId: 'workflow-under-test-id',
+					evaluationWorkflowId: 'evaluation-workflow-id',
+					mockedNodes: [{ id: '72256d90-3a67-4e29-b032-47df4e5768af' }],
+				}),
+			);
+
+			// Simulate the moment when first test case is running (wf under test execution)
+			await jest.advanceTimersByTimeAsync(100);
+			expect(workflowRunner.run).toHaveBeenCalledTimes(1);
+
+			const abortController = (testRunnerService as any).abortControllers.get('test-run-id');
+			expect(abortController).toBeDefined();
+
+			await testRunnerService.cancelTestRun('test-run-id');
+
+			expect(abortController.signal.aborted).toBe(true);
+			expect(activeExecutions.stopExecution).toBeCalledWith('some-execution-id');
+		});
+
+		afterAll(() => {
+			jest.useRealTimers();
+		});
+	});
 });
diff --git a/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts b/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts
index ab5c921f8c..cd320bd8da 100644
--- a/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts
@@ -9,12 +9,17 @@ export class EvaluationMetrics {
 		}
 	}
 
-	addResults(result: IDataObject) {
+	addResults(result: IDataObject): Record<string, number> {
+		const addedMetrics: Record<string, number> = {};
+
 		for (const [metricName, metricValue] of Object.entries(result)) {
 			if (typeof metricValue === 'number' && this.metricNames.has(metricName)) {
+				addedMetrics[metricName] = metricValue;
 				this.rawMetricsByName.get(metricName)!.push(metricValue);
 			}
 		}
+
+		return addedMetrics;
 	}
 
 	getAggregatedMetrics() {
diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
index 5a054a3527..09c4fe4ec6 100644
--- a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
@@ -1,7 +1,7 @@
 import { Service } from '@n8n/di';
 import { parse } from 'flatted';
-import { ErrorReporter } from 'n8n-core';
-import { NodeConnectionType, Workflow } from 'n8n-workflow';
+import { ErrorReporter, Logger } from 'n8n-core';
+import { ExecutionCancelledError, NodeConnectionType, Workflow } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IRun,
@@ -15,19 +15,32 @@ import assert from 'node:assert';
 import { ActiveExecutions } from '@/active-executions';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { MockedNodeItem, TestDefinition } from '@/databases/entities/test-definition.ee';
+import type { TestRun } from '@/databases/entities/test-run.ee';
 import type { User } from '@/databases/entities/user';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { TestCaseExecutionRepository } from '@/databases/repositories/test-case-execution.repository.ee';
 import { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
 import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import * as Db from '@/db';
 import { NodeTypes } from '@/node-types';
+import { Telemetry } from '@/telemetry';
 import { getRunData } from '@/workflow-execute-additional-data';
 import { WorkflowRunner } from '@/workflow-runner';
 
 import { EvaluationMetrics } from './evaluation-metrics.ee';
 import { createPinData, getPastExecutionTriggerNode } from './utils.ee';
 
+interface TestRunMetadata {
+	testRunId: string;
+	userId: string;
+}
+
+interface TestCaseRunMetadata extends TestRunMetadata {
+	pastExecutionId: string;
+}
+
 /**
  * This service orchestrates the running of test cases.
  * It uses the test definitions to find
@@ -38,12 +51,17 @@ import { createPinData, getPastExecutionTriggerNode } from './utils.ee';
  */
 @Service()
 export class TestRunnerService {
+	private abortControllers: Map<TestRun['id'], AbortController> = new Map();
+
 	constructor(
+		private readonly logger: Logger,
+		private readonly telemetry: Telemetry,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly workflowRunner: WorkflowRunner,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly testRunRepository: TestRunRepository,
+		private readonly testCaseExecutionRepository: TestCaseExecutionRepository,
 		private readonly testMetricRepository: TestMetricRepository,
 		private readonly nodeTypes: NodeTypes,
 		private readonly errorReporter: ErrorReporter,
@@ -99,8 +117,14 @@ export class TestRunnerService {
 		pastExecutionData: IRunExecutionData,
 		pastExecutionWorkflowData: IWorkflowBase,
 		mockedNodes: MockedNodeItem[],
-		userId: string,
+		metadata: TestCaseRunMetadata,
+		abortSignal: AbortSignal,
 	): Promise<IRun | undefined> {
+		// Do not run if the test run is cancelled
+		if (abortSignal.aborted) {
+			return;
+		}
+
 		// Create pin data from the past execution data
 		const pinData = createPinData(
 			workflow,
@@ -115,14 +139,27 @@ export class TestRunnerService {
 			executionMode: 'evaluation',
 			runData: {},
 			pinData,
-			workflowData: workflow,
-			userId,
+			workflowData: { ...workflow, pinData },
+			userId: metadata.userId,
+			partialExecutionVersion: 2,
 		};
 
 		// Trigger the workflow under test with mocked data
 		const executionId = await this.workflowRunner.run(data);
 		assert(executionId);
 
+		// Listen to the abort signal to stop the execution in case test run is cancelled
+		abortSignal.addEventListener('abort', () => {
+			this.activeExecutions.stopExecution(executionId);
+		});
+
+		// Update status of the test run execution mapping
+		await this.testCaseExecutionRepository.markAsRunning(
+			metadata.testRunId,
+			metadata.pastExecutionId,
+			executionId,
+		);
+
 		// Wait for the execution to finish
 		const executePromise = this.activeExecutions.getPostExecutePromise(executionId);
 
@@ -136,8 +173,14 @@ export class TestRunnerService {
 		evaluationWorkflow: WorkflowEntity,
 		expectedData: IRunData,
 		actualData: IRunData,
-		testRunId?: string,
+		abortSignal: AbortSignal,
+		metadata: TestCaseRunMetadata,
 	) {
+		// Do not run if the test run is cancelled
+		if (abortSignal.aborted) {
+			return;
+		}
+
 		// Prepare the evaluation wf input data.
 		// Provide both the expected data and the actual data
 		const evaluationInputData = {
@@ -149,19 +192,24 @@ export class TestRunnerService {
 
 		// Prepare the data to run the evaluation workflow
 		const data = await getRunData(evaluationWorkflow, [evaluationInputData]);
-		// FIXME: This is a hack to add the testRunId to the evaluation workflow execution data
-		// So that we can fetch all execution runs for a test run
-		if (testRunId && data.executionData) {
-			data.executionData.resultData.metadata = {
-				testRunId,
-			};
-		}
 		data.executionMode = 'evaluation';
 
 		// Trigger the evaluation workflow
 		const executionId = await this.workflowRunner.run(data);
 		assert(executionId);
 
+		// Listen to the abort signal to stop the execution in case test run is cancelled
+		abortSignal.addEventListener('abort', () => {
+			this.activeExecutions.stopExecution(executionId);
+		});
+
+		// Update status of the test run execution mapping
+		await this.testCaseExecutionRepository.markAsEvaluationRunning(
+			metadata.testRunId,
+			metadata.pastExecutionId,
+			executionId,
+		);
+
 		// Wait for the execution to finish
 		const executePromise = this.activeExecutions.getPostExecutePromise(executionId);
 
@@ -203,6 +251,8 @@ export class TestRunnerService {
 	 * Creates a new test run for the given test definition.
 	 */
 	async runTest(user: User, test: TestDefinition): Promise<void> {
+		this.logger.debug('Starting new test run', { testId: test.id });
+
 		const workflow = await this.workflowRepository.findById(test.workflowId);
 		assert(workflow, 'Workflow not found');
 
@@ -213,89 +263,224 @@ export class TestRunnerService {
 		const testRun = await this.testRunRepository.createTestRun(test.id);
 		assert(testRun, 'Unable to create a test run');
 
-		// 1. Make test cases from previous executions
+		// 0.1 Initialize AbortController
+		const abortController = new AbortController();
+		this.abortControllers.set(testRun.id, abortController);
 
-		// Select executions with the annotation tag and workflow ID of the test.
-		// Fetch only ids to reduce the data transfer.
-		const pastExecutions: ReadonlyArray<Pick<ExecutionEntity, 'id'>> =
-			await this.executionRepository
-				.createQueryBuilder('execution')
-				.select('execution.id')
-				.leftJoin('execution.annotation', 'annotation')
-				.leftJoin('annotation.tags', 'annotationTag')
-				.where('annotationTag.id = :tagId', { tagId: test.annotationTagId })
-				.andWhere('execution.workflowId = :workflowId', { workflowId: test.workflowId })
-				.getMany();
+		// 0.2 Initialize metadata
+		// This will be passed to the test case executions
+		const testRunMetadata = {
+			testRunId: testRun.id,
+			userId: user.id,
+		};
 
-		// Get the metrics to collect from the evaluation workflow
-		const testMetricNames = await this.getTestMetricNames(test.id);
+		const abortSignal = abortController.signal;
+		try {
+			///
+			// 1. Make test cases from previous executions
+			///
 
-		// 2. Run over all the test cases
+			// Select executions with the annotation tag and workflow ID of the test.
+			// Fetch only ids to reduce the data transfer.
+			const pastExecutions: ReadonlyArray<Pick<ExecutionEntity, 'id'>> =
+				await this.executionRepository
+					.createQueryBuilder('execution')
+					.select('execution.id')
+					.leftJoin('execution.annotation', 'annotation')
+					.leftJoin('annotation.tags', 'annotationTag')
+					.where('annotationTag.id = :tagId', { tagId: test.annotationTagId })
+					.andWhere('execution.workflowId = :workflowId', { workflowId: test.workflowId })
+					.getMany();
 
-		await this.testRunRepository.markAsRunning(testRun.id, pastExecutions.length);
+			this.logger.debug('Found past executions', { count: pastExecutions.length });
 
-		// Object to collect the results of the evaluation workflow executions
-		const metrics = new EvaluationMetrics(testMetricNames);
+			// Add all past executions mappings to the test run.
+			// This will be used to track the status of each test case and keep the connection between test run and all related executions (past, current, and evaluation).
+			await this.testCaseExecutionRepository.createBatch(
+				testRun.id,
+				pastExecutions.map((e) => e.id),
+			);
 
-		for (const { id: pastExecutionId } of pastExecutions) {
-			try {
-				// Fetch past execution with data
-				const pastExecution = await this.executionRepository.findOne({
-					where: { id: pastExecutionId },
-					relations: ['executionData', 'metadata'],
-				});
-				assert(pastExecution, 'Execution not found');
+			// Get the metrics to collect from the evaluation workflow
+			const testMetricNames = await this.getTestMetricNames(test.id);
 
-				const executionData = parse(pastExecution.executionData.data) as IRunExecutionData;
+			// 2. Run over all the test cases
+			const pastExecutionIds = pastExecutions.map((e) => e.id);
 
-				// Run the test case and wait for it to finish
-				const testCaseExecution = await this.runTestCase(
-					workflow,
-					executionData,
-					pastExecution.executionData.workflowData,
-					test.mockedNodes,
-					user.id,
-				);
+			// Update test run status
+			await this.testRunRepository.markAsRunning(testRun.id, pastExecutions.length);
 
-				// In case of a permission check issue, the test case execution will be undefined.
-				// Skip them, increment the failed count and continue with the next test case
-				if (!testCaseExecution) {
-					await this.testRunRepository.incrementFailed(testRun.id);
-					continue;
+			this.telemetry.track('User runs test', {
+				user_id: user.id,
+				test_id: test.id,
+				run_id: testRun.id,
+				executions_ids: pastExecutionIds,
+				workflow_id: test.workflowId,
+				evaluation_workflow_id: test.evaluationWorkflowId,
+			});
+
+			// Initialize object to collect the results of the evaluation workflow executions
+			const metrics = new EvaluationMetrics(testMetricNames);
+
+			///
+			// 2. Run over all the test cases
+			///
+
+			for (const pastExecutionId of pastExecutionIds) {
+				if (abortSignal.aborted) {
+					this.logger.debug('Test run was cancelled', {
+						testId: test.id,
+						stoppedOn: pastExecutionId,
+					});
+					break;
 				}
 
-				// Collect the results of the test case execution
-				const testCaseRunData = testCaseExecution.data.resultData.runData;
+				this.logger.debug('Running test case', { pastExecutionId });
 
-				// Get the original runData from the test case execution data
-				const originalRunData = executionData.resultData.runData;
+				try {
+					// Fetch past execution with data
+					const pastExecution = await this.executionRepository.findOne({
+						where: { id: pastExecutionId },
+						relations: ['executionData', 'metadata'],
+					});
+					assert(pastExecution, 'Execution not found');
 
-				// Run the evaluation workflow with the original and new run data
-				const evalExecution = await this.runTestCaseEvaluation(
-					evaluationWorkflow,
-					originalRunData,
-					testCaseRunData,
-					testRun.id,
-				);
-				assert(evalExecution);
+					const executionData = parse(pastExecution.executionData.data) as IRunExecutionData;
 
-				metrics.addResults(this.extractEvaluationResult(evalExecution));
+					const testCaseMetadata = {
+						...testRunMetadata,
+						pastExecutionId,
+					};
 
-				if (evalExecution.data.resultData.error) {
-					await this.testRunRepository.incrementFailed(testRun.id);
-				} else {
-					await this.testRunRepository.incrementPassed(testRun.id);
+					// Run the test case and wait for it to finish
+					const testCaseExecution = await this.runTestCase(
+						workflow,
+						executionData,
+						pastExecution.executionData.workflowData,
+						test.mockedNodes,
+						testCaseMetadata,
+						abortSignal,
+					);
+
+					this.logger.debug('Test case execution finished', { pastExecutionId });
+
+					// In case of a permission check issue, the test case execution will be undefined.
+					// Skip them, increment the failed count and continue with the next test case
+					if (!testCaseExecution) {
+						await Db.transaction(async (trx) => {
+							await this.testRunRepository.incrementFailed(testRun.id, trx);
+							await this.testCaseExecutionRepository.markAsFailed(testRun.id, pastExecutionId, trx);
+						});
+						continue;
+					}
+
+					// Update status of the test case execution mapping entry in case of an error
+					if (testCaseExecution.data.resultData.error) {
+						await this.testCaseExecutionRepository.markAsFailed(testRun.id, pastExecutionId);
+					}
+
+					// Collect the results of the test case execution
+					const testCaseRunData = testCaseExecution.data.resultData.runData;
+
+					// Get the original runData from the test case execution data
+					const originalRunData = executionData.resultData.runData;
+
+					// Run the evaluation workflow with the original and new run data
+					const evalExecution = await this.runTestCaseEvaluation(
+						evaluationWorkflow,
+						originalRunData,
+						testCaseRunData,
+						abortSignal,
+						testCaseMetadata,
+					);
+					assert(evalExecution);
+
+					this.logger.debug('Evaluation execution finished', { pastExecutionId });
+
+					// Extract the output of the last node executed in the evaluation workflow
+					const addedMetrics = metrics.addResults(this.extractEvaluationResult(evalExecution));
+
+					if (evalExecution.data.resultData.error) {
+						await Db.transaction(async (trx) => {
+							await this.testRunRepository.incrementFailed(testRun.id, trx);
+							await this.testCaseExecutionRepository.markAsFailed(testRun.id, pastExecutionId, trx);
+						});
+					} else {
+						await Db.transaction(async (trx) => {
+							await this.testRunRepository.incrementPassed(testRun.id, trx);
+							await this.testCaseExecutionRepository.markAsCompleted(
+								testRun.id,
+								pastExecutionId,
+								addedMetrics,
+								trx,
+							);
+						});
+					}
+				} catch (e) {
+					// In case of an unexpected error, increment the failed count and continue with the next test case
+					await Db.transaction(async (trx) => {
+						await this.testRunRepository.incrementFailed(testRun.id, trx);
+						await this.testCaseExecutionRepository.markAsFailed(testRun.id, pastExecutionId, trx);
+					});
+
+					this.errorReporter.error(e);
 				}
-			} catch (e) {
-				// In case of an unexpected error, increment the failed count and continue with the next test case
-				await this.testRunRepository.incrementFailed(testRun.id);
-
-				this.errorReporter.error(e);
 			}
+
+			// Mark the test run as completed or cancelled
+			if (abortSignal.aborted) {
+				await Db.transaction(async (trx) => {
+					await this.testRunRepository.markAsCancelled(testRun.id, trx);
+					await this.testCaseExecutionRepository.markAllPendingAsCancelled(testRun.id, trx);
+				});
+			} else {
+				const aggregatedMetrics = metrics.getAggregatedMetrics();
+				await this.testRunRepository.markAsCompleted(testRun.id, aggregatedMetrics);
+
+				this.logger.debug('Test run finished', { testId: test.id });
+			}
+		} catch (e) {
+			if (e instanceof ExecutionCancelledError) {
+				this.logger.debug('Evaluation execution was cancelled. Cancelling test run', {
+					testRunId: testRun.id,
+					stoppedOn: e.extra?.executionId,
+				});
+
+				await Db.transaction(async (trx) => {
+					await this.testRunRepository.markAsCancelled(testRun.id, trx);
+					await this.testCaseExecutionRepository.markAllPendingAsCancelled(testRun.id, trx);
+				});
+			} else {
+				throw e;
+			}
+		} finally {
+			// Clean up abort controller
+			this.abortControllers.delete(testRun.id);
 		}
+	}
 
-		const aggregatedMetrics = metrics.getAggregatedMetrics();
+	/**
+	 * Checks if the test run in a cancellable state.
+	 */
+	canBeCancelled(testRun: TestRun) {
+		return testRun.status !== 'running' && testRun.status !== 'new';
+	}
 
-		await this.testRunRepository.markAsCompleted(testRun.id, aggregatedMetrics);
+	/**
+	 * Cancels the test run with the given ID.
+	 * TODO: Implement the cancellation of the test run in a multi-main scenario
+	 */
+	async cancelTestRun(testRunId: string) {
+		const abortController = this.abortControllers.get(testRunId);
+		if (abortController) {
+			abortController.abort();
+			this.abortControllers.delete(testRunId);
+		} else {
+			// If there is no abort controller - just mark the test run and all its' pending test case executions as cancelled
+			await Db.transaction(async (trx) => {
+				await this.testRunRepository.markAsCancelled(testRunId, trx);
+				await this.testCaseExecutionRepository.markAllPendingAsCancelled(testRunId, trx);
+			});
+		}
 	}
 }
diff --git a/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts b/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts
index aae71376e4..61853e6e42 100644
--- a/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts
+++ b/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts
@@ -1,7 +1,14 @@
+import express from 'express';
+import { InstanceSettings } from 'n8n-core';
+
+import { TestCaseExecutionRepository } from '@/databases/repositories/test-case-execution.repository.ee';
 import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
-import { Delete, Get, RestController } from '@/decorators';
+import { Delete, Get, Post, RestController } from '@/decorators';
+import { ConflictError } from '@/errors/response-errors/conflict.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { NotImplementedError } from '@/errors/response-errors/not-implemented.error';
 import { TestRunsRequest } from '@/evaluation.ee/test-definitions.types.ee';
+import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee';
 import { listQueryMiddleware } from '@/middlewares';
 import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service';
 
@@ -12,9 +19,13 @@ export class TestRunsController {
 	constructor(
 		private readonly testDefinitionService: TestDefinitionService,
 		private readonly testRunRepository: TestRunRepository,
+		private readonly testCaseExecutionRepository: TestCaseExecutionRepository,
+		private readonly testRunnerService: TestRunnerService,
+		private readonly instanceSettings: InstanceSettings,
 	) {}
 
-	/** This method is used in multiple places in the controller to get the test definition
+	/**
+	 * This method is used in multiple places in the controller to get the test definition
 	 * (or just check that it exists and the user has access to it).
 	 */
 	private async getTestDefinition(
@@ -34,6 +45,23 @@ export class TestRunsController {
 		return testDefinition;
 	}
 
+	/**
+	 * Get the test run (or just check that it exists and the user has access to it)
+	 */
+	private async getTestRun(
+		req: TestRunsRequest.GetOne | TestRunsRequest.Delete | TestRunsRequest.Cancel,
+	) {
+		const { id: testRunId, testDefinitionId } = req.params;
+
+		const testRun = await this.testRunRepository.findOne({
+			where: { id: testRunId, testDefinition: { id: testDefinitionId } },
+		});
+
+		if (!testRun) throw new NotFoundError('Test run not found');
+
+		return testRun;
+	}
+
 	@Get('/:testDefinitionId/runs', { middlewares: listQueryMiddleware })
 	async getMany(req: TestRunsRequest.GetMany) {
 		const { testDefinitionId } = req.params;
@@ -45,33 +73,53 @@ export class TestRunsController {
 
 	@Get('/:testDefinitionId/runs/:id')
 	async getOne(req: TestRunsRequest.GetOne) {
-		const { id: testRunId, testDefinitionId } = req.params;
-
 		await this.getTestDefinition(req);
 
-		const testRun = await this.testRunRepository.findOne({
-			where: { id: testRunId, testDefinition: { id: testDefinitionId } },
+		return await this.getTestRun(req);
+	}
+
+	@Get('/:testDefinitionId/runs/:id/cases')
+	async getTestCases(req: TestRunsRequest.GetCases) {
+		await this.getTestDefinition(req);
+		await this.getTestRun(req);
+
+		return await this.testCaseExecutionRepository.find({
+			where: { testRun: { id: req.params.id } },
 		});
-
-		if (!testRun) throw new NotFoundError('Test run not found');
-
-		return testRun;
 	}
 
 	@Delete('/:testDefinitionId/runs/:id')
 	async delete(req: TestRunsRequest.Delete) {
-		const { id: testRunId, testDefinitionId } = req.params;
+		const { id: testRunId } = req.params;
 
+		// Check test definition and test run exist
 		await this.getTestDefinition(req);
-
-		const testRun = await this.testRunRepository.findOne({
-			where: { id: testRunId, testDefinition: { id: testDefinitionId } },
-		});
-
-		if (!testRun) throw new NotFoundError('Test run not found');
+		await this.getTestRun(req);
 
 		await this.testRunRepository.delete({ id: testRunId });
 
 		return { success: true };
 	}
+
+	@Post('/:testDefinitionId/runs/:id/cancel')
+	async cancel(req: TestRunsRequest.Cancel, res: express.Response) {
+		if (this.instanceSettings.isMultiMain) {
+			throw new NotImplementedError('Cancelling test runs is not yet supported in multi-main mode');
+		}
+
+		const { id: testRunId } = req.params;
+
+		// Check test definition and test run exist
+		await this.getTestDefinition(req);
+		const testRun = await this.getTestRun(req);
+
+		if (this.testRunnerService.canBeCancelled(testRun)) {
+			const message = `The test run "${testRunId}" cannot be cancelled`;
+			throw new ConflictError(message);
+		}
+
+		await this.testRunnerService.cancelTestRun(testRunId);
+
+		res.status(202).json({ success: true });
+	}
 }
diff --git a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
index 4727c8ef72..1729509210 100644
--- a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
@@ -934,6 +934,7 @@ describe('LogStreamingEventRelay', () => {
 		it('should log on `execution-throttled` event', () => {
 			const event: RelayEventMap['execution-throttled'] = {
 				executionId: 'exec123456',
+				type: 'production',
 			};
 
 			eventService.emit('execution-throttled', event);
@@ -942,6 +943,7 @@ describe('LogStreamingEventRelay', () => {
 				eventName: 'n8n.execution.throttled',
 				payload: {
 					executionId: 'exec123456',
+					type: 'production',
 				},
 			});
 		});
diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index 01673cd375..8f73b475ca 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -1155,22 +1155,6 @@ describe('TelemetryEventRelay', () => {
 			expect(telemetry.trackWorkflowExecution).not.toHaveBeenCalled();
 		});
 
-		it('should not track when execution status is "waiting"', async () => {
-			const event: RelayEventMap['workflow-post-execute'] = {
-				workflow: mockWorkflowBase,
-				executionId: 'execution123',
-				userId: 'user123',
-				runData: {
-					status: 'waiting',
-					data: { resultData: {} },
-				} as IRun,
-			};
-
-			eventService.emit('workflow-post-execute', event);
-
-			expect(telemetry.trackWorkflowExecution).not.toHaveBeenCalled();
-		});
-
 		it('should track successful workflow execution', async () => {
 			const runData = mock<IRun>({
 				finished: true,
diff --git a/packages/cli/src/events/maps/relay.event-map.ts b/packages/cli/src/events/maps/relay.event-map.ts
index 0e72564571..b174c66587 100644
--- a/packages/cli/src/events/maps/relay.event-map.ts
+++ b/packages/cli/src/events/maps/relay.event-map.ts
@@ -1,4 +1,4 @@
-import type { AuthenticationMethod } from '@n8n/api-types';
+import type { AuthenticationMethod, ProjectRelation } from '@n8n/api-types';
 import type {
 	IPersonalizationSurveyAnswersV4,
 	IRun,
@@ -6,8 +6,8 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
 
+import type { ConcurrencyQueueType } from '@/concurrency/concurrency-control.service';
 import type { AuthProviderType } from '@/databases/entities/auth-identity';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { GlobalRole, User } from '@/databases/entities/user';
 import type { IWorkflowDb } from '@/interfaces';
 
@@ -338,6 +338,7 @@ export type RelayEventMap = {
 
 	'execution-throttled': {
 		executionId: string;
+		type: ConcurrencyQueueType;
 	};
 
 	'execution-started-during-bootup': {
@@ -351,10 +352,7 @@ export type RelayEventMap = {
 	'team-project-updated': {
 		userId: string;
 		role: GlobalRole;
-		members: Array<{
-			userId: string;
-			role: ProjectRole;
-		}>;
+		members: ProjectRelation[];
 		projectId: string;
 	};
 
diff --git a/packages/cli/src/events/relays/log-streaming.event-relay.ts b/packages/cli/src/events/relays/log-streaming.event-relay.ts
index b048b09a83..76b578451d 100644
--- a/packages/cli/src/events/relays/log-streaming.event-relay.ts
+++ b/packages/cli/src/events/relays/log-streaming.event-relay.ts
@@ -385,10 +385,10 @@ export class LogStreamingEventRelay extends EventRelay {
 
 	// #region Execution
 
-	private executionThrottled({ executionId }: RelayEventMap['execution-throttled']) {
+	private executionThrottled({ executionId, type }: RelayEventMap['execution-throttled']) {
 		void this.eventBus.sendExecutionEvent({
 			eventName: 'n8n.execution.throttled',
-			payload: { executionId },
+			payload: { executionId, type },
 		});
 	}
 
diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
index 67fbacb107..f8102f70ae 100644
--- a/packages/cli/src/events/relays/telemetry.event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -15,7 +15,7 @@ import { SharedWorkflowRepository } from '@/databases/repositories/shared-workfl
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';
 import type { RelayEventMap } from '@/events/maps/relay.event-map';
-import { determineFinalExecutionStatus } from '@/execution-lifecycle-hooks/shared/shared-hook-functions';
+import { determineFinalExecutionStatus } from '@/execution-lifecycle/shared/shared-hook-functions';
 import type { IExecutionTrackProperties } from '@/interfaces';
 import { License } from '@/license';
 import { NodeTypes } from '@/node-types';
@@ -600,11 +600,6 @@ export class TelemetryEventRelay extends EventRelay {
 			return;
 		}
 
-		if (runData?.status === 'waiting') {
-			// No need to send telemetry or logs when the workflow hasn't finished yet.
-			return;
-		}
-
 		const telemetryProperties: IExecutionTrackProperties = {
 			workflow_id: workflow.id,
 			is_manual: false,
@@ -701,6 +696,7 @@ export class TelemetryEventRelay extends EventRelay {
 					sharing_role: userRole,
 					credential_type: null,
 					is_managed: false,
+					...TelemetryHelpers.resolveAIMetrics(workflow.nodes, this.nodeTypes),
 				};
 
 				if (!manualExecEventProperties.node_graph_string) {
diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
deleted file mode 100644
index ac52cf3920..0000000000
--- a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { ErrorReporter } from 'n8n-core';
-import { Logger } from 'n8n-core';
-import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
-
-import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { saveExecutionProgress } from '@/execution-lifecycle-hooks/save-execution-progress';
-import * as fnModule from '@/execution-lifecycle-hooks/to-save-settings';
-import type { IExecutionResponse } from '@/interfaces';
-import { mockInstance } from '@test/mocking';
-
-mockInstance(Logger);
-const errorReporter = mockInstance(ErrorReporter);
-const executionRepository = mockInstance(ExecutionRepository);
-
-afterEach(() => {
-	jest.clearAllMocks();
-});
-
-const commonArgs: [IWorkflowBase, string, string, ITaskData, IRunExecutionData, string] = [
-	{} as IWorkflowBase,
-	'some-execution-id',
-	'My Node',
-	{} as ITaskData,
-	{} as IRunExecutionData,
-	'some-session-id',
-];
-
-const commonSettings = { error: true, success: true, manual: true };
-
-test('should ignore if save settings say so', async () => {
-	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
-		...commonSettings,
-		progress: false,
-	});
-
-	await saveExecutionProgress(...commonArgs);
-
-	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
-});
-
-test('should ignore on leftover async call', async () => {
-	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
-		...commonSettings,
-		progress: true,
-	});
-
-	executionRepository.findSingleExecution.mockResolvedValue({
-		finished: true,
-	} as IExecutionResponse);
-
-	await saveExecutionProgress(...commonArgs);
-
-	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
-});
-
-test('should update execution when saving progress is enabled', async () => {
-	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
-		...commonSettings,
-		progress: true,
-	});
-
-	executionRepository.findSingleExecution.mockResolvedValue({} as IExecutionResponse);
-
-	await saveExecutionProgress(...commonArgs);
-
-	expect(executionRepository.updateExistingExecution).toHaveBeenCalledWith('some-execution-id', {
-		data: {
-			executionData: undefined,
-			resultData: {
-				lastNodeExecuted: 'My Node',
-				runData: {
-					'My Node': [{}],
-				},
-			},
-			startData: {},
-		},
-		status: 'running',
-	});
-
-	expect(errorReporter.error).not.toHaveBeenCalled();
-});
-
-test('should report error on failure', async () => {
-	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
-		...commonSettings,
-		progress: true,
-	});
-
-	const error = new Error('Something went wrong');
-
-	executionRepository.findSingleExecution.mockImplementation(() => {
-		throw error;
-	});
-
-	await saveExecutionProgress(...commonArgs);
-
-	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
-	expect(errorReporter.error).toHaveBeenCalledWith(error);
-});
diff --git a/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts b/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts
new file mode 100644
index 0000000000..747cd775c0
--- /dev/null
+++ b/packages/cli/src/execution-lifecycle/__tests__/execution-lifecycle-hooks.test.ts
@@ -0,0 +1,738 @@
+import { stringify } from 'flatted';
+import { mock } from 'jest-mock-extended';
+import {
+	BinaryDataService,
+	ErrorReporter,
+	InstanceSettings,
+	Logger,
+	ExecutionLifecycleHooks,
+} from 'n8n-core';
+import { ExpressionError } from 'n8n-workflow';
+import type {
+	IRunExecutionData,
+	ITaskData,
+	Workflow,
+	IDataObject,
+	IRun,
+	INode,
+	IWorkflowBase,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+import config from '@/config';
+import type { Project } from '@/databases/entities/project';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { EventService } from '@/events/event.service';
+import { ExternalHooks } from '@/external-hooks';
+import { Push } from '@/push';
+import { OwnershipService } from '@/services/ownership.service';
+import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
+import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
+import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
+import { mockInstance } from '@test/mocking';
+
+import {
+	getLifecycleHooksForSubExecutions,
+	getLifecycleHooksForRegularMain,
+	getLifecycleHooksForScalingWorker,
+	getLifecycleHooksForScalingMain,
+} from '../execution-lifecycle-hooks';
+
+describe('Execution Lifecycle Hooks', () => {
+	mockInstance(Logger);
+	mockInstance(InstanceSettings);
+	const errorReporter = mockInstance(ErrorReporter);
+	const eventService = mockInstance(EventService);
+	const executionRepository = mockInstance(ExecutionRepository);
+	const externalHooks = mockInstance(ExternalHooks);
+	const push = mockInstance(Push);
+	const workflowStaticDataService = mockInstance(WorkflowStaticDataService);
+	const workflowStatisticsService = mockInstance(WorkflowStatisticsService);
+	const binaryDataService = mockInstance(BinaryDataService);
+	const ownershipService = mockInstance(OwnershipService);
+	const workflowExecutionService = mockInstance(WorkflowExecutionService);
+
+	const nodeName = 'Test Node';
+	const node = mock<INode>();
+	const workflowId = 'test-workflow-id';
+	const executionId = 'test-execution-id';
+	const workflowData: IWorkflowBase = {
+		id: workflowId,
+		name: 'Test Workflow',
+		active: true,
+		connections: {},
+		nodes: [],
+		settings: {},
+		createdAt: new Date(),
+		updatedAt: new Date(),
+	};
+	const workflow = mock<Workflow>();
+	const staticData = mock<IDataObject>();
+	const taskData = mock<ITaskData>();
+	const runExecutionData = mock<IRunExecutionData>();
+	const successfulRun = mock<IRun>({
+		status: 'success',
+		finished: true,
+		waitTill: undefined,
+	});
+	const failedRun = mock<IRun>({
+		status: 'error',
+		finished: true,
+		waitTill: undefined,
+	});
+	const waitingRun = mock<IRun>({
+		finished: true,
+		status: 'waiting',
+		waitTill: new Date(),
+	});
+	const expressionError = new ExpressionError('Error');
+	const pushRef = 'test-push-ref';
+	const retryOf = 'test-retry-of';
+
+	const now = new Date('2025-01-13T18:25:50.267Z');
+	jest.useFakeTimers({ now });
+
+	let lifecycleHooks: ExecutionLifecycleHooks;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		workflowData.settings = {};
+		successfulRun.data = {
+			resultData: {
+				runData: {},
+			},
+		};
+		failedRun.data = {
+			resultData: {
+				runData: {},
+				error: expressionError,
+			},
+		};
+	});
+
+	const workflowEventTests = () => {
+		describe('workflowExecuteBefore', () => {
+			it('should emit workflow-pre-execute events', async () => {
+				await lifecycleHooks.runHook('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(eventService.emit).toHaveBeenCalledWith('workflow-pre-execute', {
+					executionId,
+					data: workflowData,
+				});
+			});
+		});
+
+		describe('workflowExecuteAfter', () => {
+			it('should emit workflow-post-execute events', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(eventService.emit).toHaveBeenCalledWith('workflow-post-execute', {
+					executionId,
+					runData: successfulRun,
+					workflow: workflowData,
+				});
+			});
+
+			it('should not emit workflow-post-execute events for waiting executions', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [waitingRun, {}]);
+
+				expect(eventService.emit).not.toHaveBeenCalledWith('workflow-post-execute');
+			});
+		});
+	};
+
+	const nodeEventsTests = () => {
+		describe('nodeExecuteBefore', () => {
+			it('should emit node-pre-execute event', async () => {
+				await lifecycleHooks.runHook('nodeExecuteBefore', [nodeName]);
+
+				expect(eventService.emit).toHaveBeenCalledWith('node-pre-execute', {
+					executionId,
+					workflow: workflowData,
+					nodeName,
+				});
+			});
+		});
+
+		describe('nodeExecuteAfter', () => {
+			it('should emit node-post-execute event', async () => {
+				await lifecycleHooks.runHook('nodeExecuteAfter', [nodeName, taskData, runExecutionData]);
+
+				expect(eventService.emit).toHaveBeenCalledWith('node-post-execute', {
+					executionId,
+					workflow: workflowData,
+					nodeName,
+				});
+			});
+		});
+	};
+
+	const externalHooksTests = () => {
+		describe('workflowExecuteBefore', () => {
+			it('should run workflow.preExecute hook', async () => {
+				await lifecycleHooks.runHook('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(externalHooks.run).toHaveBeenCalledWith('workflow.preExecute', [workflow, 'manual']);
+			});
+		});
+
+		describe('workflowExecuteAfter', () => {
+			it('should run workflow.postExecute hook', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(externalHooks.run).toHaveBeenCalledWith('workflow.postExecute', [
+					successfulRun,
+					workflowData,
+					executionId,
+				]);
+			});
+		});
+	};
+
+	const statisticsTests = () => {
+		describe('statistics events', () => {
+			it('workflowExecuteAfter should emit workflowExecutionCompleted statistics event', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(workflowStatisticsService.emit).toHaveBeenCalledWith('workflowExecutionCompleted', {
+					workflowData,
+					fullRunData: successfulRun,
+				});
+			});
+
+			it('nodeFetchedData should handle nodeFetchedData statistics event', async () => {
+				await lifecycleHooks.runHook('nodeFetchedData', [workflowId, node]);
+
+				expect(workflowStatisticsService.emit).toHaveBeenCalledWith('nodeFetchedData', {
+					workflowId,
+					node,
+				});
+			});
+		});
+	};
+
+	describe('getLifecycleHooksForRegularMain', () => {
+		const createHooks = (executionMode: WorkflowExecuteMode = 'manual') =>
+			getLifecycleHooksForRegularMain(
+				{ executionMode, workflowData, pushRef, retryOf },
+				executionId,
+			);
+
+		beforeEach(() => {
+			lifecycleHooks = createHooks();
+		});
+
+		workflowEventTests();
+		nodeEventsTests();
+		externalHooksTests();
+		statisticsTests();
+
+		it('should setup the correct set of hooks', () => {
+			expect(lifecycleHooks).toBeInstanceOf(ExecutionLifecycleHooks);
+			expect(lifecycleHooks.mode).toBe('manual');
+			expect(lifecycleHooks.executionId).toBe(executionId);
+			expect(lifecycleHooks.workflowData).toEqual(workflowData);
+
+			const { handlers } = lifecycleHooks;
+			expect(handlers.nodeExecuteBefore).toHaveLength(2);
+			expect(handlers.nodeExecuteAfter).toHaveLength(2);
+			expect(handlers.workflowExecuteBefore).toHaveLength(3);
+			expect(handlers.workflowExecuteAfter).toHaveLength(5);
+			expect(handlers.nodeFetchedData).toHaveLength(1);
+			expect(handlers.sendResponse).toHaveLength(0);
+		});
+
+		describe('nodeExecuteBefore', () => {
+			it('should send nodeExecuteBefore push event', async () => {
+				await lifecycleHooks.runHook('nodeExecuteBefore', [nodeName]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{ type: 'nodeExecuteBefore', data: { executionId, nodeName } },
+					pushRef,
+				);
+			});
+		});
+
+		describe('nodeExecuteAfter', () => {
+			it('should send nodeExecuteAfter push event', async () => {
+				await lifecycleHooks.runHook('nodeExecuteAfter', [nodeName, taskData, runExecutionData]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{ type: 'nodeExecuteAfter', data: { executionId, nodeName, data: taskData } },
+					pushRef,
+				);
+			});
+
+			it('should save execution progress when enabled', async () => {
+				workflowData.settings = { saveExecutionProgress: true };
+				lifecycleHooks = createHooks();
+
+				expect(lifecycleHooks.handlers.nodeExecuteAfter).toHaveLength(3);
+
+				await lifecycleHooks.runHook('nodeExecuteAfter', [nodeName, taskData, runExecutionData]);
+
+				expect(executionRepository.findSingleExecution).toHaveBeenCalledWith(executionId, {
+					includeData: true,
+					unflattenData: true,
+				});
+			});
+
+			it('should not save execution progress when disabled', async () => {
+				workflowData.settings = { saveExecutionProgress: false };
+				lifecycleHooks = createHooks();
+
+				expect(lifecycleHooks.handlers.nodeExecuteAfter).toHaveLength(2);
+
+				await lifecycleHooks.runHook('nodeExecuteAfter', [nodeName, taskData, runExecutionData]);
+
+				expect(executionRepository.findSingleExecution).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('workflowExecuteBefore', () => {
+			it('should send executionStarted push event', async () => {
+				await lifecycleHooks.runHook('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{
+						type: 'executionStarted',
+						data: {
+							executionId,
+							mode: 'manual',
+							retryOf,
+							workflowId: 'test-workflow-id',
+							workflowName: 'Test Workflow',
+							startedAt: now,
+							flattedRunData: '[{}]',
+						},
+					},
+					pushRef,
+				);
+			});
+
+			it('should run workflow.preExecute external hook', async () => {
+				await lifecycleHooks.runHook('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(externalHooks.run).toHaveBeenCalledWith('workflow.preExecute', [workflow, 'manual']);
+			});
+		});
+
+		describe('workflowExecuteAfter', () => {
+			it('should send executionFinished push event', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+				expect(push.send).toHaveBeenCalledWith(
+					{
+						type: 'executionFinished',
+						data: {
+							executionId,
+							rawData: stringify(successfulRun.data),
+							status: 'success',
+							workflowId: 'test-workflow-id',
+						},
+					},
+					pushRef,
+				);
+			});
+
+			it('should send executionWaiting push event', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [waitingRun, {}]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{
+						type: 'executionWaiting',
+						data: { executionId },
+					},
+					pushRef,
+				);
+			});
+
+			describe('saving static data', () => {
+				it('should skip saving static data for manual executions', async () => {
+					await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, staticData]);
+
+					expect(workflowStaticDataService.saveStaticDataById).not.toHaveBeenCalled();
+				});
+
+				it('should save static data for prod executions', async () => {
+					lifecycleHooks = createHooks('trigger');
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, staticData]);
+
+					expect(workflowStaticDataService.saveStaticDataById).toHaveBeenCalledWith(
+						workflowId,
+						staticData,
+					);
+				});
+
+				it('should handle static data saving errors', async () => {
+					lifecycleHooks = createHooks('trigger');
+
+					const error = new Error('Static data save failed');
+					workflowStaticDataService.saveStaticDataById.mockRejectedValueOnce(error);
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, staticData]);
+
+					expect(errorReporter.error).toHaveBeenCalledWith(error);
+				});
+			});
+
+			describe('saving execution data', () => {
+				it('should update execution with proper data', async () => {
+					await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+					expect(executionRepository.updateExistingExecution).toHaveBeenCalledWith(
+						executionId,
+						expect.objectContaining({
+							finished: true,
+							status: 'success',
+						}),
+					);
+				});
+
+				it('should not delete unfinished executions', async () => {
+					const unfinishedRun = mock<IRun>({ finished: false, status: 'running' });
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [unfinishedRun, {}]);
+
+					expect(executionRepository.hardDelete).not.toHaveBeenCalled();
+				});
+
+				it('should not delete waiting executions', async () => {
+					await lifecycleHooks.runHook('workflowExecuteAfter', [waitingRun, {}]);
+
+					expect(executionRepository.hardDelete).not.toHaveBeenCalled();
+				});
+
+				it('should soft delete manual executions when manual saving is disabled', async () => {
+					lifecycleHooks.workflowData.settings = { saveManualExecutions: false };
+					lifecycleHooks = createHooks();
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+					expect(executionRepository.softDelete).toHaveBeenCalledWith(executionId);
+				});
+
+				it('should not soft delete manual executions with waitTill', async () => {
+					lifecycleHooks.workflowData.settings = { saveManualExecutions: false };
+					lifecycleHooks = createHooks();
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [waitingRun, {}]);
+
+					expect(executionRepository.softDelete).not.toHaveBeenCalled();
+				});
+			});
+
+			describe('error workflow', () => {
+				it('should not execute error workflow for manual executions', async () => {
+					await lifecycleHooks.runHook('workflowExecuteAfter', [failedRun, {}]);
+
+					expect(workflowExecutionService.executeErrorWorkflow).not.toHaveBeenCalled();
+				});
+
+				it('should execute error workflow for failed non-manual executions', async () => {
+					lifecycleHooks = createHooks('trigger');
+
+					const errorWorkflow = 'error-workflow-id';
+					workflowData.settings = { errorWorkflow };
+					const project = mock<Project>();
+					ownershipService.getWorkflowProjectCached
+						.calledWith(workflowId)
+						.mockResolvedValue(project);
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [failedRun, {}]);
+
+					expect(workflowExecutionService.executeErrorWorkflow).toHaveBeenCalledWith(
+						errorWorkflow,
+						{
+							workflow: {
+								id: workflowId,
+								name: workflowData.name,
+							},
+							execution: {
+								id: executionId,
+								error: expressionError,
+								mode: 'trigger',
+								retryOf,
+								lastNodeExecuted: undefined,
+								url: `http://localhost:5678/workflow/${workflowId}/executions/${executionId}`,
+							},
+						},
+						project,
+					);
+				});
+			});
+
+			it('should restore binary data IDs after workflow execution for webhooks', async () => {
+				config.set('binaryDataManager.mode', 'filesystem');
+				lifecycleHooks = createHooks('webhook');
+
+				(successfulRun.data.resultData.runData = {
+					[nodeName]: [
+						{
+							executionTime: 1,
+							startTime: 1,
+							source: [],
+							data: {
+								main: [
+									[
+										{
+											json: {},
+											binary: {
+												data: {
+													id: `filesystem-v2:workflows/${workflowId}/executions/temp/binary_data/123`,
+													data: '',
+													mimeType: 'text/plain',
+												},
+											},
+										},
+									],
+								],
+							},
+						},
+					],
+				}),
+					await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(binaryDataService.rename).toHaveBeenCalledWith(
+					'workflows/test-workflow-id/executions/temp/binary_data/123',
+					'workflows/test-workflow-id/executions/test-execution-id/binary_data/123',
+				);
+			});
+		});
+
+		describe("when pushRef isn't set", () => {
+			beforeEach(() => {
+				lifecycleHooks = getLifecycleHooksForRegularMain(
+					{ executionMode: 'manual', workflowData, retryOf },
+					executionId,
+				);
+			});
+
+			it('should not setup any push hooks', async () => {
+				const { handlers } = lifecycleHooks;
+				expect(handlers.nodeExecuteBefore).toHaveLength(1);
+				expect(handlers.nodeExecuteAfter).toHaveLength(1);
+				expect(handlers.workflowExecuteBefore).toHaveLength(2);
+				expect(handlers.workflowExecuteAfter).toHaveLength(4);
+
+				await lifecycleHooks.runHook('nodeExecuteBefore', [nodeName]);
+				await lifecycleHooks.runHook('nodeExecuteAfter', [nodeName, taskData, runExecutionData]);
+				await lifecycleHooks.runHook('workflowExecuteBefore', [workflow, runExecutionData]);
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(push.send).not.toHaveBeenCalled();
+			});
+		});
+	});
+
+	describe('getLifecycleHooksForScalingMain', () => {
+		beforeEach(() => {
+			lifecycleHooks = getLifecycleHooksForScalingMain('manual', executionId, workflowData, {
+				pushRef,
+				retryOf,
+			});
+		});
+
+		workflowEventTests();
+		externalHooksTests();
+
+		it('should setup the correct set of hooks', () => {
+			expect(lifecycleHooks).toBeInstanceOf(ExecutionLifecycleHooks);
+			expect(lifecycleHooks.mode).toBe('manual');
+			expect(lifecycleHooks.executionId).toBe(executionId);
+			expect(lifecycleHooks.workflowData).toEqual(workflowData);
+
+			const { handlers } = lifecycleHooks;
+			expect(handlers.nodeExecuteBefore).toHaveLength(0);
+			expect(handlers.nodeExecuteAfter).toHaveLength(0);
+			expect(handlers.workflowExecuteBefore).toHaveLength(2);
+			expect(handlers.workflowExecuteAfter).toHaveLength(4);
+			expect(handlers.nodeFetchedData).toHaveLength(0);
+			expect(handlers.sendResponse).toHaveLength(0);
+		});
+
+		describe('workflowExecuteBefore', () => {
+			it('should run the workflow.preExecute external hook', async () => {
+				await lifecycleHooks.runHook('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(externalHooks.run).toHaveBeenCalledWith('workflow.preExecute', [workflow, 'manual']);
+			});
+		});
+
+		describe('workflowExecuteAfter', () => {
+			it('should delete successful executions when success saving is disabled', async () => {
+				workflowData.settings = {
+					saveDataSuccessExecution: 'none',
+					saveDataErrorExecution: 'all',
+				};
+				const lifecycleHooks = getLifecycleHooksForScalingMain(
+					'webhook',
+					executionId,
+					workflowData,
+					{
+						pushRef,
+						retryOf,
+					},
+				);
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(executionRepository.hardDelete).toHaveBeenCalledWith({
+					workflowId,
+					executionId,
+				});
+			});
+
+			it('should delete failed executions when error saving is disabled', async () => {
+				workflowData.settings = {
+					saveDataSuccessExecution: 'all',
+					saveDataErrorExecution: 'none',
+				};
+				const lifecycleHooks = getLifecycleHooksForScalingMain(
+					'webhook',
+					executionId,
+					workflowData,
+					{
+						pushRef,
+						retryOf,
+					},
+				);
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [failedRun, {}]);
+
+				expect(executionRepository.hardDelete).toHaveBeenCalledWith({
+					workflowId,
+					executionId,
+				});
+			});
+		});
+	});
+
+	describe('getLifecycleHooksForScalingWorker', () => {
+		const createHooks = (executionMode: WorkflowExecuteMode = 'manual') =>
+			getLifecycleHooksForScalingWorker(executionMode, executionId, workflowData, {
+				pushRef,
+				retryOf,
+			});
+
+		beforeEach(() => {
+			lifecycleHooks = createHooks();
+		});
+
+		nodeEventsTests();
+		externalHooksTests();
+		statisticsTests();
+
+		it('should setup the correct set of hooks', () => {
+			expect(lifecycleHooks).toBeInstanceOf(ExecutionLifecycleHooks);
+			expect(lifecycleHooks.mode).toBe('manual');
+			expect(lifecycleHooks.executionId).toBe(executionId);
+			expect(lifecycleHooks.workflowData).toEqual(workflowData);
+
+			const { handlers } = lifecycleHooks;
+			expect(handlers.nodeExecuteBefore).toHaveLength(2);
+			expect(handlers.nodeExecuteAfter).toHaveLength(2);
+			expect(handlers.workflowExecuteBefore).toHaveLength(2);
+			expect(handlers.workflowExecuteAfter).toHaveLength(4);
+			expect(handlers.nodeFetchedData).toHaveLength(1);
+			expect(handlers.sendResponse).toHaveLength(0);
+		});
+
+		describe('saving static data', () => {
+			it('should skip saving static data for manual executions', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, staticData]);
+
+				expect(workflowStaticDataService.saveStaticDataById).not.toHaveBeenCalled();
+			});
+
+			it('should save static data for prod executions', async () => {
+				lifecycleHooks = createHooks('trigger');
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, staticData]);
+
+				expect(workflowStaticDataService.saveStaticDataById).toHaveBeenCalledWith(
+					workflowId,
+					staticData,
+				);
+			});
+
+			it('should handle static data saving errors', async () => {
+				lifecycleHooks = createHooks('trigger');
+				const error = new Error('Static data save failed');
+				workflowStaticDataService.saveStaticDataById.mockRejectedValueOnce(error);
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [successfulRun, staticData]);
+
+				expect(errorReporter.error).toHaveBeenCalledWith(error);
+			});
+		});
+
+		describe('error workflow', () => {
+			it('should not execute error workflow for manual executions', async () => {
+				await lifecycleHooks.runHook('workflowExecuteAfter', [failedRun, {}]);
+
+				expect(workflowExecutionService.executeErrorWorkflow).not.toHaveBeenCalled();
+			});
+
+			it('should execute error workflow for failed non-manual executions', async () => {
+				lifecycleHooks = createHooks('trigger');
+				const errorWorkflow = 'error-workflow-id';
+				workflowData.settings = { errorWorkflow };
+				const project = mock<Project>();
+				ownershipService.getWorkflowProjectCached.calledWith(workflowId).mockResolvedValue(project);
+
+				await lifecycleHooks.runHook('workflowExecuteAfter', [failedRun, {}]);
+
+				expect(workflowExecutionService.executeErrorWorkflow).toHaveBeenCalledWith(
+					errorWorkflow,
+					{
+						workflow: {
+							id: workflowId,
+							name: workflowData.name,
+						},
+						execution: {
+							id: executionId,
+							error: expressionError,
+							mode: 'trigger',
+							retryOf,
+							lastNodeExecuted: undefined,
+							url: `http://localhost:5678/workflow/${workflowId}/executions/${executionId}`,
+						},
+					},
+					project,
+				);
+			});
+		});
+	});
+
+	describe('getLifecycleHooksForSubExecutions', () => {
+		beforeEach(() => {
+			lifecycleHooks = getLifecycleHooksForSubExecutions(
+				'manual',
+				executionId,
+				workflowData,
+				undefined,
+			);
+		});
+
+		workflowEventTests();
+		nodeEventsTests();
+		externalHooksTests();
+		statisticsTests();
+
+		it('should setup the correct set of hooks', () => {
+			expect(lifecycleHooks).toBeInstanceOf(ExecutionLifecycleHooks);
+			expect(lifecycleHooks.mode).toBe('manual');
+			expect(lifecycleHooks.executionId).toBe(executionId);
+			expect(lifecycleHooks.workflowData).toEqual(workflowData);
+
+			const { handlers } = lifecycleHooks;
+			expect(handlers.nodeExecuteBefore).toHaveLength(1);
+			expect(handlers.nodeExecuteAfter).toHaveLength(1);
+			expect(handlers.workflowExecuteBefore).toHaveLength(2);
+			expect(handlers.workflowExecuteAfter).toHaveLength(4);
+			expect(handlers.nodeFetchedData).toHaveLength(1);
+			expect(handlers.sendResponse).toHaveLength(0);
+		});
+	});
+});
diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/restore-binary-data-id.test.ts b/packages/cli/src/execution-lifecycle/__tests__/restore-binary-data-id.test.ts
similarity index 98%
rename from packages/cli/src/execution-lifecycle-hooks/__tests__/restore-binary-data-id.test.ts
rename to packages/cli/src/execution-lifecycle/__tests__/restore-binary-data-id.test.ts
index f4f7a463bc..76ac0d4e21 100644
--- a/packages/cli/src/execution-lifecycle-hooks/__tests__/restore-binary-data-id.test.ts
+++ b/packages/cli/src/execution-lifecycle/__tests__/restore-binary-data-id.test.ts
@@ -2,7 +2,7 @@ import { BinaryDataService } from 'n8n-core';
 import type { IRun } from 'n8n-workflow';
 
 import config from '@/config';
-import { restoreBinaryDataId } from '@/execution-lifecycle-hooks/restore-binary-data-id';
+import { restoreBinaryDataId } from '@/execution-lifecycle/restore-binary-data-id';
 import { mockInstance } from '@test/mocking';
 
 function toIRun(item?: object) {
diff --git a/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts
new file mode 100644
index 0000000000..8c90c865fd
--- /dev/null
+++ b/packages/cli/src/execution-lifecycle/__tests__/save-execution-progress.test.ts
@@ -0,0 +1,152 @@
+import { mock } from 'jest-mock-extended';
+import { ErrorReporter } from 'n8n-core';
+import { Logger } from 'n8n-core';
+import type { IRunExecutionData, ITaskData } from 'n8n-workflow';
+
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { IExecutionResponse } from '@/interfaces';
+import { mockInstance } from '@test/mocking';
+
+import { saveExecutionProgress } from '../save-execution-progress';
+
+describe('saveExecutionProgress', () => {
+	mockInstance(Logger);
+	const errorReporter = mockInstance(ErrorReporter);
+	const executionRepository = mockInstance(ExecutionRepository);
+
+	afterEach(() => {
+		jest.resetAllMocks();
+	});
+
+	const workflowId = 'some-workflow-id';
+	const executionId = 'some-execution-id';
+	const nodeName = 'My Node';
+	const taskData = mock<ITaskData>();
+	const runExecutionData = mock<IRunExecutionData>();
+
+	const commonArgs = [workflowId, executionId, nodeName, taskData, runExecutionData] as const;
+
+	test('should not try to update non-existent executions', async () => {
+		executionRepository.findSingleExecution.mockResolvedValue(undefined);
+
+		await saveExecutionProgress(...commonArgs);
+		expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
+	});
+
+	test('should handle DB errors on execution lookup', async () => {
+		const error = new Error('Something went wrong');
+		executionRepository.findSingleExecution.mockImplementation(() => {
+			throw error;
+		});
+
+		await saveExecutionProgress(...commonArgs);
+
+		expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
+		expect(errorReporter.error).toHaveBeenCalledWith(error);
+	});
+
+	test('should handle DB errors when updating the execution', async () => {
+		const error = new Error('Something went wrong');
+		executionRepository.findSingleExecution.mockResolvedValue({} as IExecutionResponse);
+		executionRepository.updateExistingExecution.mockImplementation(() => {
+			throw error;
+		});
+
+		await saveExecutionProgress(...commonArgs);
+
+		expect(executionRepository.findSingleExecution).toHaveBeenCalled();
+		expect(executionRepository.updateExistingExecution).toHaveBeenCalled();
+		expect(errorReporter.error).toHaveBeenCalledWith(error);
+	});
+
+	test('should not try to update finished executions', async () => {
+		executionRepository.findSingleExecution.mockResolvedValue(
+			mock<IExecutionResponse>({
+				finished: true,
+			}),
+		);
+
+		await saveExecutionProgress(...commonArgs);
+
+		expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
+	});
+
+	test('should populate `.data` when it is missing', async () => {
+		const fullExecutionData = {} as IExecutionResponse;
+		executionRepository.findSingleExecution.mockResolvedValue(fullExecutionData);
+
+		await saveExecutionProgress(...commonArgs);
+
+		expect(fullExecutionData).toEqual({
+			data: {
+				executionData: runExecutionData.executionData,
+				resultData: {
+					lastNodeExecuted: nodeName,
+					runData: {
+						[nodeName]: [taskData],
+					},
+				},
+				startData: {},
+			},
+			status: 'running',
+		});
+
+		expect(executionRepository.updateExistingExecution).toHaveBeenCalledWith(
+			executionId,
+			fullExecutionData,
+		);
+
+		expect(errorReporter.error).not.toHaveBeenCalled();
+	});
+
+	test('should augment `.data` if it already exists', async () => {
+		const fullExecutionData = {
+			data: {
+				startData: {},
+				resultData: {
+					runData: {
+						[nodeName]: [{}],
+					},
+				},
+			},
+		} as unknown as IExecutionResponse;
+		executionRepository.findSingleExecution.mockResolvedValue(fullExecutionData);
+
+		await saveExecutionProgress(...commonArgs);
+
+		expect(fullExecutionData).toEqual({
+			data: {
+				executionData: runExecutionData.executionData,
+				resultData: {
+					lastNodeExecuted: nodeName,
+					runData: {
+						[nodeName]: [{}, taskData],
+					},
+				},
+				startData: {},
+			},
+			status: 'running',
+		});
+
+		expect(executionRepository.updateExistingExecution).toHaveBeenCalledWith(
+			executionId,
+			fullExecutionData,
+		);
+	});
+
+	test('should set last executed node correctly', async () => {
+		const fullExecutionData = {
+			data: {
+				resultData: {
+					lastNodeExecuted: 'Another Node',
+					runData: {},
+				},
+			},
+		} as unknown as IExecutionResponse;
+		executionRepository.findSingleExecution.mockResolvedValue(fullExecutionData);
+
+		await saveExecutionProgress(...commonArgs);
+
+		expect(fullExecutionData.data.resultData.lastNodeExecuted).toEqual(nodeName);
+	});
+});
diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/to-save-settings.test.ts b/packages/cli/src/execution-lifecycle/__tests__/to-save-settings.test.ts
similarity index 98%
rename from packages/cli/src/execution-lifecycle-hooks/__tests__/to-save-settings.test.ts
rename to packages/cli/src/execution-lifecycle/__tests__/to-save-settings.test.ts
index f12c209827..142b3c34ce 100644
--- a/packages/cli/src/execution-lifecycle-hooks/__tests__/to-save-settings.test.ts
+++ b/packages/cli/src/execution-lifecycle/__tests__/to-save-settings.test.ts
@@ -1,5 +1,6 @@
 import config from '@/config';
-import { toSaveSettings } from '@/execution-lifecycle-hooks/to-save-settings';
+
+import { toSaveSettings } from '../to-save-settings';
 
 afterEach(() => {
 	config.load(config.default);
diff --git a/packages/cli/src/execution-lifecycle/execute-error-workflow.ts b/packages/cli/src/execution-lifecycle/execute-error-workflow.ts
new file mode 100644
index 0000000000..fefce8a97b
--- /dev/null
+++ b/packages/cli/src/execution-lifecycle/execute-error-workflow.ts
@@ -0,0 +1,130 @@
+import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
+import type { IRun, IWorkflowBase, WorkflowExecuteMode } from 'n8n-workflow';
+
+import type { IWorkflowErrorData } from '@/interfaces';
+import { OwnershipService } from '@/services/ownership.service';
+import { UrlService } from '@/services/url.service';
+import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
+
+/**
+ * Checks if there was an error and if errorWorkflow or a trigger is defined. If so it collects
+ * all the data and executes it
+ *
+ * @param {IWorkflowBase} workflowData The workflow which got executed
+ * @param {IRun} fullRunData The run which produced the error
+ * @param {WorkflowExecuteMode} mode The mode in which the workflow got started in
+ * @param {string} [executionId] The id the execution got saved as
+ */
+export function executeErrorWorkflow(
+	workflowData: IWorkflowBase,
+	fullRunData: IRun,
+	mode: WorkflowExecuteMode,
+	executionId?: string,
+	retryOf?: string,
+): void {
+	const logger = Container.get(Logger);
+
+	// Check if there was an error and if so if an errorWorkflow or a trigger is set
+	let pastExecutionUrl: string | undefined;
+	if (executionId !== undefined) {
+		pastExecutionUrl = `${Container.get(UrlService).getWebhookBaseUrl()}workflow/${
+			workflowData.id
+		}/executions/${executionId}`;
+	}
+
+	if (fullRunData.data.resultData.error !== undefined) {
+		let workflowErrorData: IWorkflowErrorData;
+		const workflowId = workflowData.id;
+
+		if (executionId) {
+			// The error did happen in an execution
+			workflowErrorData = {
+				execution: {
+					id: executionId,
+					url: pastExecutionUrl,
+					error: fullRunData.data.resultData.error,
+					lastNodeExecuted: fullRunData.data.resultData.lastNodeExecuted!,
+					mode,
+					retryOf,
+				},
+				workflow: {
+					id: workflowId,
+					name: workflowData.name,
+				},
+			};
+		} else {
+			// The error did happen in a trigger
+			workflowErrorData = {
+				trigger: {
+					error: fullRunData.data.resultData.error,
+					mode,
+				},
+				workflow: {
+					id: workflowId,
+					name: workflowData.name,
+				},
+			};
+		}
+
+		const { errorTriggerType } = Container.get(GlobalConfig).nodes;
+		// Run the error workflow
+		// To avoid an infinite loop do not run the error workflow again if the error-workflow itself failed and it is its own error-workflow.
+		const { errorWorkflow } = workflowData.settings ?? {};
+		if (errorWorkflow && !(mode === 'error' && workflowId && errorWorkflow === workflowId)) {
+			logger.debug('Start external error workflow', {
+				executionId,
+				errorWorkflowId: errorWorkflow,
+				workflowId,
+			});
+			// If a specific error workflow is set run only that one
+
+			// First, do permission checks.
+			if (!workflowId) {
+				// Manual executions do not trigger error workflows
+				// So this if should never happen. It was added to
+				// make sure there are no possible security gaps
+				return;
+			}
+
+			Container.get(OwnershipService)
+				.getWorkflowProjectCached(workflowId)
+				.then((project) => {
+					void Container.get(WorkflowExecutionService).executeErrorWorkflow(
+						errorWorkflow,
+						workflowErrorData,
+						project,
+					);
+				})
+				.catch((error: Error) => {
+					Container.get(ErrorReporter).error(error);
+					logger.error(
+						`Could not execute ErrorWorkflow for execution ID ${executionId} because of error querying the workflow owner`,
+						{
+							executionId,
+							errorWorkflowId: errorWorkflow,
+							workflowId,
+							error,
+							workflowErrorData,
+						},
+					);
+				});
+		} else if (
+			mode !== 'error' &&
+			workflowId !== undefined &&
+			workflowData.nodes.some((node) => node.type === errorTriggerType)
+		) {
+			logger.debug('Start internal error workflow', { executionId, workflowId });
+			void Container.get(OwnershipService)
+				.getWorkflowProjectCached(workflowId)
+				.then((project) => {
+					void Container.get(WorkflowExecutionService).executeErrorWorkflow(
+						workflowId,
+						workflowErrorData,
+						project,
+					);
+				});
+		}
+	}
+}
diff --git a/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts
new file mode 100644
index 0000000000..237bd25edb
--- /dev/null
+++ b/packages/cli/src/execution-lifecycle/execution-lifecycle-hooks.ts
@@ -0,0 +1,482 @@
+import { Container } from '@n8n/di';
+import { stringify } from 'flatted';
+import { ErrorReporter, Logger, InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core';
+import type {
+	IWorkflowBase,
+	WorkflowExecuteMode,
+	IWorkflowExecutionDataProcess,
+} from 'n8n-workflow';
+
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { EventService } from '@/events/event.service';
+import { ExternalHooks } from '@/external-hooks';
+import { Push } from '@/push';
+import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
+import { isWorkflowIdValid } from '@/utils';
+import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
+
+import { executeErrorWorkflow } from './execute-error-workflow';
+import { restoreBinaryDataId } from './restore-binary-data-id';
+import { saveExecutionProgress } from './save-execution-progress';
+import {
+	determineFinalExecutionStatus,
+	prepareExecutionDataForDbUpdate,
+	updateExistingExecution,
+} from './shared/shared-hook-functions';
+import { type ExecutionSaveSettings, toSaveSettings } from './to-save-settings';
+
+type HooksSetupParameters = {
+	saveSettings: ExecutionSaveSettings;
+	pushRef?: string;
+	retryOf?: string;
+};
+
+function hookFunctionsWorkflowEvents(hooks: ExecutionLifecycleHooks, userId?: string) {
+	const eventService = Container.get(EventService);
+	hooks.addHandler('workflowExecuteBefore', function () {
+		const { executionId, workflowData } = this;
+		eventService.emit('workflow-pre-execute', { executionId, data: workflowData });
+	});
+	hooks.addHandler('workflowExecuteAfter', function (runData) {
+		if (runData.status === 'waiting') return;
+
+		const { executionId, workflowData: workflow } = this;
+		eventService.emit('workflow-post-execute', { executionId, runData, workflow, userId });
+	});
+}
+
+function hookFunctionsNodeEvents(hooks: ExecutionLifecycleHooks) {
+	const eventService = Container.get(EventService);
+	hooks.addHandler('nodeExecuteBefore', function (nodeName) {
+		const { executionId, workflowData: workflow } = this;
+		eventService.emit('node-pre-execute', { executionId, workflow, nodeName });
+	});
+	hooks.addHandler('nodeExecuteAfter', function (nodeName) {
+		const { executionId, workflowData: workflow } = this;
+		eventService.emit('node-post-execute', { executionId, workflow, nodeName });
+	});
+}
+
+/**
+ * Returns hook functions to push data to Editor-UI
+ */
+function hookFunctionsPush(
+	hooks: ExecutionLifecycleHooks,
+	{ pushRef, retryOf }: HooksSetupParameters,
+) {
+	if (!pushRef) return;
+	const logger = Container.get(Logger);
+	const pushInstance = Container.get(Push);
+	hooks.addHandler('nodeExecuteBefore', function (nodeName) {
+		const { executionId } = this;
+		// Push data to session which started workflow before each
+		// node which starts rendering
+		logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
+			executionId,
+			pushRef,
+			workflowId: this.workflowData.id,
+		});
+
+		pushInstance.send({ type: 'nodeExecuteBefore', data: { executionId, nodeName } }, pushRef);
+	});
+	hooks.addHandler('nodeExecuteAfter', function (nodeName, data) {
+		const { executionId } = this;
+		// Push data to session which started workflow after each rendered node
+		logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
+			executionId,
+			pushRef,
+			workflowId: this.workflowData.id,
+		});
+
+		pushInstance.send({ type: 'nodeExecuteAfter', data: { executionId, nodeName, data } }, pushRef);
+	});
+	hooks.addHandler('workflowExecuteBefore', function (_workflow, data) {
+		const { executionId } = this;
+		const { id: workflowId, name: workflowName } = this.workflowData;
+		logger.debug('Executing hook (hookFunctionsPush)', {
+			executionId,
+			pushRef,
+			workflowId,
+		});
+		// Push data to session which started the workflow
+		pushInstance.send(
+			{
+				type: 'executionStarted',
+				data: {
+					executionId,
+					mode: this.mode,
+					startedAt: new Date(),
+					retryOf,
+					workflowId,
+					workflowName,
+					flattedRunData: data?.resultData.runData
+						? stringify(data.resultData.runData)
+						: stringify({}),
+				},
+			},
+			pushRef,
+		);
+	});
+	hooks.addHandler('workflowExecuteAfter', function (fullRunData) {
+		const { executionId } = this;
+		const { id: workflowId } = this.workflowData;
+		logger.debug('Executing hook (hookFunctionsPush)', {
+			executionId,
+			pushRef,
+			workflowId,
+		});
+
+		const { status } = fullRunData;
+		if (status === 'waiting') {
+			pushInstance.send({ type: 'executionWaiting', data: { executionId } }, pushRef);
+		} else {
+			const rawData = stringify(fullRunData.data);
+			pushInstance.send(
+				{ type: 'executionFinished', data: { executionId, workflowId, status, rawData } },
+				pushRef,
+			);
+		}
+	});
+}
+
+function hookFunctionsExternalHooks(hooks: ExecutionLifecycleHooks) {
+	const externalHooks = Container.get(ExternalHooks);
+	hooks.addHandler('workflowExecuteBefore', async function (workflow) {
+		await externalHooks.run('workflow.preExecute', [workflow, this.mode]);
+	});
+	hooks.addHandler('workflowExecuteAfter', async function (fullRunData) {
+		await externalHooks.run('workflow.postExecute', [
+			fullRunData,
+			this.workflowData,
+			this.executionId,
+		]);
+	});
+}
+
+function hookFunctionsSaveProgress(
+	hooks: ExecutionLifecycleHooks,
+	{ saveSettings }: HooksSetupParameters,
+) {
+	if (!saveSettings.progress) return;
+	hooks.addHandler('nodeExecuteAfter', async function (nodeName, data, executionData) {
+		await saveExecutionProgress(
+			this.workflowData.id,
+			this.executionId,
+			nodeName,
+			data,
+			executionData,
+		);
+	});
+}
+
+/** This should ideally be added before any other `workflowExecuteAfter` hook to ensure all hooks get the same execution status */
+function hookFunctionsFinalizeExecutionStatus(hooks: ExecutionLifecycleHooks) {
+	hooks.addHandler('workflowExecuteAfter', (fullRunData) => {
+		fullRunData.status = determineFinalExecutionStatus(fullRunData);
+	});
+}
+
+function hookFunctionsStatistics(hooks: ExecutionLifecycleHooks) {
+	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
+	hooks.addHandler('nodeFetchedData', (workflowId, node) => {
+		workflowStatisticsService.emit('nodeFetchedData', { workflowId, node });
+	});
+}
+
+/**
+ * Returns hook functions to save workflow execution and call error workflow
+ */
+function hookFunctionsSave(
+	hooks: ExecutionLifecycleHooks,
+	{ pushRef, retryOf, saveSettings }: HooksSetupParameters,
+) {
+	const logger = Container.get(Logger);
+	const errorReporter = Container.get(ErrorReporter);
+	const executionRepository = Container.get(ExecutionRepository);
+	const workflowStaticDataService = Container.get(WorkflowStaticDataService);
+	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
+	hooks.addHandler('workflowExecuteAfter', async function (fullRunData, newStaticData) {
+		logger.debug('Executing hook (hookFunctionsSave)', {
+			executionId: this.executionId,
+			workflowId: this.workflowData.id,
+		});
+
+		await restoreBinaryDataId(fullRunData, this.executionId, this.mode);
+
+		const isManualMode = this.mode === 'manual';
+
+		try {
+			if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
+				// Workflow is saved so update in database
+				try {
+					await workflowStaticDataService.saveStaticDataById(this.workflowData.id, newStaticData);
+				} catch (e) {
+					errorReporter.error(e);
+					logger.error(
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+						`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`,
+						{ executionId: this.executionId, workflowId: this.workflowData.id },
+					);
+				}
+			}
+
+			if (isManualMode && !saveSettings.manual && !fullRunData.waitTill) {
+				/**
+				 * When manual executions are not being saved, we only soft-delete
+				 * the execution so that the user can access its binary data
+				 * while building their workflow.
+				 *
+				 * The manual execution and its binary data will be hard-deleted
+				 * on the next pruning cycle after the grace period set by
+				 * `EXECUTIONS_DATA_HARD_DELETE_BUFFER`.
+				 */
+				await executionRepository.softDelete(this.executionId);
+
+				return;
+			}
+
+			const shouldNotSave =
+				(fullRunData.status === 'success' && !saveSettings.success) ||
+				(fullRunData.status !== 'success' && !saveSettings.error);
+
+			if (shouldNotSave && !fullRunData.waitTill && !isManualMode) {
+				executeErrorWorkflow(this.workflowData, fullRunData, this.mode, this.executionId, retryOf);
+
+				await executionRepository.hardDelete({
+					workflowId: this.workflowData.id,
+					executionId: this.executionId,
+				});
+
+				return;
+			}
+
+			// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
+			// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
+			const fullExecutionData = prepareExecutionDataForDbUpdate({
+				runData: fullRunData,
+				workflowData: this.workflowData,
+				workflowStatusFinal: fullRunData.status,
+				retryOf,
+			});
+
+			// When going into the waiting state, store the pushRef in the execution-data
+			if (fullRunData.waitTill && isManualMode) {
+				fullExecutionData.data.pushRef = pushRef;
+			}
+
+			await updateExistingExecution({
+				executionId: this.executionId,
+				workflowId: this.workflowData.id,
+				executionData: fullExecutionData,
+			});
+
+			if (!isManualMode) {
+				executeErrorWorkflow(this.workflowData, fullRunData, this.mode, this.executionId, retryOf);
+			}
+		} finally {
+			workflowStatisticsService.emit('workflowExecutionCompleted', {
+				workflowData: this.workflowData,
+				fullRunData,
+			});
+		}
+	});
+}
+
+/**
+ * Returns hook functions to save workflow execution and call error workflow
+ * for running with queues. Manual executions should never run on queues as
+ * they are always executed in the main process.
+ */
+function hookFunctionsSaveWorker(
+	hooks: ExecutionLifecycleHooks,
+	{ pushRef, retryOf }: HooksSetupParameters,
+) {
+	const logger = Container.get(Logger);
+	const errorReporter = Container.get(ErrorReporter);
+	const workflowStaticDataService = Container.get(WorkflowStaticDataService);
+	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
+	hooks.addHandler('workflowExecuteAfter', async function (fullRunData, newStaticData) {
+		logger.debug('Executing hook (hookFunctionsSaveWorker)', {
+			executionId: this.executionId,
+			workflowId: this.workflowData.id,
+		});
+
+		const isManualMode = this.mode === 'manual';
+
+		try {
+			if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
+				// Workflow is saved so update in database
+				try {
+					await workflowStaticDataService.saveStaticDataById(this.workflowData.id, newStaticData);
+				} catch (e) {
+					errorReporter.error(e);
+					logger.error(
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+						`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`,
+						{ workflowId: this.workflowData.id },
+					);
+				}
+			}
+
+			if (!isManualMode && fullRunData.status !== 'success' && fullRunData.status !== 'waiting') {
+				executeErrorWorkflow(this.workflowData, fullRunData, this.mode, this.executionId, retryOf);
+			}
+
+			// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
+			// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
+			const fullExecutionData = prepareExecutionDataForDbUpdate({
+				runData: fullRunData,
+				workflowData: this.workflowData,
+				workflowStatusFinal: fullRunData.status,
+				retryOf,
+			});
+
+			// When going into the waiting state, store the pushRef in the execution-data
+			if (fullRunData.waitTill && isManualMode) {
+				fullExecutionData.data.pushRef = pushRef;
+			}
+
+			await updateExistingExecution({
+				executionId: this.executionId,
+				workflowId: this.workflowData.id,
+				executionData: fullExecutionData,
+			});
+		} finally {
+			workflowStatisticsService.emit('workflowExecutionCompleted', {
+				workflowData: this.workflowData,
+				fullRunData,
+			});
+		}
+	});
+}
+
+/**
+ * Returns ExecutionLifecycleHooks instance for running integrated workflows
+ * (Workflows which get started inside of another workflow)
+ */
+export function getLifecycleHooksForSubExecutions(
+	mode: WorkflowExecuteMode,
+	executionId: string,
+	workflowData: IWorkflowBase,
+	userId?: string,
+): ExecutionLifecycleHooks {
+	const hooks = new ExecutionLifecycleHooks(mode, executionId, workflowData);
+	const saveSettings = toSaveSettings(workflowData.settings);
+	hookFunctionsWorkflowEvents(hooks, userId);
+	hookFunctionsNodeEvents(hooks);
+	hookFunctionsFinalizeExecutionStatus(hooks);
+	hookFunctionsSave(hooks, { saveSettings });
+	hookFunctionsSaveProgress(hooks, { saveSettings });
+	hookFunctionsStatistics(hooks);
+	hookFunctionsExternalHooks(hooks);
+	return hooks;
+}
+
+/**
+ * Returns ExecutionLifecycleHooks instance for worker in scaling mode.
+ */
+export function getLifecycleHooksForScalingWorker(
+	mode: WorkflowExecuteMode,
+	executionId: string,
+	workflowData: IWorkflowBase,
+	{ pushRef, retryOf }: Omit<HooksSetupParameters, 'saveSettings'> = {},
+): ExecutionLifecycleHooks {
+	const hooks = new ExecutionLifecycleHooks(mode, executionId, workflowData);
+	const saveSettings = toSaveSettings(workflowData.settings);
+	const optionalParameters = { pushRef, retryOf, saveSettings };
+	hookFunctionsNodeEvents(hooks);
+	hookFunctionsFinalizeExecutionStatus(hooks);
+	hookFunctionsSaveWorker(hooks, optionalParameters);
+	hookFunctionsSaveProgress(hooks, optionalParameters);
+	hookFunctionsStatistics(hooks);
+	hookFunctionsExternalHooks(hooks);
+
+	if (mode === 'manual' && Container.get(InstanceSettings).isWorker) {
+		hookFunctionsPush(hooks, optionalParameters);
+	}
+
+	return hooks;
+}
+
+/**
+ * Returns ExecutionLifecycleHooks instance for main process if workflow runs via worker
+ */
+export function getLifecycleHooksForScalingMain(
+	mode: WorkflowExecuteMode,
+	executionId: string,
+	workflowData: IWorkflowBase,
+	{ pushRef, retryOf }: Omit<HooksSetupParameters, 'saveSettings'> = {},
+): ExecutionLifecycleHooks {
+	const hooks = new ExecutionLifecycleHooks(mode, executionId, workflowData);
+	const saveSettings = toSaveSettings(workflowData.settings);
+	const optionalParameters = { pushRef, retryOf, saveSettings };
+	const executionRepository = Container.get(ExecutionRepository);
+
+	hookFunctionsWorkflowEvents(hooks);
+	hookFunctionsSaveProgress(hooks, optionalParameters);
+	hookFunctionsExternalHooks(hooks);
+	hookFunctionsFinalizeExecutionStatus(hooks);
+
+	hooks.addHandler('workflowExecuteAfter', async function (fullRunData) {
+		// Don't delete executions before they are finished
+		if (!fullRunData.finished) return;
+
+		const isManualMode = this.mode === 'manual';
+
+		if (isManualMode && !saveSettings.manual && !fullRunData.waitTill) {
+			/**
+			 * When manual executions are not being saved, we only soft-delete
+			 * the execution so that the user can access its binary data
+			 * while building their workflow.
+			 *
+			 * The manual execution and its binary data will be hard-deleted
+			 * on the next pruning cycle after the grace period set by
+			 * `EXECUTIONS_DATA_HARD_DELETE_BUFFER`.
+			 */
+			await executionRepository.softDelete(this.executionId);
+
+			return;
+		}
+
+		const shouldNotSave =
+			(fullRunData.status === 'success' && !saveSettings.success) ||
+			(fullRunData.status !== 'success' && !saveSettings.error);
+
+		if (!isManualMode && shouldNotSave && !fullRunData.waitTill) {
+			await executionRepository.hardDelete({
+				workflowId: this.workflowData.id,
+				executionId: this.executionId,
+			});
+		}
+	});
+
+	// When running with worker mode, main process executes
+	// Only workflowExecuteBefore + workflowExecuteAfter
+	// So to avoid confusion, we are removing other hooks.
+	hooks.handlers.nodeExecuteBefore = [];
+	hooks.handlers.nodeExecuteAfter = [];
+
+	return hooks;
+}
+
+/**
+ * Returns ExecutionLifecycleHooks instance for running the main workflow
+ */
+export function getLifecycleHooksForRegularMain(
+	data: IWorkflowExecutionDataProcess,
+	executionId: string,
+): ExecutionLifecycleHooks {
+	const { pushRef, retryOf, executionMode, workflowData } = data;
+	const hooks = new ExecutionLifecycleHooks(executionMode, executionId, workflowData);
+	const saveSettings = toSaveSettings(workflowData.settings);
+	const optionalParameters = { pushRef, retryOf: retryOf ?? undefined, saveSettings };
+	hookFunctionsWorkflowEvents(hooks);
+	hookFunctionsNodeEvents(hooks);
+	hookFunctionsFinalizeExecutionStatus(hooks);
+	hookFunctionsSave(hooks, optionalParameters);
+	hookFunctionsPush(hooks, optionalParameters);
+	hookFunctionsSaveProgress(hooks, optionalParameters);
+	hookFunctionsStatistics(hooks);
+	hookFunctionsExternalHooks(hooks);
+	return hooks;
+}
diff --git a/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts b/packages/cli/src/execution-lifecycle/restore-binary-data-id.ts
similarity index 100%
rename from packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
rename to packages/cli/src/execution-lifecycle/restore-binary-data-id.ts
diff --git a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts b/packages/cli/src/execution-lifecycle/save-execution-progress.ts
similarity index 53%
rename from packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
rename to packages/cli/src/execution-lifecycle/save-execution-progress.ts
index 9e751c90f6..78f61ff98f 100644
--- a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
+++ b/packages/cli/src/execution-lifecycle/save-execution-progress.ts
@@ -1,23 +1,19 @@
 import { Container } from '@n8n/di';
 import { ErrorReporter, Logger } from 'n8n-core';
-import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
+import type { IRunExecutionData, ITaskData } from 'n8n-workflow';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { toSaveSettings } from '@/execution-lifecycle-hooks/to-save-settings';
 
 export async function saveExecutionProgress(
-	workflowData: IWorkflowBase,
+	workflowId: string,
 	executionId: string,
 	nodeName: string,
 	data: ITaskData,
 	executionData: IRunExecutionData,
-	pushRef?: string,
 ) {
-	const saveSettings = toSaveSettings(workflowData.settings);
-
-	if (!saveSettings.progress) return;
-
 	const logger = Container.get(Logger);
+	const executionRepository = Container.get(ExecutionRepository);
+	const errorReporter = Container.get(ErrorReporter);
 
 	try {
 		logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
@@ -25,13 +21,10 @@ export async function saveExecutionProgress(
 			nodeName,
 		});
 
-		const fullExecutionData = await Container.get(ExecutionRepository).findSingleExecution(
-			executionId,
-			{
-				includeData: true,
-				unflattenData: true,
-			},
-		);
+		const fullExecutionData = await executionRepository.findSingleExecution(executionId, {
+			includeData: true,
+			unflattenData: true,
+		});
 
 		if (!fullExecutionData) {
 			// Something went badly wrong if this happens.
@@ -46,29 +39,22 @@ export async function saveExecutionProgress(
 			return;
 		}
 
-		if (fullExecutionData.data === undefined) {
-			fullExecutionData.data = {
-				startData: {},
-				resultData: {
-					runData: {},
-				},
-				executionData: {
-					contextData: {},
-					metadata: {},
-					nodeExecutionStack: [],
-					waitingExecution: {},
-					waitingExecutionSource: {},
-				},
-			};
-		}
+		fullExecutionData.data ??= {
+			startData: {},
+			resultData: {
+				runData: {},
+			},
+			executionData: {
+				contextData: {},
+				metadata: {},
+				nodeExecutionStack: [],
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+		};
 
-		if (Array.isArray(fullExecutionData.data.resultData.runData[nodeName])) {
-			// Append data if array exists
-			fullExecutionData.data.resultData.runData[nodeName].push(data);
-		} else {
-			// Initialize array and save data
-			fullExecutionData.data.resultData.runData[nodeName] = [data];
-		}
+		const { runData } = fullExecutionData.data.resultData;
+		(runData[nodeName] ??= []).push(data);
 
 		fullExecutionData.data.executionData = executionData.executionData;
 
@@ -77,27 +63,19 @@ export async function saveExecutionProgress(
 
 		fullExecutionData.status = 'running';
 
-		await Container.get(ExecutionRepository).updateExistingExecution(
-			executionId,
-			fullExecutionData,
-		);
+		await executionRepository.updateExistingExecution(executionId, fullExecutionData);
 	} catch (e) {
 		const error = e instanceof Error ? e : new Error(`${e}`);
 
-		Container.get(ErrorReporter).error(error);
+		errorReporter.error(error);
 		// TODO: Improve in the future!
 		// Errors here might happen because of database access
 		// For busy machines, we may get "Database is locked" errors.
 
 		// We do this to prevent crashes and executions ending in `unknown` state.
 		logger.error(
-			`Failed saving execution progress to database for execution ID ${executionId} (hookFunctionsPreExecute, nodeExecuteAfter)`,
-			{
-				...error,
-				executionId,
-				pushRef,
-				workflowId: workflowData.id,
-			},
+			`Failed saving execution progress to database for execution ID ${executionId} (hookFunctionsSaveProgress, nodeExecuteAfter)`,
+			{ error, executionId, workflowId },
 		);
 	}
 }
diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/__tests__/shared-hook-functions.test.ts b/packages/cli/src/execution-lifecycle/shared/__tests__/shared-hook-functions.test.ts
similarity index 100%
rename from packages/cli/src/execution-lifecycle-hooks/shared/__tests__/shared-hook-functions.test.ts
rename to packages/cli/src/execution-lifecycle/shared/__tests__/shared-hook-functions.test.ts
diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts
similarity index 100%
rename from packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
rename to packages/cli/src/execution-lifecycle/shared/shared-hook-functions.ts
diff --git a/packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts b/packages/cli/src/execution-lifecycle/to-save-settings.ts
similarity index 88%
rename from packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts
rename to packages/cli/src/execution-lifecycle/to-save-settings.ts
index a7af8f3ddc..b5cd24f7d9 100644
--- a/packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts
+++ b/packages/cli/src/execution-lifecycle/to-save-settings.ts
@@ -2,6 +2,13 @@ import type { IWorkflowSettings } from 'n8n-workflow';
 
 import config from '@/config';
 
+export type ExecutionSaveSettings = {
+	error: boolean | 'all' | 'none';
+	success: boolean | 'all' | 'none';
+	manual: boolean;
+	progress: boolean;
+};
+
 /**
  * Return whether a workflow execution is configured to be saved or not:
  *
@@ -10,7 +17,7 @@ import config from '@/config';
  * - `manual`: Whether to save successful or failed manual executions.
  * - `progress`: Whether to save execution progress, i.e. after each node's execution.
  */
-export function toSaveSettings(workflowSettings: IWorkflowSettings = {}) {
+export function toSaveSettings(workflowSettings: IWorkflowSettings = {}): ExecutionSaveSettings {
 	const DEFAULTS = {
 		ERROR: config.getEnv('executions.saveDataOnError'),
 		SUCCESS: config.getEnv('executions.saveDataOnSuccess'),
diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
index 9cb681a7ef..e0ff5cb2e2 100644
--- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
@@ -3,6 +3,7 @@ import { stringify } from 'flatted';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 import { randomInt } from 'n8n-workflow';
+import assert from 'node:assert';
 
 import { ARTIFICIAL_TASK_DATA } from '@/constants';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -36,7 +37,6 @@ describe('ExecutionRecoveryService', () => {
 			instanceSettings,
 			push,
 			executionRepository,
-			mock(),
 		);
 	});
 
@@ -127,12 +127,15 @@ describe('ExecutionRecoveryService', () => {
 		});
 
 		describe('if leader, with 1+ messages', () => {
-			test('should return `null` if execution succeeded', async () => {
+			test('for successful dataful execution, should return `null`', async () => {
 				/**
 				 * Arrange
 				 */
 				const workflow = await createWorkflow();
-				const execution = await createExecution({ status: 'success' }, workflow);
+				const execution = await createExecution(
+					{ status: 'success', data: stringify({ runData: { foo: 'bar' } }) },
+					workflow,
+				);
 				const messages = setupMessages(execution.id, 'Some workflow');
 
 				/**
@@ -170,7 +173,38 @@ describe('ExecutionRecoveryService', () => {
 				expect(amendedExecution).toBeNull();
 			});
 
-			test('should update `status`, `stoppedAt` and `data` if last node did not finish', async () => {
+			test('for successful dataless execution, should update `status`, `stoppedAt` and `data`', async () => {
+				/**
+				 * Arrange
+				 */
+				const workflow = await createWorkflow();
+				const execution = await createExecution(
+					{
+						status: 'success',
+						data: stringify(undefined), // saved execution but likely crashed while saving high-volume data
+					},
+					workflow,
+				);
+				const messages = setupMessages(execution.id, 'Some workflow');
+
+				/**
+				 * Act
+				 */
+				const amendedExecution = await executionRecoveryService.recoverFromLogs(
+					execution.id,
+					messages,
+				);
+
+				/**
+				 * Assert
+				 */
+				assert(amendedExecution);
+				expect(amendedExecution.stoppedAt).not.toBe(execution.stoppedAt);
+				expect(amendedExecution.data).toEqual({ resultData: { runData: {} } });
+				expect(amendedExecution.status).toBe('crashed');
+			});
+
+			test('for running execution, should update `status`, `stoppedAt` and `data` if last node did not finish', async () => {
 				/**
 				 * Arrange
 				 */
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 503e53d023..3a5d5a65b1 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -8,10 +8,9 @@ import { ARTIFICIAL_TASK_DATA } from '@/constants';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { NodeCrashedError } from '@/errors/node-crashed.error';
 import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
-import { EventService } from '@/events/event.service';
+import { getLifecycleHooksForRegularMain } from '@/execution-lifecycle/execution-lifecycle-hooks';
 import type { IExecutionResponse } from '@/interfaces';
 import { Push } from '@/push';
-import { getWorkflowHooksMain } from '@/workflow-execute-additional-data'; // @TODO: Dependency cycle
 
 import type { EventMessageTypes } from '../eventbus/event-message-classes';
 
@@ -25,7 +24,6 @@ export class ExecutionRecoveryService {
 		private readonly instanceSettings: InstanceSettings,
 		private readonly push: Push,
 		private readonly executionRepository: ExecutionRepository,
-		private readonly eventService: EventService,
 	) {}
 
 	/**
@@ -73,7 +71,7 @@ export class ExecutionRecoveryService {
 			unflattenData: true,
 		});
 
-		if (!execution || execution.status === 'success') return null;
+		if (!execution || (execution.status === 'success' && execution.data)) return null;
 
 		const runExecutionData = execution.data ?? { resultData: { runData: {} } };
 
@@ -176,20 +174,14 @@ export class ExecutionRecoveryService {
 	private async runHooks(execution: IExecutionResponse) {
 		execution.data ??= { resultData: { runData: {} } };
 
-		this.eventService.emit('workflow-post-execute', {
-			workflow: execution.workflowData,
-			executionId: execution.id,
-			runData: execution,
-		});
-
-		const externalHooks = getWorkflowHooksMain(
+		const lifecycleHooks = getLifecycleHooksForRegularMain(
 			{
 				userId: '',
 				workflowData: execution.workflowData,
 				executionMode: execution.mode,
 				executionData: execution.data,
 				runData: execution.data.resultData.runData,
-				retryOf: execution.retryOf,
+				retryOf: execution.retryOf ?? undefined,
 			},
 			execution.id,
 		);
@@ -204,6 +196,6 @@ export class ExecutionRecoveryService {
 			status: execution.status,
 		};
 
-		await externalHooks.executeHookFunctions('workflowExecuteAfter', [run]);
+		await lifecycleHooks.runHook('workflowExecuteAfter', [run]);
 	}
 }
diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts
index 8a0ba82c98..da8aa2d230 100644
--- a/packages/cli/src/external-hooks.ts
+++ b/packages/cli/src/external-hooks.ts
@@ -1,25 +1,104 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+import type { FrontendSettings, UserUpdateRequestDto } from '@n8n/api-types';
+import type { ClientOAuth2Options } from '@n8n/client-oauth2';
+import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
+import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow';
 import { ApplicationError } from 'n8n-workflow';
+import type clientOAuth1 from 'oauth-1.0a';
 
-import config from '@/config';
+import type { AbstractServer } from '@/abstract-server';
+import type { Config } from '@/config';
+import type { TagEntity } from '@/databases/entities/tag-entity';
+import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import type { IExternalHooksFileData, IExternalHooksFunctions } from '@/interfaces';
+import type { ICredentialsDb, PublicUser } from '@/interfaces';
+
+type Repositories = {
+	User: UserRepository;
+	Settings: SettingsRepository;
+	Credentials: CredentialsRepository;
+	Workflow: WorkflowRepository;
+};
+
+type ExternalHooksMap = {
+	'n8n.ready': [server: AbstractServer, config: Config];
+	'n8n.stop': never;
+	'worker.ready': never;
+
+	'activeWorkflows.initialized': never;
+
+	'credentials.create': [encryptedData: ICredentialsDb];
+	'credentials.update': [newCredentialData: ICredentialsDb];
+	'credentials.delete': [credentialId: string];
+
+	'frontend.settings': [frontendSettings: FrontendSettings];
+
+	'mfa.beforeSetup': [user: User];
+
+	'oauth1.authenticate': [
+		oAuthOptions: clientOAuth1.Options,
+		oauthRequestData: { oauth_callback: string },
+	];
+	'oauth2.authenticate': [oAuthOptions: ClientOAuth2Options];
+	'oauth2.callback': [oAuthOptions: ClientOAuth2Options];
+
+	'tag.beforeCreate': [tag: TagEntity];
+	'tag.afterCreate': [tag: TagEntity];
+	'tag.beforeUpdate': [tag: TagEntity];
+	'tag.afterUpdate': [tag: TagEntity];
+	'tag.beforeDelete': [tagId: string];
+	'tag.afterDelete': [tagId: string];
+
+	'user.deleted': [user: PublicUser];
+	'user.profile.beforeUpdate': [
+		userId: string,
+		currentEmail: string,
+		payload: UserUpdateRequestDto,
+	];
+	'user.profile.update': [currentEmail: string, publicUser: PublicUser];
+	'user.password.update': [updatedEmail: string, updatedPassword: string];
+	'user.invited': [emails: string[]];
+
+	'workflow.create': [createdWorkflow: IWorkflowBase];
+	'workflow.afterCreate': [createdWorkflow: IWorkflowBase];
+	'workflow.activate': [updatedWorkflow: IWorkflowBase];
+	'workflow.update': [updatedWorkflow: IWorkflowBase];
+	'workflow.afterUpdate': [updatedWorkflow: IWorkflowBase];
+	'workflow.delete': [workflowId: string];
+	'workflow.afterDelete': [workflowId: string];
+
+	'workflow.preExecute': [workflow: Workflow, mode: WorkflowExecuteMode];
+	'workflow.postExecute': [
+		fullRunData: IRun | undefined,
+		workflowData: IWorkflowBase,
+		executionId: string,
+	];
+};
+type HookNames = keyof ExternalHooksMap;
+
+// TODO: Derive this type from Hooks
+interface IExternalHooksFileData {
+	[Resource: string]: {
+		[Operation: string]: Array<(...args: unknown[]) => Promise<void>>;
+	};
+}
 
 @Service()
 export class ExternalHooks {
-	externalHooks: {
-		[key: string]: Array<() => {}>;
+	private readonly registered: {
+		[hookName in HookNames]?: Array<(...args: ExternalHooksMap[hookName]) => Promise<void>>;
 	} = {};
 
-	private initDidRun = false;
-
-	private dbCollections: IExternalHooksFunctions['dbCollections'];
+	private readonly dbCollections: Repositories;
 
 	constructor(
+		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
+		private readonly globalConfig: GlobalConfig,
 		userRepository: UserRepository,
 		settingsRepository: SettingsRepository,
 		credentialsRepository: CredentialsRepository,
@@ -33,72 +112,58 @@ export class ExternalHooks {
 		};
 	}
 
-	async init(): Promise<void> {
-		if (this.initDidRun) {
-			return;
-		}
-
-		await this.loadHooksFiles();
-
-		this.initDidRun = true;
-	}
-
-	private async loadHooksFiles() {
-		const externalHookFiles = config.getEnv('externalHookFiles').split(':');
+	async init() {
+		const externalHookFiles = this.globalConfig.externalHooks.files;
 
 		// Load all the provided hook-files
 		for (let hookFilePath of externalHookFiles) {
 			hookFilePath = hookFilePath.trim();
-			if (hookFilePath !== '') {
-				try {
-					const hookFile = require(hookFilePath) as IExternalHooksFileData;
-					this.loadHooks(hookFile);
-				} catch (e) {
-					const error = e instanceof Error ? e : new Error(`${e}`);
+			try {
+				// eslint-disable-next-line @typescript-eslint/no-var-requires
+				const hookFile = require(hookFilePath) as IExternalHooksFileData;
+				this.loadHooks(hookFile);
+			} catch (e) {
+				const error = e instanceof Error ? e : new Error(`${e}`);
 
-					throw new ApplicationError('Problem loading external hook file', {
-						extra: { errorMessage: error.message, hookFilePath },
-						cause: error,
-					});
-				}
+				throw new ApplicationError('Problem loading external hook file', {
+					extra: { errorMessage: error.message, hookFilePath },
+					cause: error,
+				});
 			}
 		}
 	}
 
 	private loadHooks(hookFileData: IExternalHooksFileData) {
-		for (const resource of Object.keys(hookFileData)) {
-			for (const operation of Object.keys(hookFileData[resource])) {
-				// Save all the hook functions directly under their string
-				// format in an array
-				const hookString = `${resource}.${operation}`;
-				if (this.externalHooks[hookString] === undefined) {
-					this.externalHooks[hookString] = [];
-				}
-
-				// eslint-disable-next-line prefer-spread
-				this.externalHooks[hookString].push.apply(
-					this.externalHooks[hookString],
-					hookFileData[resource][operation],
-				);
+		const { registered } = this;
+		for (const [resource, operations] of Object.entries(hookFileData)) {
+			for (const operation of Object.keys(operations)) {
+				const hookName = `${resource}.${operation}` as HookNames;
+				registered[hookName] ??= [];
+				registered[hookName].push(...operations[operation]);
 			}
 		}
 	}
 
-	async run(hookName: string, hookParameters?: any[]): Promise<void> {
-		if (this.externalHooks[hookName] === undefined) {
-			return;
+	async run<HookName extends HookNames>(
+		hookName: HookName,
+		hookParameters?: ExternalHooksMap[HookName],
+	): Promise<void> {
+		const { registered, dbCollections } = this;
+		const hookFunctions = registered[hookName];
+		if (!hookFunctions?.length) return;
+
+		const context = { dbCollections };
+
+		for (const hookFunction of hookFunctions) {
+			try {
+				await hookFunction.apply(context, hookParameters);
+			} catch (cause) {
+				this.logger.error(`There was a problem running hook "${hookName}"`);
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				const error = new ApplicationError(`External hook "${hookName}" failed`, { cause });
+				this.errorReporter.error(error, { level: 'fatal' });
+				throw error;
+			}
 		}
-
-		const externalHookFunctions: IExternalHooksFunctions = {
-			dbCollections: this.dbCollections,
-		};
-
-		for (const externalHookFunction of this.externalHooks[hookName]) {
-			await externalHookFunction.apply(externalHookFunctions, hookParameters);
-		}
-	}
-
-	exists(hookName: string): boolean {
-		return !!this.externalHooks[hookName];
 	}
 }
diff --git a/packages/cli/src/interfaces.ts b/packages/cli/src/interfaces.ts
index e50b96c384..c5cf76bd32 100644
--- a/packages/cli/src/interfaces.ts
+++ b/packages/cli/src/interfaces.ts
@@ -31,10 +31,6 @@ import type { AuthProviderType } from '@/databases/entities/auth-identity';
 import type { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import type { AssignableRole, GlobalRole, User } from '@/databases/entities/user';
-import type { CredentialsRepository } from '@/databases/repositories/credentials.repository';
-import type { SettingsRepository } from '@/databases/repositories/settings.repository';
-import type { UserRepository } from '@/databases/repositories/user.repository';
-import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
 import type { LICENSE_FEATURES, LICENSE_QUOTAS } from './constants';
 import type { ExternalHooks } from './external-hooks';
@@ -220,46 +216,6 @@ export interface IExecutingWorkflowData {
 	status: ExecutionStatus;
 }
 
-export interface IExternalHooks {
-	credentials?: {
-		create?: Array<{
-			(this: IExternalHooksFunctions, credentialsData: ICredentialsEncrypted): Promise<void>;
-		}>;
-		delete?: Array<{ (this: IExternalHooksFunctions, credentialId: string): Promise<void> }>;
-		update?: Array<{
-			(this: IExternalHooksFunctions, credentialsData: ICredentialsDb): Promise<void>;
-		}>;
-	};
-	workflow?: {
-		activate?: Array<{ (this: IExternalHooksFunctions, workflowData: IWorkflowDb): Promise<void> }>;
-		create?: Array<{ (this: IExternalHooksFunctions, workflowData: IWorkflowBase): Promise<void> }>;
-		delete?: Array<{ (this: IExternalHooksFunctions, workflowId: string): Promise<void> }>;
-		execute?: Array<{
-			(
-				this: IExternalHooksFunctions,
-				workflowData: IWorkflowDb,
-				mode: WorkflowExecuteMode,
-			): Promise<void>;
-		}>;
-		update?: Array<{ (this: IExternalHooksFunctions, workflowData: IWorkflowDb): Promise<void> }>;
-	};
-}
-
-export interface IExternalHooksFileData {
-	[key: string]: {
-		[key: string]: Array<(...args: any[]) => Promise<void>>;
-	};
-}
-
-export interface IExternalHooksFunctions {
-	dbCollections: {
-		User: UserRepository;
-		Settings: SettingsRepository;
-		Credentials: CredentialsRepository;
-		Workflow: WorkflowRepository;
-	};
-}
-
 export interface IPersonalizationSurveyAnswers {
 	email: string | null;
 	codingSkill: string | null;
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index 7a747530c2..c0bece9927 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -18,6 +18,9 @@ import {
 } from './constants';
 import type { BooleanLicenseFeature, NumericLicenseFeature } from './interfaces';
 
+const LICENSE_RENEWAL_DISABLED_WARNING =
+	'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!';
+
 export type FeatureReturnType = Partial<
 	{
 		planName: string;
@@ -40,26 +43,10 @@ export class License {
 		this.logger = this.logger.scoped('license');
 	}
 
-	/**
-	 * Whether this instance should renew the license - on init and periodically.
-	 */
-	private renewalEnabled() {
-		if (this.instanceSettings.instanceType !== 'main') return false;
-		const autoRenewEnabled = this.globalConfig.license.autoRenewalEnabled;
-
-		/**
-		 * In multi-main setup, all mains start off with `unset` status and so renewal disabled.
-		 * On becoming leader or follower, each will enable or disable renewal, respectively.
-		 * This ensures the mains do not cause a 429 (too many requests) on license init.
-		 */
-		if (this.globalConfig.multiMainSetup.enabled) {
-			return autoRenewEnabled && this.instanceSettings.isLeader;
-		}
-
-		return autoRenewEnabled;
-	}
-
-	async init(forceRecreate = false) {
+	async init({
+		forceRecreate = false,
+		isCli = false,
+	}: { forceRecreate?: boolean; isCli?: boolean } = {}) {
 		if (this.manager && !forceRecreate) {
 			this.logger.warn('License manager already initialized or shutting down');
 			return;
@@ -87,15 +74,23 @@ export class License {
 			? async () => await this.licenseMetricsService.collectPassthroughData()
 			: async () => ({});
 
-		const renewalEnabled = this.renewalEnabled();
+		const { isLeader } = this.instanceSettings;
+		const { autoRenewalEnabled } = this.globalConfig.license;
+		const eligibleToRenew = isCli || isLeader;
+
+		const shouldRenew = eligibleToRenew && autoRenewalEnabled;
+
+		if (eligibleToRenew && !autoRenewalEnabled) {
+			this.logger.warn(LICENSE_RENEWAL_DISABLED_WARNING);
+		}
 
 		try {
 			this.manager = new LicenseManager({
 				server,
 				tenantId: this.globalConfig.license.tenantId,
 				productIdentifier: `n8n-${N8N_VERSION}`,
-				autoRenewEnabled: renewalEnabled,
-				renewOnInit: renewalEnabled,
+				autoRenewEnabled: shouldRenew,
+				renewOnInit: shouldRenew,
 				autoRenewOffset,
 				offlineMode,
 				logger: this.logger,
@@ -275,7 +270,7 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.BINARY_DATA_S3);
 	}
 
-	isMultipleMainInstancesLicensed() {
+	isMultiMainLicensed() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
 	}
 
@@ -335,7 +330,7 @@ export class License {
 	}
 
 	/**
-	 * Helper function to get the main plan for a license
+	 * Helper function to get the latest main plan for a license
 	 */
 	getMainPlan(): TEntitlement | undefined {
 		if (!this.manager) {
@@ -347,6 +342,8 @@ export class License {
 			return undefined;
 		}
 
+		entitlements.sort((a, b) => b.validFrom.getTime() - a.validFrom.getTime());
+
 		return entitlements.find(
 			(entitlement) => (entitlement.productMetadata?.terms as { isMainPlan?: boolean })?.isMainPlan,
 		);
@@ -361,6 +358,10 @@ export class License {
 		return this.getFeatureValue(LICENSE_QUOTAS.USERS_LIMIT) ?? UNLIMITED_LICENSE_QUOTA;
 	}
 
+	getApiKeysPerUserLimit() {
+		return this.getFeatureValue(LICENSE_QUOTAS.API_KEYS_PER_USER_LIMIT) ?? 1;
+	}
+
 	getTriggerLimit() {
 		return this.getFeatureValue(LICENSE_QUOTAS.TRIGGER_LIMIT) ?? UNLIMITED_LICENSE_QUOTA;
 	}
@@ -400,8 +401,10 @@ export class License {
 	}
 
 	async reinit() {
-		this.manager?.reset();
-		await this.init(true);
+		if (this.manager) {
+			await this.manager.reset();
+		}
+		await this.init({ forceRecreate: true });
 		this.logger.debug('License reinitialized');
 	}
 }
diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts
index b027192388..dadf44c7ab 100644
--- a/packages/cli/src/load-nodes-and-credentials.ts
+++ b/packages/cli/src/load-nodes-and-credentials.ts
@@ -174,6 +174,29 @@ export class LoadNodesAndCredentials {
 		return isContainedWithin(loader.directory, filePath) ? filePath : undefined;
 	}
 
+	resolveSchema({
+		node,
+		version,
+		resource,
+		operation,
+	}: {
+		node: string;
+		version: string;
+		resource?: string;
+		operation?: string;
+	}): string | undefined {
+		const nodePath = this.known.nodes[node]?.sourcePath;
+		if (!nodePath) {
+			return undefined;
+		}
+
+		const nodeParentPath = path.dirname(nodePath);
+		const schemaPath = ['__schema__', `v${version}`, resource, operation].filter(Boolean).join('/');
+		const filePath = path.resolve(nodeParentPath, schemaPath + '.json');
+
+		return isContainedWithin(nodeParentPath, filePath) ? filePath : undefined;
+	}
+
 	getCustomDirectories(): string[] {
 		const customDirectories = [this.instanceSettings.customExtensionDir];
 
@@ -323,7 +346,15 @@ export class LoadNodesAndCredentials {
 					name: `${packageName}.${name}`,
 				})),
 			);
-			this.types.credentials = this.types.credentials.concat(types.credentials);
+			this.types.credentials = this.types.credentials.concat(
+				types.credentials.map(({ supportedNodes, ...rest }) => ({
+					...rest,
+					supportedNodes:
+						loader instanceof PackageDirectoryLoader
+							? supportedNodes?.map((nodeName) => `${loader.packageName}.${nodeName}`)
+							: undefined,
+				})),
+			);
 
 			// Nodes and credentials that have been loaded immediately
 			for (const nodeTypeName in loader.nodeTypes) {
@@ -453,14 +484,6 @@ export class LoadNodesAndCredentials {
 					placeholder: `e.g. ${item.description.description}`,
 				};
 
-				const noticeProp: INodeProperties = {
-					displayName:
-						"Use the expression {{ $fromAI('placeholder_name') }} for any data to be filled by the model",
-					name: 'notice',
-					type: 'notice',
-					default: '',
-				};
-
 				item.description.properties.unshift(descProp);
 
 				// If node has resource or operation we can determine pre-populate tool description based on it
@@ -474,8 +497,6 @@ export class LoadNodesAndCredentials {
 						},
 					};
 				}
-
-				item.description.properties.unshift(noticeProp);
 			}
 		}
 
diff --git a/packages/cli/src/manual-execution.service.ts b/packages/cli/src/manual-execution.service.ts
index fd6c27215f..4d6754ff4e 100644
--- a/packages/cli/src/manual-execution.service.ts
+++ b/packages/cli/src/manual-execution.service.ts
@@ -23,6 +23,13 @@ export class ManualExecutionService {
 
 	getExecutionStartNode(data: IWorkflowExecutionDataProcess, workflow: Workflow) {
 		let startNode;
+
+		// If the user chose a trigger to start from we honor this.
+		if (data.triggerToStartFrom?.name) {
+			startNode = workflow.getNode(data.triggerToStartFrom.name) ?? undefined;
+		}
+
+		// Old logic for partial executions v1
 		if (
 			data.startNodes?.length === 1 &&
 			Object.keys(data.pinData ?? {}).includes(data.startNodes[0].name)
@@ -71,7 +78,11 @@ export class ManualExecutionService {
 				},
 			};
 
-			const workflowExecute = new WorkflowExecute(additionalData, 'manual', executionData);
+			const workflowExecute = new WorkflowExecute(
+				additionalData,
+				data.executionMode,
+				executionData,
+			);
 			return workflowExecute.processRunExecutionData(workflow);
 		} else if (
 			data.runData === undefined ||
@@ -101,7 +112,7 @@ export class ManualExecutionService {
 			// Execute only the nodes between start and destination nodes
 			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
 
-			if (data.partialExecutionVersion === '1') {
+			if (data.partialExecutionVersion === 2) {
 				return workflowExecute.runPartialWorkflow2(
 					workflow,
 					data.runData,
diff --git a/packages/cli/src/metrics/license-metrics.service.ts b/packages/cli/src/metrics/license-metrics.service.ts
index bd4ca6055b..1531809cd2 100644
--- a/packages/cli/src/metrics/license-metrics.service.ts
+++ b/packages/cli/src/metrics/license-metrics.service.ts
@@ -37,7 +37,9 @@ export class LicenseMetricsService {
 
 	async collectPassthroughData() {
 		return {
-			activeWorkflowIds: await this.workflowRepository.getActiveIds(),
+			// Get only the first 1000 active workflow IDs to avoid sending too much data to License Server
+			// Passthrough data is forwarded to Telemetry for further analysis, such as quota excesses
+			activeWorkflowIds: await this.workflowRepository.getActiveIds({ maxResults: 1000 }),
 		};
 	}
 }
diff --git a/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts b/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts
index 0e77792a43..3ced89ed49 100644
--- a/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts
+++ b/packages/cli/src/middlewares/list-query/__tests__/list-query.test.ts
@@ -6,6 +6,8 @@ import { selectListQueryMiddleware } from '@/middlewares/list-query/select';
 import type { ListQuery } from '@/requests';
 import * as ResponseHelper from '@/response-helper';
 
+import { sortByQueryMiddleware } from '../sort-by';
+
 describe('List query middleware', () => {
 	let mockReq: ListQuery.Request;
 	let mockRes: Response;
@@ -174,6 +176,84 @@ describe('List query middleware', () => {
 		});
 	});
 
+	describe('Query sort by', () => {
+		const validCases: Array<{ name: string; value: ListQuery.Workflow.SortOrder }> = [
+			{
+				name: 'sorting by name asc',
+				value: 'name:asc',
+			},
+			{
+				name: 'sorting by name desc',
+				value: 'name:desc',
+			},
+			{
+				name: 'sorting by createdAt asc',
+				value: 'createdAt:asc',
+			},
+			{
+				name: 'sorting by createdAt desc',
+				value: 'createdAt:desc',
+			},
+			{
+				name: 'sorting by updatedAt asc',
+				value: 'updatedAt:asc',
+			},
+			{
+				name: 'sorting by updatedAt desc',
+				value: 'updatedAt:desc',
+			},
+		];
+
+		const invalidCases: Array<{ name: string; value: string }> = [
+			{
+				name: 'sorting by invalid column',
+				value: 'test:asc',
+			},
+			{
+				name: 'sorting by valid column without order',
+				value: 'name',
+			},
+			{
+				name: 'sorting by valid column with invalid order',
+				value: 'name:test',
+			},
+		];
+
+		test.each(validCases)('should succeed validation when $name', async ({ value }) => {
+			mockReq.query = {
+				sortBy: value,
+			};
+
+			sortByQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toMatchObject(
+				expect.objectContaining({
+					sortBy: value,
+				}),
+			);
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
+		test.each(invalidCases)('should fail validation when $name', async ({ value }) => {
+			mockReq.query = {
+				sortBy: value as ListQuery.Workflow.SortOrder,
+			};
+
+			sortByQueryMiddleware(...args);
+
+			expect(sendErrorResponse).toHaveBeenCalledTimes(1);
+		});
+
+		test('should not pass sortBy to listQueryOptions if not provided', async () => {
+			mockReq.query = {};
+
+			sortByQueryMiddleware(...args);
+
+			expect(mockReq.listQueryOptions).toBeUndefined();
+			expect(nextFn).toBeCalledTimes(1);
+		});
+	});
+
 	describe('Combinations', () => {
 		test('should combine filter with select', async () => {
 			mockReq.query = { filter: '{ "name": "My Workflow" }', select: '["name", "id"]' };
diff --git a/packages/cli/src/middlewares/list-query/dtos/workflow.sort-by.dto.ts b/packages/cli/src/middlewares/list-query/dtos/workflow.sort-by.dto.ts
new file mode 100644
index 0000000000..80a0ca3a74
--- /dev/null
+++ b/packages/cli/src/middlewares/list-query/dtos/workflow.sort-by.dto.ts
@@ -0,0 +1,22 @@
+import type { ValidatorConstraintInterface, ValidationArguments } from 'class-validator';
+import { IsString, Validate, ValidatorConstraint } from 'class-validator';
+
+@ValidatorConstraint({ name: 'WorkflowSortByParameter', async: false })
+export class WorkflowSortByParameter implements ValidatorConstraintInterface {
+	validate(text: string, _: ValidationArguments) {
+		const [column, order] = text.split(':');
+		if (!column || !order) return false;
+
+		return ['name', 'createdAt', 'updatedAt'].includes(column) && ['asc', 'desc'].includes(order);
+	}
+
+	defaultMessage(_: ValidationArguments) {
+		return 'Invalid value for sortBy parameter';
+	}
+}
+
+export class WorkflowSorting {
+	@IsString()
+	@Validate(WorkflowSortByParameter)
+	sortBy?: string;
+}
diff --git a/packages/cli/src/middlewares/list-query/index.ts b/packages/cli/src/middlewares/list-query/index.ts
index a766b43bd0..2e4781337a 100644
--- a/packages/cli/src/middlewares/list-query/index.ts
+++ b/packages/cli/src/middlewares/list-query/index.ts
@@ -1,10 +1,11 @@
-import type { NextFunction, Response } from 'express';
+import { type NextFunction, type Response } from 'express';
 
 import type { ListQuery } from '@/requests';
 
 import { filterListQueryMiddleware } from './filter';
 import { paginationListQueryMiddleware } from './pagination';
 import { selectListQueryMiddleware } from './select';
+import { sortByQueryMiddleware } from './sort-by';
 
 export type ListQueryMiddleware = (
 	req: ListQuery.Request,
@@ -16,4 +17,5 @@ export const listQueryMiddleware: ListQueryMiddleware[] = [
 	filterListQueryMiddleware,
 	selectListQueryMiddleware,
 	paginationListQueryMiddleware,
+	sortByQueryMiddleware,
 ];
diff --git a/packages/cli/src/middlewares/list-query/sort-by.ts b/packages/cli/src/middlewares/list-query/sort-by.ts
new file mode 100644
index 0000000000..01aca505af
--- /dev/null
+++ b/packages/cli/src/middlewares/list-query/sort-by.ts
@@ -0,0 +1,39 @@
+import { plainToInstance } from 'class-transformer';
+import { validateSync } from 'class-validator';
+import type { RequestHandler } from 'express';
+import { ApplicationError } from 'n8n-workflow';
+
+import type { ListQuery } from '@/requests';
+import * as ResponseHelper from '@/response-helper';
+import { toError } from '@/utils';
+
+import { WorkflowSorting } from './dtos/workflow.sort-by.dto';
+
+export const sortByQueryMiddleware: RequestHandler = (req: ListQuery.Request, res, next) => {
+	const { sortBy } = req.query;
+
+	if (!sortBy) return next();
+
+	let SortBy;
+
+	try {
+		if (req.baseUrl.endsWith('workflows')) {
+			SortBy = WorkflowSorting;
+		} else {
+			return next();
+		}
+
+		const validationResponse = validateSync(plainToInstance(SortBy, { sortBy }));
+
+		if (validationResponse.length) {
+			const validationError = validationResponse[0];
+			throw new ApplicationError(validationError.constraints?.workflowSortBy ?? '');
+		}
+
+		req.listQueryOptions = { ...req.listQueryOptions, sortBy };
+
+		next();
+	} catch (maybeError) {
+		ResponseHelper.sendErrorResponse(res, toError(maybeError));
+	}
+};
diff --git a/packages/cli/src/node-types.ts b/packages/cli/src/node-types.ts
index 77d872dc26..bb0a5fbbc7 100644
--- a/packages/cli/src/node-types.ts
+++ b/packages/cli/src/node-types.ts
@@ -1,7 +1,10 @@
+import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import type { NeededNodeType } from '@n8n/task-runner';
 import type { Dirent } from 'fs';
 import { readdir } from 'fs/promises';
+import { RoutingNode } from 'n8n-core';
+import type { ExecuteContext } from 'n8n-core';
 import type { INodeType, INodeTypeDescription, INodeTypes, IVersionedNodeType } from 'n8n-workflow';
 import { ApplicationError, NodeHelpers } from 'n8n-workflow';
 import { join, dirname } from 'path';
@@ -10,7 +13,10 @@ import { LoadNodesAndCredentials } from './load-nodes-and-credentials';
 
 @Service()
 export class NodeTypes implements INodeTypes {
-	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {}
+	constructor(
+		private readonly globalConfig: GlobalConfig,
+		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
+	) {}
 
 	/**
 	 * Variant of `getByNameAndVersion` that includes the node's source path, used to locate a node's translations.
@@ -31,14 +37,38 @@ export class NodeTypes implements INodeTypes {
 
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
 		const origType = nodeType;
-		const toolRequested = nodeType.startsWith('n8n-nodes-base') && nodeType.endsWith('Tool');
+
+		const { communityPackages } = this.globalConfig.nodes;
+		const allowToolUsage = communityPackages.allowToolUsage
+			? true
+			: nodeType.startsWith('n8n-nodes-base');
+		const toolRequested = nodeType.endsWith('Tool');
+
 		// Make sure the nodeType to actually get from disk is the un-wrapped type
-		if (toolRequested) {
+		if (allowToolUsage && toolRequested) {
 			nodeType = nodeType.replace(/Tool$/, '');
 		}
 
 		const node = this.loadNodesAndCredentials.getNode(nodeType);
 		const versionedNodeType = NodeHelpers.getVersionedNodeType(node.type, version);
+		if (toolRequested && typeof versionedNodeType.supplyData === 'function') {
+			throw new ApplicationError('Node already has a `supplyData` method', { extra: { nodeType } });
+		}
+
+		if (
+			!versionedNodeType.execute &&
+			!versionedNodeType.poll &&
+			!versionedNodeType.trigger &&
+			!versionedNodeType.webhook &&
+			!versionedNodeType.methods
+		) {
+			versionedNodeType.execute = async function (this: ExecuteContext) {
+				const routingNode = new RoutingNode(this, versionedNodeType);
+				const data = await routingNode.runNode();
+				return data ?? [];
+			};
+		}
+
 		if (!toolRequested) return versionedNodeType;
 
 		if (!versionedNodeType.description.usableAsTool)
diff --git a/packages/cli/src/public-api/types.ts b/packages/cli/src/public-api/types.ts
index b10d2f81bd..14e586dfdb 100644
--- a/packages/cli/src/public-api/types.ts
+++ b/packages/cli/src/public-api/types.ts
@@ -173,16 +173,6 @@ export interface IJsonSchema {
 	required: string[];
 }
 
-export class SourceControlPull {
-	force?: boolean;
-
-	variables?: { [key: string]: string };
-}
-
-export declare namespace PublicSourceControlRequest {
-	type Pull = AuthenticatedRequest<{}, {}, SourceControlPull, {}>;
-}
-
 // ----------------------------------
 //           /audit
 // ----------------------------------
diff --git a/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts b/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts
index a693058f93..c55b10053d 100644
--- a/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts
@@ -1,25 +1,28 @@
+import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import type { Response } from 'express';
 
 import { ProjectController } from '@/controllers/project.controller';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import type { PaginatedRequest } from '@/public-api/types';
-import type { ProjectRequest } from '@/requests';
+import type { AuthenticatedRequest } from '@/requests';
 
 import { globalScope, isLicensed, validCursor } from '../../shared/middlewares/global.middleware';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
 
-type Create = ProjectRequest.Create;
-type Update = ProjectRequest.Update;
-type Delete = ProjectRequest.Delete;
 type GetAll = PaginatedRequest;
 
 export = {
 	createProject: [
 		isLicensed('feat:projectRole:admin'),
 		globalScope('project:create'),
-		async (req: Create, res: Response) => {
-			const project = await Container.get(ProjectController).createProject(req);
+		async (req: AuthenticatedRequest, res: Response) => {
+			const payload = CreateProjectDto.safeParse(req.body);
+			if (payload.error) {
+				return res.status(400).json(payload.error.errors[0]);
+			}
+
+			const project = await Container.get(ProjectController).createProject(req, res, payload.data);
 
 			return res.status(201).json(project);
 		},
@@ -27,8 +30,18 @@ export = {
 	updateProject: [
 		isLicensed('feat:projectRole:admin'),
 		globalScope('project:update'),
-		async (req: Update, res: Response) => {
-			await Container.get(ProjectController).updateProject(req);
+		async (req: AuthenticatedRequest<{ projectId: string }>, res: Response) => {
+			const payload = UpdateProjectDto.safeParse(req.body);
+			if (payload.error) {
+				return res.status(400).json(payload.error.errors[0]);
+			}
+
+			await Container.get(ProjectController).updateProject(
+				req,
+				res,
+				payload.data,
+				req.params.projectId,
+			);
 
 			return res.status(204).send();
 		},
@@ -36,8 +49,18 @@ export = {
 	deleteProject: [
 		isLicensed('feat:projectRole:admin'),
 		globalScope('project:delete'),
-		async (req: Delete, res: Response) => {
-			await Container.get(ProjectController).deleteProject(req);
+		async (req: AuthenticatedRequest<{ projectId: string }>, res: Response) => {
+			const query = DeleteProjectDto.safeParse(req.query);
+			if (query.error) {
+				return res.status(400).json(query.error.errors[0]);
+			}
+
+			await Container.get(ProjectController).deleteProject(
+				req,
+				res,
+				query.data,
+				req.params.projectId,
+			);
 
 			return res.status(204).send();
 		},
diff --git a/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts
index 646a3f075e..4a0729ef6e 100644
--- a/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts
@@ -1,3 +1,4 @@
+import { PullWorkFolderRequestDto } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import type express from 'express';
 import type { StatusResult } from 'simple-git';
@@ -10,15 +11,15 @@ import { SourceControlPreferencesService } from '@/environments.ee/source-contro
 import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';
 import type { ImportResult } from '@/environments.ee/source-control/types/import-result';
 import { EventService } from '@/events/event.service';
+import type { AuthenticatedRequest } from '@/requests';
 
-import type { PublicSourceControlRequest } from '../../../types';
 import { globalScope } from '../../shared/middlewares/global.middleware';
 
 export = {
 	pull: [
 		globalScope('sourceControl:pull'),
 		async (
-			req: PublicSourceControlRequest.Pull,
+			req: AuthenticatedRequest,
 			res: express.Response,
 		): Promise<ImportResult | StatusResult | Promise<express.Response>> => {
 			const sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
@@ -33,17 +34,14 @@ export = {
 					.json({ status: 'Error', message: 'Source Control is not connected to a repository' });
 			}
 			try {
+				const payload = PullWorkFolderRequestDto.parse(req.body);
 				const sourceControlService = Container.get(SourceControlService);
-				const result = await sourceControlService.pullWorkfolder({
-					force: req.body.force,
-					variables: req.body.variables,
-					userId: req.user.id,
-				});
+				const result = await sourceControlService.pullWorkfolder(req.user, payload);
 
 				if (result.statusCode === 200) {
 					Container.get(EventService).emit('source-control-user-pulled-api', {
 						...getTrackingInformationFromPullResult(result.statusResult),
-						forced: req.body.force ?? false,
+						forced: payload.force ?? false,
 					});
 					return res.status(200).send(result.statusResult);
 				} else {
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
index b79ea4547b..77a07fea0f 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
@@ -1,14 +1,14 @@
+import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
-import type { FindOptionsWhere } from '@n8n/typeorm';
-// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Like, QueryFailedError } from '@n8n/typeorm';
+// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
+import type { FindOptionsWhere } from '@n8n/typeorm';
 import type express from 'express';
 import { v4 as uuid } from 'uuid';
 import { z } from 'zod';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import config from '@/config';
 import { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
@@ -111,7 +111,7 @@ export = {
 				id,
 				req.user,
 				['workflow:read'],
-				{ includeTags: !config.getEnv('workflowTagsDisabled') },
+				{ includeTags: !Container.get(GlobalConfig).tags.disabled },
 			);
 
 			if (!workflow) {
@@ -209,7 +209,7 @@ export = {
 				skip: offset,
 				take: limit,
 				where,
-				...(!config.getEnv('workflowTagsDisabled') && { relations: ['tags'] }),
+				...(!Container.get(GlobalConfig).tags.disabled && { relations: ['tags'] }),
 			});
 
 			if (excludePinnedData) {
@@ -379,7 +379,7 @@ export = {
 		async (req: WorkflowRequest.GetTags, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
-			if (config.getEnv('workflowTagsDisabled')) {
+			if (Container.get(GlobalConfig).tags.disabled) {
 				return res.status(400).json({ message: 'Workflow Tags Disabled' });
 			}
 
@@ -406,7 +406,7 @@ export = {
 			const { id } = req.params;
 			const newTags = req.body.map((newTag) => newTag.id);
 
-			if (config.getEnv('workflowTagsDisabled')) {
+			if (Container.get(GlobalConfig).tags.disabled) {
 				return res.status(400).json({ message: 'Workflow Tags Disabled' });
 			}
 
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts
index 53e67d8b0d..131919d096 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts
@@ -1,7 +1,7 @@
+import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 
-import config from '@/config';
 import type { Project } from '@/databases/entities/project';
 import { SharedWorkflow, type WorkflowSharingRole } from '@/databases/entities/shared-workflow';
 import type { User } from '@/databases/entities/user';
@@ -46,7 +46,10 @@ export async function getSharedWorkflow(
 			...(!['global:owner', 'global:admin'].includes(user.role) && { userId: user.id }),
 			...(workflowId && { workflowId }),
 		},
-		relations: [...insertIf(!config.getEnv('workflowTagsDisabled'), ['workflow.tags']), 'workflow'],
+		relations: [
+			...insertIf(!Container.get(GlobalConfig).tags.disabled, ['workflow.tags']),
+			'workflow',
+		],
 	});
 }
 
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index e795df5722..4c2d8ac032 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -169,8 +169,12 @@ export class Push extends TypedEmitter<PushEvents> {
 
 		this.logger.warn(`Size of "${type}" (${eventMb} MB) exceeds max size ${maxMb} MB. Trimming...`);
 
-		if (type === 'nodeExecuteAfter') pushMsgCopy.data.data.data = TRIMMED_TASK_DATA_CONNECTIONS;
-		else if (type === 'executionFinished') pushMsgCopy.data.rawData = ''; // prompt client to fetch from DB
+		if (type === 'nodeExecuteAfter') {
+			pushMsgCopy.data.itemCount = pushMsgCopy.data.data.data?.main[0]?.length ?? 1;
+			pushMsgCopy.data.data.data = TRIMMED_TASK_DATA_CONNECTIONS;
+		} else if (type === 'executionFinished') {
+			pushMsgCopy.data.rawData = ''; // prompt client to fetch from DB
+		}
 
 		void this.publisher.publishCommand({
 			command: 'relay-execution-lifecycle-event',
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 5776549566..f57b8b858f 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -1,3 +1,4 @@
+import type { ProjectIcon, ProjectRole, ProjectType } from '@n8n/api-types';
 import type { Scope } from '@n8n/permissions';
 import type express from 'express';
 import type {
@@ -9,14 +10,13 @@ import type {
 } from 'n8n-workflow';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { Project, ProjectIcon, ProjectType } from '@/databases/entities/project';
+import type { Project } from '@/databases/entities/project';
 import type { AssignableRole, GlobalRole, User } from '@/databases/entities/user';
 import type { Variables } from '@/databases/entities/variables';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import type { WorkflowHistory } from '@/databases/entities/workflow-history';
 import type { SecretsProvider, SecretsProviderState } from '@/interfaces';
 
-import type { ProjectRole } from './databases/entities/project-relation';
 import type { ScopesField } from './services/role.service';
 
 export type APIRequest<
@@ -62,6 +62,7 @@ export namespace ListQuery {
 		skip?: string;
 		take?: string;
 		select?: string;
+		sortBy?: string;
 	};
 
 	export type Options = {
@@ -69,6 +70,7 @@ export namespace ListQuery {
 		select?: Record<string, true>;
 		skip?: number;
 		take?: number;
+		sortBy?: string;
 	};
 
 	/**
@@ -82,6 +84,10 @@ export namespace ListQuery {
 
 		type SharedField = Partial<Pick<WorkflowEntity, 'shared'>>;
 
+		type SortingField = 'createdAt' | 'updatedAt' | 'name';
+
+		export type SortOrder = `${SortingField}:asc` | `${SortingField}:desc`;
+
 		type OwnedByField = { ownedBy: SlimUser | null; homeProject: SlimProject | null };
 
 		export type Plain = BaseFields;
@@ -175,14 +181,6 @@ export declare namespace CredentialRequest {
 	>;
 }
 
-// ----------------------------------
-//               /api-keys
-// ----------------------------------
-
-export declare namespace ApiKeysRequest {
-	export type DeleteAPIKey = AuthenticatedRequest<{ id: string }>;
-}
-
 // ----------------------------------
 //               /me
 // ----------------------------------
@@ -264,17 +262,6 @@ export declare namespace OAuthRequest {
 	}
 }
 
-// ----------------------------------
-//             /tags
-// ----------------------------------
-
-export declare namespace TagsRequest {
-	type GetAll = AuthenticatedRequest<{}, {}, {}, { withUsageCount: string }>;
-	type Create = AuthenticatedRequest<{}, {}, { name: string }>;
-	type Update = AuthenticatedRequest<{ id: string }, {}, { name: string }>;
-	type Delete = AuthenticatedRequest<{ id: string }>;
-}
-
 // ----------------------------------
 //             /annotation-tags
 // ----------------------------------
@@ -388,32 +375,10 @@ export declare namespace ActiveWorkflowRequest {
 // ----------------------------------
 
 export declare namespace ProjectRequest {
-	type GetAll = AuthenticatedRequest<{}, Project[]>;
-
-	type Create = AuthenticatedRequest<
-		{},
-		Project,
-		{
-			name: string;
-			icon?: ProjectIcon;
-		}
-	>;
-
-	type GetMyProjects = AuthenticatedRequest<
-		{},
-		Array<Project & { role: ProjectRole }>,
-		{},
-		{
-			includeScopes?: boolean;
-		}
-	>;
 	type GetMyProjectsResponse = Array<
 		Project & { role: ProjectRole | GlobalRole; scopes?: Scope[] }
 	>;
 
-	type GetPersonalProject = AuthenticatedRequest<{}, Project>;
-
-	type ProjectRelationPayload = { userId: string; role: ProjectRole };
 	type ProjectRelationResponse = {
 		id: string;
 		email: string;
@@ -429,18 +394,6 @@ export declare namespace ProjectRequest {
 		relations: ProjectRelationResponse[];
 		scopes: Scope[];
 	};
-
-	type Get = AuthenticatedRequest<{ projectId: string }, {}>;
-	type Update = AuthenticatedRequest<
-		{ projectId: string },
-		{},
-		{
-			name?: string;
-			relations?: ProjectRelationPayload[];
-			icon?: { type: 'icon' | 'emoji'; value: string };
-		}
-	>;
-	type Delete = AuthenticatedRequest<{ projectId: string }, {}, {}, { transferId?: string }>;
 }
 
 // ----------------------------------
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 2aff0787c4..18a6f6b39f 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -1,6 +1,12 @@
 import type { RunningJobSummary } from '@n8n/api-types';
 import { Service } from '@n8n/di';
-import { InstanceSettings, WorkflowExecute, ErrorReporter, Logger } from 'n8n-core';
+import {
+	WorkflowHasIssuesError,
+	InstanceSettings,
+	WorkflowExecute,
+	ErrorReporter,
+	Logger,
+} from 'n8n-core';
 import type {
 	ExecutionStatus,
 	IExecuteResponsePromiseData,
@@ -13,6 +19,7 @@ import type PCancelable from 'p-cancelable';
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { getLifecycleHooksForScalingWorker } from '@/execution-lifecycle/execution-lifecycle-hooks';
 import { ManualExecutionService } from '@/manual-execution.service';
 import { NodeTypes } from '@/node-types';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
@@ -124,30 +131,29 @@ export class JobProcessor {
 
 		const { pushRef } = job.data;
 
-		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
+		const lifecycleHooks = getLifecycleHooksForScalingWorker(
 			execution.mode,
 			job.data.executionId,
 			execution.workflowData,
-			{ retryOf: execution.retryOf as string, pushRef },
+			{ retryOf: execution.retryOf ?? undefined, pushRef },
 		);
+		additionalData.hooks = lifecycleHooks;
 
 		if (pushRef) {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			additionalData.sendDataToUI = WorkflowExecuteAdditionalData.sendDataToUI.bind({ pushRef });
 		}
 
-		additionalData.hooks.hookFunctions.sendResponse = [
-			async (response: IExecuteResponsePromiseData): Promise<void> => {
-				const msg: RespondToWebhookMessage = {
-					kind: 'respond-to-webhook',
-					executionId,
-					response: this.encodeWebhookResponse(response),
-					workerId: this.instanceSettings.hostId,
-				};
+		lifecycleHooks.addHandler('sendResponse', async (response): Promise<void> => {
+			const msg: RespondToWebhookMessage = {
+				kind: 'respond-to-webhook',
+				executionId,
+				response: this.encodeWebhookResponse(response),
+				workerId: this.instanceSettings.hostId,
+			};
 
-				await job.progress(msg);
-			},
-		];
+			await job.progress(msg);
+		});
 
 		additionalData.executionId = executionId;
 
@@ -177,13 +183,33 @@ export class JobProcessor {
 				userId: manualData?.userId,
 			};
 
-			workflowRun = this.manualExecutionService.runManually(
-				data,
-				workflow,
-				additionalData,
-				executionId,
-				resultData.pinData,
-			);
+			try {
+				workflowRun = this.manualExecutionService.runManually(
+					data,
+					workflow,
+					additionalData,
+					executionId,
+					resultData.pinData,
+				);
+			} catch (error) {
+				if (error instanceof WorkflowHasIssuesError) {
+					// execution did not even start, but we call `workflowExecuteAfter` to notify main
+
+					const now = new Date();
+					const runData: IRun = {
+						mode: 'manual',
+						status: 'error',
+						finished: false,
+						startedAt: now,
+						stoppedAt: now,
+						data: { resultData: { error, runData: {} } },
+					};
+
+					await lifecycleHooks.runHook('workflowExecuteAfter', [runData]);
+					return { success: false };
+				}
+				throw error;
+			}
 		} else if (execution.data !== undefined) {
 			workflowExecute = new WorkflowExecute(additionalData, execution.mode, execution.data);
 			workflowRun = workflowExecute.processRunExecutionData(workflow);
@@ -202,7 +228,7 @@ export class JobProcessor {
 			workflowName: execution.workflowData.name,
 			mode: execution.mode,
 			startedAt,
-			retryOf: execution.retryOf ?? '',
+			retryOf: execution.retryOf ?? undefined,
 			status: execution.status,
 		};
 
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index 536e835c72..7c48ce57e2 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
 import { Container, Service } from '@n8n/di';
-import { ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
+import { ErrorReporter, InstanceSettings, isObjectLiteral, Logger } from 'n8n-core';
 import {
 	ApplicationError,
 	BINARY_ENCODING,
@@ -17,7 +17,6 @@ import config from '@/config';
 import { HIGHEST_SHUTDOWN_PRIORITY, Time } from '@/constants';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
-import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
 import { EventService } from '@/events/event.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { assertNever } from '@/utils';
@@ -93,6 +92,12 @@ export class ScalingService {
 
 		void this.queue.process(JOB_TYPE_NAME, concurrency, async (job: Job) => {
 			try {
+				if (!this.hasValidJobData(job)) {
+					throw new ApplicationError('Worker received invalid job', {
+						extra: { jobData: jsonStringify(job, { replaceCircularRefs: true }) },
+					});
+				}
+
 				await this.jobProcessor.processJob(job);
 			} catch (error) {
 				await this.reportJobProcessingError(ensureError(error), job);
@@ -265,10 +270,6 @@ export class ScalingService {
 		this.queue.on('error', (error: Error) => {
 			if ('code' in error && error.code === 'ECONNREFUSED') return; // handled by RedisClientService.retryStrategy
 
-			if (error.message.includes('job stalled more than maxStalledCount')) {
-				throw new MaxStalledCountError(error);
-			}
-
 			/**
 			 * Non-recoverable error on worker start with Redis unavailable.
 			 * Even if Redis recovers, worker will remain unable to process jobs.
@@ -503,5 +504,9 @@ export class ScalingService {
 			: jsonStringify(error, { replaceCircularRefs: true });
 	}
 
+	private hasValidJobData(job: Job) {
+		return isObjectLiteral(job.data) && 'executionId' in job.data && 'loadStaticData' in job.data;
+	}
+
 	// #endregion
 }
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index 09e3774aae..e505951dd4 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -37,7 +37,6 @@ import '@/controllers/active-workflows.controller';
 import '@/controllers/annotation-tags.controller.ee';
 import '@/controllers/auth.controller';
 import '@/controllers/binary-data.controller';
-import '@/controllers/curl.controller';
 import '@/controllers/ai.controller';
 import '@/controllers/dynamic-node-parameters.controller';
 import '@/controllers/invitation.controller';
@@ -135,6 +134,10 @@ export class Server extends AbstractServer {
 			await import('@/controllers/cta.controller');
 		}
 
+		if (!this.globalConfig.tags.disabled) {
+			await import('@/controllers/tags.controller');
+		}
+
 		// ----------------------------------------
 		// SAML
 		// ----------------------------------------
@@ -319,8 +322,27 @@ export class Server extends AbstractServer {
 				res.sendStatus(404);
 			};
 
+			const serveSchemas: express.RequestHandler = async (req, res) => {
+				const { node, version, resource, operation } = req.params;
+				const filePath = this.loadNodesAndCredentials.resolveSchema({
+					node,
+					resource,
+					operation,
+					version,
+				});
+
+				if (filePath) {
+					try {
+						await fsAccess(filePath);
+						return res.sendFile(filePath, cacheOptions);
+					} catch {}
+				}
+				res.sendStatus(404);
+			};
+
 			this.app.use('/icons/@:scope/:packageName/*/*.(svg|png)', serveIcons);
 			this.app.use('/icons/:packageName/*/*.(svg|png)', serveIcons);
+			this.app.use('/schemas/:node/:version/:resource?/:operation?.json', serveSchemas);
 
 			const isTLSEnabled =
 				this.globalConfig.protocol === 'https' && !!(this.sslKey && this.sslCert);
@@ -369,6 +391,7 @@ export class Server extends AbstractServer {
 					method === 'GET' &&
 					accept &&
 					(accept.includes('text/html') || accept.includes('*/*')) &&
+					!req.path.endsWith('.wasm') &&
 					!nonUIRoutesRegex.test(req.path)
 				) {
 					res.setHeader('Cache-Control', 'no-cache, no-store, must-revalidate');
diff --git a/packages/cli/src/services/__tests__/curl.service.test.ts b/packages/cli/src/services/__tests__/curl.service.test.ts
deleted file mode 100644
index 21f87b45b7..0000000000
--- a/packages/cli/src/services/__tests__/curl.service.test.ts
+++ /dev/null
@@ -1,297 +0,0 @@
-import { CurlService } from '@/services/curl.service';
-
-describe('CurlService', () => {
-	const service = new CurlService();
-
-	test('Should parse form-urlencoded content type correctly', () => {
-		const curl =
-			'curl -X POST https://reqbin.com/echo/post/form -H "Content-Type: application/x-www-form-urlencoded" -d "param1=value1&param2=value2"';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo/post/form');
-		expect(parameters.sendBody).toBe(true);
-		expect(parameters.bodyParameters?.parameters[0].name).toBe('param1');
-		expect(parameters.bodyParameters?.parameters[0].value).toBe('value1');
-		expect(parameters.bodyParameters?.parameters[1].name).toBe('param2');
-		expect(parameters.bodyParameters?.parameters[1].value).toBe('value2');
-		expect(parameters.contentType).toBe('form-urlencoded');
-		expect(parameters.sendHeaders).toBe(false);
-		expect(parameters.sendQuery).toBe(false);
-	});
-
-	test('Should parse JSON content type correctly', () => {
-		const curl =
-			'curl -X POST https://reqbin.com/echo/post/json -H \'Content-Type: application/json\' -d \'{"login":"my_login","password":"my_password"}\'';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
-		expect(parameters.sendBody).toBe(true);
-		expect(parameters.bodyParameters?.parameters[0].name).toBe('login');
-		expect(parameters.bodyParameters?.parameters[0].value).toBe('my_login');
-		expect(parameters.bodyParameters?.parameters[1].name).toBe('password');
-		expect(parameters.bodyParameters?.parameters[1].value).toBe('my_password');
-		expect(parameters.contentType).toBe('json');
-		expect(parameters.sendHeaders).toBe(false);
-		expect(parameters.sendQuery).toBe(false);
-	});
-
-	test('Should parse multipart-form-data content type correctly', () => {
-		const curl =
-			'curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
-		expect(parameters.sendBody).toBe(true);
-		expect(parameters.bodyParameters?.parameters[0].parameterType).toBe('formData');
-		expect(parameters.bodyParameters?.parameters[0].name).toBe('key1');
-		expect(parameters.bodyParameters?.parameters[0].value).toBe('value1');
-		expect(parameters.bodyParameters?.parameters[1].parameterType).toBe('formBinaryData');
-		expect(parameters.bodyParameters?.parameters[1].name).toBe('upload');
-		expect(parameters.contentType).toBe('multipart-form-data');
-		expect(parameters.sendHeaders).toBe(false);
-		expect(parameters.sendQuery).toBe(false);
-	});
-
-	test('Should parse binary request correctly', () => {
-		const curl =
-			"curl --location --request POST 'https://www.website.com' --header 'Content-Type: image/png' --data-binary '@/Users/image.png";
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://www.website.com');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(true);
-		expect(parameters.contentType).toBe('binaryData');
-		expect(parameters.sendHeaders).toBe(false);
-		expect(parameters.sendQuery).toBe(false);
-	});
-
-	test('Should parse unknown content type correctly', () => {
-		const curl = `curl -X POST https://reqbin.com/echo/post/xml
-		-H "Content-Type: application/xml"
-		-H "Accept: application/xml"
-		-d "<Request><Login>my_login</Login><Password>my_password</Password></Request>"`;
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo/post/xml');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(true);
-		expect(parameters.contentType).toBe('raw');
-		expect(parameters.rawContentType).toBe('application/xml');
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('Accept');
-		expect(parameters.headerParameters?.parameters[0].value).toBe('application/xml');
-		expect(parameters.sendQuery).toBe(false);
-	});
-
-	test('Should parse header properties and keep the original case', () => {
-		const curl =
-			'curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename -H "ACCEPT: text/javascript" -H "content-type: multipart/form-data"';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
-		expect(parameters.sendBody).toBe(true);
-		expect(parameters.bodyParameters?.parameters[0].parameterType).toBe('formData');
-		expect(parameters.bodyParameters?.parameters[0].name).toBe('key1');
-		expect(parameters.bodyParameters?.parameters[0].value).toBe('value1');
-		expect(parameters.bodyParameters?.parameters[1].parameterType).toBe('formBinaryData');
-		expect(parameters.bodyParameters?.parameters[1].name).toBe('upload');
-		expect(parameters.contentType).toBe('multipart-form-data');
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('ACCEPT');
-		expect(parameters.headerParameters?.parameters[0].value).toBe('text/javascript');
-		expect(parameters.sendQuery).toBe(false);
-	});
-
-	test('Should parse querystring properties', () => {
-		const curl = "curl -G -d 'q=kitties' -d 'count=20' https://google.com/search";
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://google.com/search');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendHeaders).toBe(false);
-		expect(parameters.sendQuery).toBe(true);
-		expect(parameters.queryParameters?.parameters[0].name).toBe('q');
-		expect(parameters.queryParameters?.parameters[0].value).toBe('kitties');
-		expect(parameters.queryParameters?.parameters[1].name).toBe('count');
-		expect(parameters.queryParameters?.parameters[1].value).toBe('20');
-	});
-
-	test('Should parse basic authentication property and keep the original case', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password"';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-	});
-
-	test('Should parse location flag with --location', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" --location';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.redirect.redirect.followRedirects).toBe(true);
-	});
-
-	test('Should parse location flag with --L', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" -L';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.redirect.redirect.followRedirects).toBe(true);
-	});
-
-	test('Should parse location and max redirects flags with --location and --max-redirs 10', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" --location --max-redirs 10';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.redirect.redirect.followRedirects).toBe(true);
-		expect(parameters.options.redirect.redirect.maxRedirects).toBe('10');
-	});
-
-	test('Should parse proxy flag -x', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.proxy).toBe('https://google.com');
-	});
-
-	test('Should parse proxy flag --proxy', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.proxy).toBe('https://google.com');
-	});
-
-	test('Should parse include headers on output flag --include', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" --include -x https://google.com';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.response.response.fullResponse).toBe(true);
-	});
-
-	test('Should parse include headers on output flag -i', () => {
-		const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com -i';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.contentType).toBeUndefined();
-		expect(parameters.sendQuery).toBe(false);
-		expect(parameters.sendHeaders).toBe(true);
-		expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
-		expect(parameters.headerParameters?.parameters[0].value).toBe(
-			`Basic ${Buffer.from('login:password').toString('base64')}`,
-		);
-		expect(parameters.options.response.response.fullResponse).toBe(true);
-	});
-
-	test('Should parse include request flag -X', () => {
-		const curl = 'curl -X POST https://reqbin.com/echo -u "login:password" -x https://google.com';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-	});
-
-	test('Should parse include request flag --request', () => {
-		const curl =
-			'curl --request POST https://reqbin.com/echo -u "login:password" -x https://google.com';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-	});
-
-	test('Should parse include timeout flag --connect-timeout', () => {
-		const curl =
-			'curl --request POST https://reqbin.com/echo -u "login:password" --connect-timeout 20';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.options.timeout).toBe(20000);
-	});
-
-	test('Should parse download file flag -O', () => {
-		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -O';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.options.response.response.responseFormat).toBe('file');
-		expect(parameters.options.response.response.outputPropertyName).toBe('data');
-	});
-
-	test('Should parse download file flag -o', () => {
-		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -o';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.options.response.response.responseFormat).toBe('file');
-		expect(parameters.options.response.response.outputPropertyName).toBe('data');
-	});
-
-	test('Should parse ignore SSL flag -k', () => {
-		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -k';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.options.allowUnauthorizedCerts).toBe(true);
-	});
-
-	test('Should parse ignore SSL flag --insecure', () => {
-		const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" --insecure';
-		const parameters = service.toHttpNodeParameters(curl);
-		expect(parameters.url).toBe('https://reqbin.com/echo');
-		expect(parameters.method).toBe('POST');
-		expect(parameters.sendBody).toBe(false);
-		expect(parameters.options.allowUnauthorizedCerts).toBe(true);
-	});
-});
diff --git a/packages/cli/src/services/__tests__/public-api-key.service.test.ts b/packages/cli/src/services/__tests__/public-api-key.service.test.ts
index 7c60b62983..86db071f35 100644
--- a/packages/cli/src/services/__tests__/public-api-key.service.test.ts
+++ b/packages/cli/src/services/__tests__/public-api-key.service.test.ts
@@ -144,4 +144,28 @@ describe('PublicApiKeyService', () => {
 			);
 		});
 	});
+
+	describe('redactApiKey', () => {
+		it('should redact api key', async () => {
+			//Arrange
+
+			const jwt =
+				'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE0ODUxNDA5ODQsImlhdCI6MTQ4NTEzNzM4NCwiaXNzIjoiYWNtZS5jb20iLCJzdWIiOiIyOWFjMGMxOC0wYjRhLTQyY2YtODJmYy0wM2Q1NzAzMThhMWQiLCJhcHBsaWNhdGlvbklkIjoiNzkxMDM3MzQtOTdhYi00ZDFhLWFmMzctZTAwNmQwNWQyOTUyIiwicm9sZXMiOltdfQ.Mp0Pcwsz5VECK11Kf2ZZNF_SMKu5CgBeLN9ZOP04kZo';
+
+			const publicApiKeyService = new PublicApiKeyService(
+				apiKeyRepository,
+				userRepository,
+				jwtService,
+				eventService,
+			);
+
+			//Act
+
+			const redactedApiKey = publicApiKeyService.redactApiKey(jwt);
+
+			//Assert
+
+			expect(redactedApiKey).toBe('******4kZo');
+		});
+	});
 });
diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts
index 1954923481..a45443a3bc 100644
--- a/packages/cli/src/services/credentials-tester.service.ts
+++ b/packages/cli/src/services/credentials-tester.service.ts
@@ -6,9 +6,10 @@
 import { Service } from '@n8n/di';
 import get from 'lodash/get';
 import {
+	CredentialTestContext,
 	ErrorReporter,
+	ExecuteContext,
 	Logger,
-	NodeExecuteFunctions,
 	RoutingNode,
 	isObjectLiteral,
 } from 'n8n-core';
@@ -29,6 +30,7 @@ import type {
 	INodeTypes,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteData,
 } from 'n8n-workflow';
 import { VersionedNodeType, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
 
@@ -205,9 +207,8 @@ export class CredentialsTester {
 
 		if (typeof credentialTestFunction === 'function') {
 			// The credentials get tested via a function that is defined on the node
-			const credentialTestFunctions = NodeExecuteFunctions.getCredentialTestFunctions();
-
-			return credentialTestFunction.call(credentialTestFunctions, credentialsDecrypted);
+			const context = new CredentialTestContext();
+			return credentialTestFunction.call(context, credentialsDecrypted);
 		}
 
 		// Credentials get tested via request instructions
@@ -293,25 +294,24 @@ export class CredentialsTester {
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id, node.parameters);
 
-		const routingNode = new RoutingNode(
+		const executeData: IExecuteData = { node, data: {}, source: null };
+		const executeFunctions = new ExecuteContext(
 			workflow,
 			node,
-			connectionInputData,
-			runExecutionData ?? null,
 			additionalData,
 			mode,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			executeData,
+			[],
 		);
+		const routingNode = new RoutingNode(executeFunctions, nodeTypeCopy, credentialsDecrypted);
 
 		let response: INodeExecutionData[][] | null | undefined;
-
 		try {
-			response = await routingNode.runNode(
-				inputData,
-				runIndex,
-				nodeTypeCopy,
-				{ node, data: {}, source: null },
-				credentialsDecrypted,
-			);
+			response = await routingNode.runNode();
 		} catch (error) {
 			this.errorReporter.error(error);
 			// Do not fail any requests to allow custom error messages and
diff --git a/packages/cli/src/services/curl.service.ts b/packages/cli/src/services/curl.service.ts
deleted file mode 100644
index fae967154e..0000000000
--- a/packages/cli/src/services/curl.service.ts
+++ /dev/null
@@ -1,479 +0,0 @@
-import { Service } from '@n8n/di';
-import get from 'lodash/get';
-import type { IDataObject } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
-
-import curlconverter from 'curlconverter';
-
-interface CurlJson {
-	url: string;
-	raw_url?: string;
-	method: string;
-	contentType?: string;
-	cookies?: {
-		[key: string]: string;
-	};
-	auth?: {
-		user: string;
-		password: string;
-	};
-	headers?: {
-		[key: string]: string;
-	};
-	files?: {
-		[key: string]: string;
-	};
-	queries: {
-		[key: string]: string;
-	};
-	data?: {
-		[key: string]: string;
-	};
-}
-
-interface Parameter {
-	parameterType?: string;
-	name: string;
-	value: string;
-}
-
-interface HttpNodeParameters {
-	url?: string;
-	method: string;
-	sendBody?: boolean;
-	authentication: string;
-	contentType?: 'form-urlencoded' | 'multipart-form-data' | 'json' | 'raw' | 'binaryData';
-	rawContentType?: string;
-	specifyBody?: 'json' | 'keypair';
-	bodyParameters?: {
-		parameters: Parameter[];
-	};
-	jsonBody?: object;
-	options: {
-		allowUnauthorizedCerts?: boolean;
-		proxy?: string;
-		timeout?: number;
-		redirect: {
-			redirect: {
-				followRedirects?: boolean;
-				maxRedirects?: number;
-			};
-		};
-		response: {
-			response: {
-				fullResponse?: boolean;
-				responseFormat?: string;
-				outputPropertyName?: string;
-			};
-		};
-	};
-	sendHeaders?: boolean;
-	headerParameters?: {
-		parameters: Parameter[];
-	};
-	sendQuery?: boolean;
-	queryParameters?: {
-		parameters: Parameter[];
-	};
-}
-
-type HttpNodeHeaders = Pick<HttpNodeParameters, 'sendHeaders' | 'headerParameters'>;
-
-type HttpNodeQueries = Pick<HttpNodeParameters, 'sendQuery' | 'queryParameters'>;
-
-const enum ContentTypes {
-	applicationJson = 'application/json',
-	applicationFormUrlEncoded = 'application/x-www-form-urlencoded',
-	applicationMultipart = 'multipart/form-data',
-}
-
-const SUPPORTED_CONTENT_TYPES = [
-	ContentTypes.applicationJson,
-	ContentTypes.applicationFormUrlEncoded,
-	ContentTypes.applicationMultipart,
-];
-
-const CONTENT_TYPE_KEY = 'content-type';
-
-const FOLLOW_REDIRECT_FLAGS = ['--location', '-L'];
-
-const MAX_REDIRECT_FLAG = '--max-redirs';
-
-const PROXY_FLAGS = ['-x', '--proxy'];
-
-const INCLUDE_HEADERS_IN_OUTPUT_FLAGS = ['-i', '--include'];
-
-const REQUEST_FLAGS = ['-X', '--request'];
-
-const TIMEOUT_FLAGS = ['--connect-timeout'];
-
-const DOWNLOAD_FILE_FLAGS = ['-O', '-o'];
-
-const IGNORE_SSL_ISSUES_FLAGS = ['-k', '--insecure'];
-
-const isContentType = (headers: CurlJson['headers'], contentType: ContentTypes): boolean => {
-	return get(headers, CONTENT_TYPE_KEY) === contentType;
-};
-
-const isJsonRequest = (curlJson: CurlJson): boolean => {
-	if (isContentType(curlJson.headers, ContentTypes.applicationJson)) return true;
-
-	if (curlJson.data) {
-		const bodyKey = Object.keys(curlJson.data)[0];
-		try {
-			JSON.parse(bodyKey);
-			return true;
-		} catch {
-			return false;
-		}
-	}
-	return false;
-};
-
-const isFormUrlEncodedRequest = (curlJson: CurlJson): boolean => {
-	if (isContentType(curlJson.headers, ContentTypes.applicationFormUrlEncoded)) return true;
-	if (curlJson.data && !curlJson.files) return true;
-	return false;
-};
-
-const isMultipartRequest = (curlJson: CurlJson): boolean => {
-	if (isContentType(curlJson.headers, ContentTypes.applicationMultipart)) return true;
-
-	// only multipart/form-data request include files
-	if (curlJson.files) return true;
-	return false;
-};
-
-const isBinaryRequest = (curlJson: CurlJson): boolean => {
-	if (curlJson?.headers?.[CONTENT_TYPE_KEY]) {
-		const contentType = curlJson?.headers?.[CONTENT_TYPE_KEY];
-		return ['image', 'video', 'audio'].some((d) => contentType.includes(d));
-	}
-	return false;
-};
-
-const sanitizeCurlCommand = (curlCommand: string) =>
-	curlCommand
-		.replace(/\r\n/g, ' ')
-		.replace(/\n/g, ' ')
-		.replace(/\\/g, ' ')
-		.replace(/[ ]{2,}/g, ' ');
-
-const toKeyValueArray = ([key, value]: string[]) => ({ name: key, value });
-
-const extractHeaders = (headers: CurlJson['headers'] = {}): HttpNodeHeaders => {
-	const emptyHeaders = !Object.keys(headers).length;
-
-	const onlyContentTypeHeaderDefined =
-		Object.keys(headers).length === 1 && headers[CONTENT_TYPE_KEY] !== undefined;
-
-	if (emptyHeaders || onlyContentTypeHeaderDefined) return { sendHeaders: false };
-
-	return {
-		sendHeaders: true,
-		headerParameters: {
-			parameters: Object.entries(headers)
-				.map(toKeyValueArray)
-				.filter((parameter) => parameter.name !== CONTENT_TYPE_KEY),
-		},
-	};
-};
-
-const extractQueries = (queries: CurlJson['queries'] = {}): HttpNodeQueries => {
-	const emptyQueries = !Object.keys(queries).length;
-
-	if (emptyQueries) return { sendQuery: false };
-
-	return {
-		sendQuery: true,
-		queryParameters: {
-			parameters: Object.entries(queries).map(toKeyValueArray),
-		},
-	};
-};
-
-const extractJson = (body: CurlJson['data']) =>
-	jsonParse<{ [key: string]: string }>(Object.keys(body as IDataObject)[0]);
-
-const jsonBodyToNodeParameters = (body: CurlJson['data'] = {}): Parameter[] | [] => {
-	const data = extractJson(body);
-	return Object.entries(data).map(toKeyValueArray);
-};
-
-const multipartToNodeParameters = (
-	body: CurlJson['data'] = {},
-	files: CurlJson['files'] = {},
-): Parameter[] | [] => {
-	return [
-		...Object.entries(body)
-			.map(toKeyValueArray)
-			.map((e) => ({ parameterType: 'formData', ...e })),
-		...Object.entries(files)
-			.map(toKeyValueArray)
-			.map((e) => ({ parameterType: 'formBinaryData', ...e })),
-	];
-};
-
-const keyValueBodyToNodeParameters = (body: CurlJson['data'] = {}): Parameter[] | [] => {
-	return Object.entries(body).map(toKeyValueArray);
-};
-
-const lowerCaseContentTypeKey = (obj: { [x: string]: string }): void => {
-	const regex = new RegExp(CONTENT_TYPE_KEY, 'gi');
-
-	const contentTypeKey = Object.keys(obj).find((key) => {
-		const group = Array.from(key.matchAll(regex));
-		if (group.length) return true;
-		return false;
-	});
-
-	if (!contentTypeKey) return;
-
-	const value = obj[contentTypeKey];
-	delete obj[contentTypeKey];
-	obj[CONTENT_TYPE_KEY] = value;
-};
-
-const encodeBasicAuthentication = (username: string, password: string) =>
-	Buffer.from(`${username}:${password}`).toString('base64');
-
-const jsonHasNestedObjects = (json: { [key: string]: string | number | object }) =>
-	Object.values(json).some((e) => typeof e === 'object');
-
-const extractGroup = (curlCommand: string, regex: RegExp) => curlCommand.matchAll(regex);
-
-const mapCookies = (cookies: CurlJson['cookies']): { cookie: string } | {} => {
-	if (!cookies) return {};
-
-	const cookiesValues = Object.entries(cookies).reduce(
-		(accumulator: string, entry: [string, string]) => {
-			accumulator += `${entry[0]}=${entry[1]};`;
-			return accumulator;
-		},
-		'',
-	);
-
-	if (!cookiesValues) return {};
-
-	return {
-		cookie: cookiesValues,
-	};
-};
-
-export const flattenObject = (obj: { [x: string]: any }, prefix = '') =>
-	Object.keys(obj).reduce((acc, k) => {
-		const pre = prefix.length ? prefix + '.' : '';
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		if (typeof obj[k] === 'object') Object.assign(acc, flattenObject(obj[k], pre + k));
-		//@ts-ignore
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		else acc[pre + k] = obj[k];
-		return acc;
-	}, {});
-
-@Service()
-export class CurlService {
-	// eslint-disable-next-line complexity
-	toHttpNodeParameters(curlCommand: string): HttpNodeParameters {
-		const curlJson = jsonParse<CurlJson>(curlconverter.toJsonString(curlCommand));
-
-		if (!curlJson.headers) curlJson.headers = {};
-
-		lowerCaseContentTypeKey(curlJson.headers);
-
-		// set basic authentication
-		if (curlJson.auth) {
-			const { user, password: pass } = curlJson.auth;
-			Object.assign(curlJson.headers, {
-				authorization: `Basic ${encodeBasicAuthentication(user, pass)}`,
-			});
-		}
-
-		const httpNodeParameters: HttpNodeParameters = {
-			url: curlJson.url,
-			authentication: 'none',
-			method: curlJson.method.toUpperCase(),
-			...extractHeaders({ ...curlJson.headers, ...mapCookies(curlJson.cookies) }),
-			...extractQueries(curlJson.queries),
-			options: {
-				redirect: {
-					redirect: {},
-				},
-				response: {
-					response: {},
-				},
-			},
-		};
-
-		//attempt to get the curl flags not supported by the library
-		const curl = sanitizeCurlCommand(curlCommand);
-
-		//check for follow redirect flags
-		if (FOLLOW_REDIRECT_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			Object.assign(httpNodeParameters.options.redirect?.redirect, { followRedirects: true });
-
-			if (curl.includes(` ${MAX_REDIRECT_FLAG}`)) {
-				const extractedValue = Array.from(
-					extractGroup(curl, new RegExp(` ${MAX_REDIRECT_FLAG} (\\d+)`, 'g')),
-				);
-				if (extractedValue.length) {
-					const [_, maxRedirects] = extractedValue[0];
-					if (maxRedirects) {
-						Object.assign(httpNodeParameters.options.redirect?.redirect, { maxRedirects });
-					}
-				}
-			}
-		}
-
-		//check for proxy flags
-		if (PROXY_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			const foundFlag = PROXY_FLAGS.find((flag) => curl.includes(` ${flag}`));
-			if (foundFlag) {
-				const extractedValue = Array.from(
-					extractGroup(curl, new RegExp(` ${foundFlag} (\\S*)`, 'g')),
-				);
-				if (extractedValue.length) {
-					const [_, proxy] = extractedValue[0];
-					Object.assign(httpNodeParameters.options, { proxy });
-				}
-			}
-		}
-
-		// check for "include header in output" flag
-		if (INCLUDE_HEADERS_IN_OUTPUT_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			Object.assign(httpNodeParameters.options?.response?.response, {
-				fullResponse: true,
-				responseFormat: 'autodetect',
-			});
-		}
-
-		// check for request flag
-		if (REQUEST_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			const foundFlag = REQUEST_FLAGS.find((flag) => curl.includes(` ${flag}`));
-			if (foundFlag) {
-				const extractedValue = Array.from(
-					extractGroup(curl, new RegExp(` ${foundFlag} (\\w+)`, 'g')),
-				);
-				if (extractedValue.length) {
-					const [_, request] = extractedValue[0];
-					httpNodeParameters.method = request.toUpperCase();
-				}
-			}
-		}
-
-		// check for timeout flag
-		if (TIMEOUT_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			const foundFlag = TIMEOUT_FLAGS.find((flag) => curl.includes(` ${flag}`));
-			if (foundFlag) {
-				const extractedValue = Array.from(
-					extractGroup(curl, new RegExp(` ${foundFlag} (\\d+)`, 'g')),
-				);
-				if (extractedValue.length) {
-					const [_, timeout] = extractedValue[0];
-					Object.assign(httpNodeParameters.options, {
-						timeout: parseInt(timeout, 10) * 1000,
-					});
-				}
-			}
-		}
-
-		// check for download flag
-		if (DOWNLOAD_FILE_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			const foundFlag = DOWNLOAD_FILE_FLAGS.find((flag) => curl.includes(` ${flag}`));
-			if (foundFlag) {
-				Object.assign(httpNodeParameters.options.response.response, {
-					responseFormat: 'file',
-					outputPropertyName: 'data',
-				});
-			}
-		}
-
-		if (IGNORE_SSL_ISSUES_FLAGS.some((flag) => curl.includes(` ${flag}`))) {
-			const foundFlag = IGNORE_SSL_ISSUES_FLAGS.find((flag) => curl.includes(` ${flag}`));
-			if (foundFlag) {
-				Object.assign(httpNodeParameters.options, {
-					allowUnauthorizedCerts: true,
-				});
-			}
-		}
-
-		const contentType = curlJson?.headers?.[CONTENT_TYPE_KEY] as ContentTypes;
-
-		if (isBinaryRequest(curlJson)) {
-			return Object.assign(httpNodeParameters, {
-				contentType: 'binaryData',
-				sendBody: true,
-			});
-		}
-
-		if (contentType && !SUPPORTED_CONTENT_TYPES.includes(contentType)) {
-			return Object.assign(httpNodeParameters, {
-				sendBody: true,
-				contentType: 'raw',
-				rawContentType: contentType,
-				body: Object.keys(curlJson?.data ?? {})[0],
-			});
-		}
-
-		if (isJsonRequest(curlJson)) {
-			Object.assign(httpNodeParameters, {
-				contentType: 'json',
-				sendBody: true,
-			});
-
-			if (curlJson.data) {
-				const json = extractJson(curlJson.data);
-
-				if (jsonHasNestedObjects(json)) {
-					// json body
-					Object.assign(httpNodeParameters, {
-						specifyBody: 'json',
-						jsonBody: JSON.stringify(json, null, 2),
-					});
-				} else {
-					// key-value body
-					Object.assign(httpNodeParameters, {
-						specifyBody: 'keypair',
-						bodyParameters: {
-							parameters: jsonBodyToNodeParameters(curlJson.data),
-						},
-					});
-				}
-			}
-		} else if (isFormUrlEncodedRequest(curlJson)) {
-			Object.assign(httpNodeParameters, {
-				contentType: 'form-urlencoded',
-				sendBody: true,
-				specifyBody: 'keypair',
-				bodyParameters: {
-					parameters: keyValueBodyToNodeParameters(curlJson.data),
-				},
-			});
-		} else if (isMultipartRequest(curlJson)) {
-			Object.assign(httpNodeParameters, {
-				contentType: 'multipart-form-data',
-				sendBody: true,
-				bodyParameters: {
-					parameters: multipartToNodeParameters(curlJson.data, curlJson.files),
-				},
-			});
-		} else {
-			// could not figure the content type so do not set the body
-			Object.assign(httpNodeParameters, {
-				sendBody: false,
-			});
-		}
-
-		if (!Object.keys(httpNodeParameters.options?.redirect.redirect).length) {
-			// @ts-ignore
-			delete httpNodeParameters.options.redirect;
-		}
-
-		if (!Object.keys(httpNodeParameters.options.response.response).length) {
-			// @ts-ignore
-			delete httpNodeParameters.options.response;
-		}
-
-		return httpNodeParameters;
-	}
-}
diff --git a/packages/cli/src/services/dynamic-node-parameters.service.ts b/packages/cli/src/services/dynamic-node-parameters.service.ts
index 0cde1c8489..1cbaf42363 100644
--- a/packages/cli/src/services/dynamic-node-parameters.service.ts
+++ b/packages/cli/src/services/dynamic-node-parameters.service.ts
@@ -1,5 +1,5 @@
 import { Service } from '@n8n/di';
-import { LoadOptionsContext, RoutingNode, LocalLoadOptionsContext } from 'n8n-core';
+import { LoadOptionsContext, RoutingNode, LocalLoadOptionsContext, ExecuteContext } from 'n8n-core';
 import type {
 	ILoadOptions,
 	ILoadOptionsFunctions,
@@ -19,6 +19,7 @@ import type {
 	NodeParameterValueType,
 	IDataObject,
 	ILocalLoadOptionsFunctions,
+	IExecuteData,
 } from 'n8n-workflow';
 import { Workflow, ApplicationError } from 'n8n-workflow';
 
@@ -103,17 +104,8 @@ export class DynamicNodeParametersService {
 		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
 		const node = workflow.nodes['Temp-Node'];
 
-		const routingNode = new RoutingNode(
-			workflow,
-			node,
-			connectionInputData,
-			runExecutionData ?? null,
-			additionalData,
-			mode,
-		);
-
 		// Create copy of node-type with the single property we want to get the data off
-		const tempNode: INodeType = {
+		const tempNodeType: INodeType = {
 			...nodeType,
 			...{
 				description: {
@@ -135,11 +127,25 @@ export class DynamicNodeParametersService {
 			main: [[{ json: {} }]],
 		};
 
-		const optionsData = await routingNode.runNode(inputData, runIndex, tempNode, {
+		const executeData: IExecuteData = {
 			node,
 			source: null,
 			data: {},
-		});
+		};
+		const executeFunctions = new ExecuteContext(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			executeData,
+			[],
+		);
+		const routingNode = new RoutingNode(executeFunctions, tempNodeType);
+		const optionsData = await routingNode.runNode();
 
 		if (optionsData?.length === 0) {
 			return [];
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 099ae2c935..609e30ec60 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -12,7 +12,6 @@ import config from '@/config';
 import { inE2ETests, LICENSE_FEATURES, N8N_VERSION } from '@/constants';
 import { CredentialTypes } from '@/credential-types';
 import { CredentialsOverwrites } from '@/credentials-overwrites';
-import { getVariablesLimit } from '@/environments.ee/variables/environment-helpers';
 import { getLdapLoginLabel } from '@/ldap.ee/helpers.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
@@ -147,6 +146,7 @@ export class FrontendService {
 				},
 			},
 			publicApi: {
+				apiKeysPerUserLimit: this.license.getApiKeysPerUserLimit(),
 				enabled: isApiEnabled(),
 				latestVersion: 1,
 				path: this.globalConfig.publicApi.path,
@@ -154,7 +154,7 @@ export class FrontendService {
 					enabled: !this.globalConfig.publicApi.swaggerUiDisabled,
 				},
 			},
-			workflowTagsDisabled: config.getEnv('workflowTagsDisabled'),
+			workflowTagsDisabled: this.globalConfig.tags.disabled,
 			logLevel: this.globalConfig.logging.level,
 			hiringBannerEnabled: config.getEnv('hiringBanner.enabled'),
 			aiAssistant: {
@@ -234,6 +234,7 @@ export class FrontendService {
 			},
 			betaFeatures: this.frontendConfig.betaFeatures,
 			easyAIWorkflowOnboarded: false,
+			partialExecution: this.globalConfig.partialExecutions,
 		};
 	}
 
@@ -326,7 +327,7 @@ export class FrontendService {
 		}
 
 		if (this.license.isVariablesEnabled()) {
-			this.settings.variables.limit = getVariablesLimit();
+			this.settings.variables.limit = this.license.getVariablesLimit();
 		}
 
 		if (this.license.isWorkflowHistoryLicensed() && config.getEnv('workflowHistory.enabled')) {
diff --git a/packages/cli/src/services/project.service.ee.ts b/packages/cli/src/services/project.service.ee.ts
index aa93360287..9eb3f8efa1 100644
--- a/packages/cli/src/services/project.service.ee.ts
+++ b/packages/cli/src/services/project.service.ee.ts
@@ -1,3 +1,4 @@
+import type { CreateProjectDto, ProjectRole, ProjectType, UpdateProjectDto } from '@n8n/api-types';
 import { Container, Service } from '@n8n/di';
 import { type Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -7,10 +8,8 @@ import { In, Not } from '@n8n/typeorm';
 import { ApplicationError } from 'n8n-workflow';
 
 import { UNLIMITED_LICENSE_QUOTA } from '@/constants';
-import type { ProjectIcon, ProjectType } from '@/databases/entities/project';
 import { Project } from '@/databases/entities/project';
 import { ProjectRelation } from '@/databases/entities/project-relation';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -131,7 +130,7 @@ export class ProjectService {
 			);
 		} else {
 			for (const sharedCredential of ownedCredentials) {
-				await credentialsService.delete(sharedCredential.credentials);
+				await credentialsService.delete(user, sharedCredential.credentials.id);
 			}
 		}
 
@@ -168,12 +167,7 @@ export class ProjectService {
 		return await this.projectRelationRepository.getPersonalProjectOwners(projectIds);
 	}
 
-	async createTeamProject(
-		name: string,
-		adminUser: User,
-		id?: string,
-		icon?: ProjectIcon,
-	): Promise<Project> {
+	async createTeamProject(adminUser: User, data: CreateProjectDto): Promise<Project> {
 		const limit = this.license.getTeamProjectLimit();
 		if (
 			limit !== UNLIMITED_LICENSE_QUOTA &&
@@ -183,12 +177,7 @@ export class ProjectService {
 		}
 
 		const project = await this.projectRepository.save(
-			this.projectRepository.create({
-				id,
-				name,
-				icon,
-				type: 'team',
-			}),
+			this.projectRepository.create({ ...data, type: 'team' }),
 		);
 
 		// Link admin
@@ -198,20 +187,10 @@ export class ProjectService {
 	}
 
 	async updateProject(
-		name: string,
 		projectId: string,
-		icon?: { type: 'icon' | 'emoji'; value: string },
+		data: Pick<UpdateProjectDto, 'name' | 'icon'>,
 	): Promise<Project> {
-		const result = await this.projectRepository.update(
-			{
-				id: projectId,
-				type: 'team',
-			},
-			{
-				name,
-				icon,
-			},
-		);
+		const result = await this.projectRepository.update({ id: projectId, type: 'team' }, data);
 
 		if (!result.affected) {
 			throw new ForbiddenError('Project not found');
diff --git a/packages/cli/src/services/public-api-key.service.ts b/packages/cli/src/services/public-api-key.service.ts
index a6b1133bc2..719f922fb2 100644
--- a/packages/cli/src/services/public-api-key.service.ts
+++ b/packages/cli/src/services/public-api-key.service.ts
@@ -1,4 +1,7 @@
+import type { UnixTimestamp, UpdateApiKeyRequestDto } from '@n8n/api-types';
+import type { CreateApiKeyRequestDto } from '@n8n/api-types/src/dto/api-keys/create-api-key-request.dto';
 import { Service } from '@n8n/di';
+import { TokenExpiredError } from 'jsonwebtoken';
 import type { OpenAPIV3 } from 'openapi-types';
 
 import { ApiKey } from '@/databases/entities/api-key';
@@ -12,8 +15,8 @@ import { JwtService } from './jwt.service';
 
 const API_KEY_AUDIENCE = 'public-api';
 const API_KEY_ISSUER = 'n8n';
-const REDACT_API_KEY_REVEAL_COUNT = 15;
-const REDACT_API_KEY_MAX_LENGTH = 80;
+const REDACT_API_KEY_REVEAL_COUNT = 4;
+const REDACT_API_KEY_MAX_LENGTH = 10;
 
 @Service()
 export class PublicApiKeyService {
@@ -27,17 +30,15 @@ export class PublicApiKeyService {
 	/**
 	 * Creates a new public API key for the specified user.
 	 * @param user - The user for whom the API key is being created.
-	 * @returns A promise that resolves to the newly created API key.
 	 */
-	async createPublicApiKeyForUser(user: User) {
-		const apiKey = this.generateApiKey(user);
-		await this.apiKeyRepository.upsert(
+	async createPublicApiKeyForUser(user: User, { label, expiresAt }: CreateApiKeyRequestDto) {
+		const apiKey = this.generateApiKey(user, expiresAt);
+		await this.apiKeyRepository.insert(
 			this.apiKeyRepository.create({
 				userId: user.id,
 				apiKey,
-				label: 'My API Key',
+				label,
 			}),
-			['apiKey'],
 		);
 
 		return await this.apiKeyRepository.findOneByOrFail({ apiKey });
@@ -46,13 +47,13 @@ export class PublicApiKeyService {
 	/**
 	 * Retrieves and redacts API keys for a given user.
 	 * @param user - The user for whom to retrieve and redact API keys.
-	 * @returns A promise that resolves to an array of objects containing redacted API keys.
 	 */
 	async getRedactedApiKeysForUser(user: User) {
 		const apiKeys = await this.apiKeyRepository.findBy({ userId: user.id });
 		return apiKeys.map((apiKeyRecord) => ({
 			...apiKeyRecord,
 			apiKey: this.redactApiKey(apiKeyRecord.apiKey),
+			expiresAt: this.getApiKeyExpiration(apiKeyRecord.apiKey),
 		}));
 	}
 
@@ -60,6 +61,10 @@ export class PublicApiKeyService {
 		await this.apiKeyRepository.delete({ userId: user.id, id: apiKeyId });
 	}
 
+	async updateApiKeyForUser(user: User, apiKeyId: string, { label }: UpdateApiKeyRequestDto) {
+		await this.apiKeyRepository.update({ id: apiKeyId, userId: user.id }, { label });
+	}
+
 	private async getUserForApiKey(apiKey: string) {
 		return await this.userRepository
 			.createQueryBuilder('user')
@@ -70,22 +75,24 @@ export class PublicApiKeyService {
 	}
 
 	/**
-	 * Redacts an API key by keeping the first few characters and replacing the rest with asterisks.
-	 * @param apiKey - The API key to be redacted. If null, the function returns undefined.
-	 * @returns The redacted API key with a fixed prefix and asterisks replacing the rest of the characters.
+	 * Redacts an API key by replacing a portion of it with asterisks.
+	 *
+	 * The function keeps the last `REDACT_API_KEY_REVEAL_COUNT` characters of the API key visible
+	 * and replaces the rest with asterisks, up to a maximum length defined by `REDACT_API_KEY_MAX_LENGTH`.
+	 *
 	 * @example
 	 * ```typescript
 	 * const redactedKey = PublicApiKeyService.redactApiKey('12345-abcdef-67890');
-	 * console.log(redactedKey); // Output: '12345-*****'
+	 * console.log(redactedKey); // Output: '*****-67890'
 	 * ```
 	 */
 	redactApiKey(apiKey: string) {
-		const visiblePart = apiKey.slice(0, REDACT_API_KEY_REVEAL_COUNT);
-		const redactedPart = '*'.repeat(apiKey.length - REDACT_API_KEY_REVEAL_COUNT);
+		const visiblePart = apiKey.slice(-REDACT_API_KEY_REVEAL_COUNT);
+		const redactedPart = '*'.repeat(
+			Math.max(0, REDACT_API_KEY_MAX_LENGTH - REDACT_API_KEY_REVEAL_COUNT),
+		);
 
-		const completeRedactedApiKey = visiblePart + redactedPart;
-
-		return completeRedactedApiKey.slice(0, REDACT_API_KEY_MAX_LENGTH);
+		return redactedPart + visiblePart;
 	}
 
 	getAuthMiddleware(version: string) {
@@ -100,6 +107,16 @@ export class PublicApiKeyService {
 
 			if (!user) return false;
 
+			try {
+				this.jwtService.verify(providedApiKey, {
+					issuer: API_KEY_ISSUER,
+					audience: API_KEY_AUDIENCE,
+				});
+			} catch (e) {
+				if (e instanceof TokenExpiredError) return false;
+				throw e;
+			}
+
 			this.eventService.emit('public-api-invoked', {
 				userId: user.id,
 				path: req.path,
@@ -113,6 +130,17 @@ export class PublicApiKeyService {
 		};
 	}
 
-	private generateApiKey = (user: User) =>
-		this.jwtService.sign({ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE });
+	private generateApiKey = (user: User, expiresAt: UnixTimestamp) => {
+		const nowInSeconds = Math.floor(Date.now() / 1000);
+
+		return this.jwtService.sign(
+			{ sub: user.id, iss: API_KEY_ISSUER, aud: API_KEY_AUDIENCE },
+			{ ...(expiresAt && { expiresIn: expiresAt - nowInSeconds }) },
+		);
+	};
+
+	private getApiKeyExpiration = (apiKey: string) => {
+		const decoded = this.jwtService.decode(apiKey);
+		return decoded?.exp ?? null;
+	};
 }
diff --git a/packages/cli/src/services/redis-client.service.ts b/packages/cli/src/services/redis-client.service.ts
index 6dea89a801..e31d55fb6c 100644
--- a/packages/cli/src/services/redis-client.service.ts
+++ b/packages/cli/src/services/redis-client.service.ts
@@ -131,7 +131,7 @@ export class RedisClientService extends TypedEmitter<RedisEventMap> {
 	}
 
 	private getOptions({ extraOptions }: { extraOptions?: RedisOptions }) {
-		const { username, password, db, tls } = this.globalConfig.queue.bull.redis;
+		const { username, password, db, tls, dualStack } = this.globalConfig.queue.bull.redis;
 
 		/**
 		 * Disabling ready check allows quick reconnection to Redis if Redis becomes
@@ -153,6 +153,8 @@ export class RedisClientService extends TypedEmitter<RedisEventMap> {
 			...extraOptions,
 		};
 
+		if (dualStack) options.family = 0;
+
 		if (tls) options.tls = {}; // enable TLS with default Node.js settings
 
 		return options;
diff --git a/packages/cli/src/services/role.service.ts b/packages/cli/src/services/role.service.ts
index 7590dca2d5..e060c0dd81 100644
--- a/packages/cli/src/services/role.service.ts
+++ b/packages/cli/src/services/role.service.ts
@@ -1,9 +1,10 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import { combineScopes, type Resource, type Scope } from '@n8n/permissions';
 import { ApplicationError } from 'n8n-workflow';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation';
+import type { ProjectRelation } from '@/databases/entities/project-relation';
 import type {
 	CredentialSharingRole,
 	SharedCredentials,
diff --git a/packages/cli/src/services/tag.service.ts b/packages/cli/src/services/tag.service.ts
index 09695f44ff..1f6cdd88fe 100644
--- a/packages/cli/src/services/tag.service.ts
+++ b/packages/cli/src/services/tag.service.ts
@@ -8,6 +8,8 @@ import type { ITagWithCountDb } from '@/interfaces';
 
 type GetAllResult<T> = T extends { withUsageCount: true } ? ITagWithCountDb[] : TagEntity[];
 
+type Action = 'Create' | 'Update';
+
 @Service()
 export class TagService {
 	constructor(
@@ -24,7 +26,7 @@ export class TagService {
 	async save(tag: TagEntity, actionKind: 'create' | 'update') {
 		await validateEntity(tag);
 
-		const action = actionKind[0].toUpperCase() + actionKind.slice(1);
+		const action = (actionKind[0].toUpperCase() + actionKind.slice(1)) as Action;
 
 		await this.externalHooks.run(`tag.before${action}`, [tag]);
 
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts
index bf3bab4c27..808cc1cb93 100644
--- a/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts
+++ b/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts
@@ -2,15 +2,15 @@ import { TaskRunnersConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
 import type { Logger } from 'n8n-core';
 
-import type { TaskRunnerAuthService } from '@/task-runners/auth/task-runner-auth.service';
 import { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
+import type { TaskBrokerAuthService } from '@/task-runners/task-broker/auth/task-broker-auth.service';
 import { TaskRunnerLifecycleEvents } from '@/task-runners/task-runner-lifecycle-events';
 import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
 import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
 
 describe('TaskRunnerProcessRestartLoopDetector', () => {
 	const mockLogger = mock<Logger>();
-	const mockAuthService = mock<TaskRunnerAuthService>();
+	const mockAuthService = mock<TaskBrokerAuthService>();
 	const runnerConfig = new TaskRunnersConfig();
 	const taskRunnerProcess = new TaskRunnerProcess(
 		mockLogger,
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts
index d00ce7b88f..0d08ecd1c2 100644
--- a/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts
+++ b/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts
@@ -3,7 +3,7 @@ import { mock } from 'jest-mock-extended';
 import { Logger } from 'n8n-core';
 import type { ChildProcess, SpawnOptions } from 'node:child_process';
 
-import type { TaskRunnerAuthService } from '@/task-runners/auth/task-runner-auth.service';
+import type { TaskBrokerAuthService } from '@/task-runners/task-broker/auth/task-broker-auth.service';
 import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
 import { mockInstance } from '@test/mocking';
 
@@ -26,7 +26,7 @@ describe('TaskRunnerProcess', () => {
 	const runnerConfig = mockInstance(TaskRunnersConfig);
 	runnerConfig.enabled = true;
 	runnerConfig.mode = 'internal';
-	const authService = mock<TaskRunnerAuthService>();
+	const authService = mock<TaskBrokerAuthService>();
 	let taskRunnerProcess = new TaskRunnerProcess(logger, runnerConfig, authService, mock());
 
 	afterEach(async () => {
@@ -117,5 +117,17 @@ describe('TaskRunnerProcess', () => {
 			const options = spawnMock.mock.calls[0][2] as SpawnOptions;
 			expect(options.env).not.toHaveProperty('NODE_OPTIONS');
 		});
+
+		it('should use --disallow-code-generation-from-strings and --disable-proto=delete flags', async () => {
+			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
+
+			await taskRunnerProcess.start();
+
+			expect(spawnMock.mock.calls[0].at(1)).toEqual([
+				'--disallow-code-generation-from-strings',
+				'--disable-proto=delete',
+				expect.stringContaining('/packages/@n8n/task-runner/dist/start.js'),
+			]);
+		});
 	});
 });
diff --git a/packages/cli/src/task-runners/auth/task-runner-auth.schema.ts b/packages/cli/src/task-runners/auth/task-runner-auth.schema.ts
deleted file mode 100644
index c3ab2c17f2..0000000000
--- a/packages/cli/src/task-runners/auth/task-runner-auth.schema.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { z } from 'zod';
-
-export const taskRunnerAuthRequestBodySchema = z.object({
-	token: z.string().min(1),
-});
diff --git a/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts b/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts
index a0193c40e0..1743c531a4 100644
--- a/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts
+++ b/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts
@@ -1,10 +1,13 @@
 import { Service } from '@n8n/di';
 
 import config from '@/config';
+import type {
+	DisconnectAnalyzer,
+	DisconnectErrorOptions,
+} from '@/task-runners/task-broker/task-broker-types';
 
 import { TaskRunnerDisconnectedError } from './errors/task-runner-disconnected-error';
 import { TaskRunnerFailedHeartbeatError } from './errors/task-runner-failed-heartbeat.error';
-import type { DisconnectAnalyzer, DisconnectErrorOptions } from './task-runner-types';
 
 /**
  * Analyzes the disconnect reason of a task runner to provide a more
diff --git a/packages/cli/src/task-runners/errors/task-runner-oom-error.ts b/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
index 5c78bef816..412cf6e626 100644
--- a/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
+++ b/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
@@ -1,6 +1,6 @@
 import { ApplicationError } from 'n8n-workflow';
 
-import type { TaskRunner } from '../task-broker.service';
+import type { TaskRunner } from '@/task-runners/task-broker/task-broker.service';
 
 export class TaskRunnerOomError extends ApplicationError {
 	description: string;
diff --git a/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts b/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts
index a84682e521..386cab23fd 100644
--- a/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts
+++ b/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts
@@ -1,12 +1,13 @@
 import { TaskRunnersConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 
+import type { DisconnectErrorOptions } from '@/task-runners/task-broker/task-broker-types';
+
 import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
 import { TaskRunnerOomError } from './errors/task-runner-oom-error';
 import { SlidingWindowSignal } from './sliding-window-signal';
 import type { ExitReason, TaskRunnerProcessEventMap } from './task-runner-process';
 import { TaskRunnerProcess } from './task-runner-process';
-import type { DisconnectErrorOptions } from './task-runner-types';
 
 /**
  * Analyzes the disconnect reason of a task runner process to provide a more
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-server.test.ts b/packages/cli/src/task-runners/task-broker/__tests__/task-broker-server.test.ts
similarity index 70%
rename from packages/cli/src/task-runners/__tests__/task-runner-server.test.ts
rename to packages/cli/src/task-runners/task-broker/__tests__/task-broker-server.test.ts
index 33de18c605..a474bbecc0 100644
--- a/packages/cli/src/task-runners/__tests__/task-runner-server.test.ts
+++ b/packages/cli/src/task-runners/task-broker/__tests__/task-broker-server.test.ts
@@ -3,24 +3,23 @@ import { mock } from 'jest-mock-extended';
 import { ServerResponse } from 'node:http';
 import type WebSocket from 'ws';
 
-import type { TaskRunnerAuthController } from '@/task-runners/auth/task-runner-auth.controller';
-import { TaskRunnerServer } from '@/task-runners/task-runner-server';
+import type { TaskBrokerAuthController } from '@/task-runners/task-broker/auth/task-broker-auth.controller';
+import { TaskBrokerServer } from '@/task-runners/task-broker/task-broker-server';
+import type { TaskBrokerServerInitRequest } from '@/task-runners/task-broker/task-broker-types';
 
-import type { TaskRunnerServerInitRequest } from '../task-runner-types';
-
-describe('TaskRunnerServer', () => {
+describe('TaskBrokerServer', () => {
 	describe('handleUpgradeRequest', () => {
 		it('should close WebSocket when response status code is > 200', () => {
 			const ws = mock<WebSocket>();
-			const request = mock<TaskRunnerServerInitRequest>({
+			const request = mock<TaskBrokerServerInitRequest>({
 				url: '/runners/_ws',
 				ws,
 			});
 
-			const server = new TaskRunnerServer(
+			const server = new TaskBrokerServer(
 				mock(),
 				mock<GlobalConfig>({ taskRunners: { path: '/runners' } }),
-				mock<TaskRunnerAuthController>(),
+				mock<TaskBrokerAuthController>(),
 				mock(),
 			);
 
@@ -39,15 +38,15 @@ describe('TaskRunnerServer', () => {
 
 		it('should not close WebSocket when response status code is 200', () => {
 			const ws = mock<WebSocket>();
-			const request = mock<TaskRunnerServerInitRequest>({
+			const request = mock<TaskBrokerServerInitRequest>({
 				url: '/runners/_ws',
 				ws,
 			});
 
-			const server = new TaskRunnerServer(
+			const server = new TaskBrokerServer(
 				mock(),
 				mock<GlobalConfig>({ taskRunners: { path: '/runners' } }),
-				mock<TaskRunnerAuthController>(),
+				mock<TaskBrokerAuthController>(),
 				mock(),
 			);
 
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts b/packages/cli/src/task-runners/task-broker/__tests__/task-broker-ws-server.test.ts
similarity index 86%
rename from packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts
rename to packages/cli/src/task-runners/task-broker/__tests__/task-broker-ws-server.test.ts
index cabedc530b..2a4dc85b42 100644
--- a/packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts
+++ b/packages/cli/src/task-runners/task-broker/__tests__/task-broker-ws-server.test.ts
@@ -3,12 +3,12 @@ import { mock } from 'jest-mock-extended';
 import type WebSocket from 'ws';
 
 import { Time, WsStatusCodes } from '@/constants';
-import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-server';
+import { TaskBrokerWsServer } from '@/task-runners/task-broker/task-broker-ws-server';
 
-describe('TaskRunnerWsServer', () => {
+describe('TaskBrokerWsServer', () => {
 	describe('removeConnection', () => {
 		it('should close with 1000 status code by default', async () => {
-			const server = new TaskRunnerWsServer(mock(), mock(), mock(), mock(), mock());
+			const server = new TaskBrokerWsServer(mock(), mock(), mock(), mock(), mock());
 			const ws = mock<WebSocket>();
 			server.runnerConnections.set('test-runner', ws);
 
@@ -22,7 +22,7 @@ describe('TaskRunnerWsServer', () => {
 		it('should set up heartbeat timer on server start', async () => {
 			const setIntervalSpy = jest.spyOn(global, 'setInterval');
 
-			const server = new TaskRunnerWsServer(
+			const server = new TaskBrokerWsServer(
 				mock(),
 				mock(),
 				mock(),
@@ -44,7 +44,7 @@ describe('TaskRunnerWsServer', () => {
 			jest.spyOn(global, 'setInterval');
 			const clearIntervalSpy = jest.spyOn(global, 'clearInterval');
 
-			const server = new TaskRunnerWsServer(
+			const server = new TaskBrokerWsServer(
 				mock(),
 				mock(),
 				mock(),
@@ -61,7 +61,7 @@ describe('TaskRunnerWsServer', () => {
 
 	describe('sendMessage', () => {
 		it('should work with a message containing circular references', () => {
-			const server = new TaskRunnerWsServer(mock(), mock(), mock(), mock(), mock());
+			const server = new TaskBrokerWsServer(mock(), mock(), mock(), mock(), mock());
 			const ws = mock<WebSocket>();
 			server.runnerConnections.set('test-runner', ws);
 
diff --git a/packages/cli/src/task-runners/__tests__/task-broker.test.ts b/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts
similarity index 99%
rename from packages/cli/src/task-runners/__tests__/task-broker.test.ts
rename to packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts
index ced7e1c07e..90261acdc9 100644
--- a/packages/cli/src/task-runners/__tests__/task-broker.test.ts
+++ b/packages/cli/src/task-runners/task-broker/__tests__/task-broker.service.test.ts
@@ -4,12 +4,12 @@ import { mock } from 'jest-mock-extended';
 import { ApplicationError, type INodeTypeBaseDescription } from 'n8n-workflow';
 
 import { Time } from '@/constants';
+import type { TaskRunnerLifecycleEvents } from '@/task-runners/task-runner-lifecycle-events';
 
-import { TaskRejectError } from '../errors';
+import { TaskRejectError } from '../errors/task-reject.error';
 import { TaskRunnerTimeoutError } from '../errors/task-runner-timeout.error';
 import { TaskBroker } from '../task-broker.service';
 import type { TaskOffer, TaskRequest, TaskRunner } from '../task-broker.service';
-import type { TaskRunnerLifecycleEvents } from '../task-runner-lifecycle-events';
 
 const createValidUntil = (ms: number) => process.hrtime.bigint() + BigInt(ms * 1_000_000);
 
diff --git a/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts b/packages/cli/src/task-runners/task-broker/auth/__tests__/task-broker-auth.controller.test.ts
similarity index 80%
rename from packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts
rename to packages/cli/src/task-runners/task-broker/auth/__tests__/task-broker-auth.controller.test.ts
index 3c650d1644..1ff547923c 100644
--- a/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts
+++ b/packages/cli/src/task-runners/task-broker/auth/__tests__/task-broker-auth.controller.test.ts
@@ -5,14 +5,14 @@ import { mock } from 'jest-mock-extended';
 import { CacheService } from '@/services/cache/cache.service';
 import { mockInstance } from '@test/mocking';
 
-import { BadRequestError } from '../../../errors/response-errors/bad-request.error';
-import { ForbiddenError } from '../../../errors/response-errors/forbidden.error';
-import type { AuthlessRequest } from '../../../requests';
-import type { TaskRunnerServerInitRequest } from '../../task-runner-types';
-import { TaskRunnerAuthController } from '../task-runner-auth.controller';
-import { TaskRunnerAuthService } from '../task-runner-auth.service';
+import { BadRequestError } from '../../../../errors/response-errors/bad-request.error';
+import { ForbiddenError } from '../../../../errors/response-errors/forbidden.error';
+import type { AuthlessRequest } from '../../../../requests';
+import type { TaskBrokerServerInitRequest } from '../../task-broker-types';
+import { TaskBrokerAuthController } from '../task-broker-auth.controller';
+import { TaskBrokerAuthService } from '../task-broker-auth.service';
 
-describe('TaskRunnerAuthController', () => {
+describe('TaskBrokerAuthController', () => {
 	const globalConfig = mockInstance(GlobalConfig, {
 		cache: {
 			backend: 'memory',
@@ -27,8 +27,8 @@ describe('TaskRunnerAuthController', () => {
 	});
 	const TTL = 100;
 	const cacheService = new CacheService(globalConfig);
-	const authService = new TaskRunnerAuthService(globalConfig, cacheService, TTL);
-	const authController = new TaskRunnerAuthController(authService);
+	const authService = new TaskBrokerAuthService(globalConfig, cacheService, TTL);
+	const authController = new TaskBrokerAuthController(authService);
 
 	const createMockGrantTokenReq = (token?: string) =>
 		({
@@ -71,7 +71,7 @@ describe('TaskRunnerAuthController', () => {
 		const next = jest.fn() as NextFunction;
 
 		const createMockReqWithToken = (token?: string) =>
-			mock<TaskRunnerServerInitRequest>({
+			mock<TaskBrokerServerInitRequest>({
 				headers: {
 					authorization: `Bearer ${token}`,
 				},
@@ -82,7 +82,7 @@ describe('TaskRunnerAuthController', () => {
 		});
 
 		it('should respond with 401 when grant token is missing', async () => {
-			const req = mock<TaskRunnerServerInitRequest>({});
+			const req = mock<TaskBrokerServerInitRequest>({});
 
 			await authController.authMiddleware(req, res, next);
 
diff --git a/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts b/packages/cli/src/task-runners/task-broker/auth/__tests__/task-broker-auth.service.test.ts
similarity index 86%
rename from packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts
rename to packages/cli/src/task-runners/task-broker/auth/__tests__/task-broker-auth.service.test.ts
index a1321945e3..4585f80b5b 100644
--- a/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts
+++ b/packages/cli/src/task-runners/task-broker/auth/__tests__/task-broker-auth.service.test.ts
@@ -5,10 +5,10 @@ import config from '@/config';
 import { CacheService } from '@/services/cache/cache.service';
 import { retryUntil } from '@test-integration/retry-until';
 
-import { mockInstance } from '../../../../test/shared/mocking';
-import { TaskRunnerAuthService } from '../task-runner-auth.service';
+import { mockInstance } from '../../../../../test/shared/mocking';
+import { TaskBrokerAuthService } from '../task-broker-auth.service';
 
-describe('TaskRunnerAuthService', () => {
+describe('TaskBrokerAuthService', () => {
 	config.set('taskRunners.authToken', 'random-secret');
 
 	const globalConfig = mockInstance(GlobalConfig, {
@@ -25,7 +25,7 @@ describe('TaskRunnerAuthService', () => {
 	});
 	const TTL = 100;
 	const cacheService = new CacheService(globalConfig);
-	const authService = new TaskRunnerAuthService(globalConfig, cacheService, TTL);
+	const authService = new TaskBrokerAuthService(globalConfig, cacheService, TTL);
 
 	beforeEach(() => {
 		jest.clearAllMocks();
@@ -33,11 +33,11 @@ describe('TaskRunnerAuthService', () => {
 
 	describe('isValidAuthToken', () => {
 		it('should be valid for the configured token', () => {
-			expect(authService.isValidAuthToken('random-secret'));
+			expect(authService.isValidAuthToken('random-secret')).toBe(true);
 		});
 
 		it('should be invalid for anything else', () => {
-			expect(authService.isValidAuthToken('!random-secret'));
+			expect(authService.isValidAuthToken('!random-secret')).toBe(false);
 		});
 	});
 
diff --git a/packages/cli/src/task-runners/auth/task-runner-auth.controller.ts b/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.controller.ts
similarity index 60%
rename from packages/cli/src/task-runners/auth/task-runner-auth.controller.ts
rename to packages/cli/src/task-runners/task-broker/auth/task-broker-auth.controller.ts
index 4ea5f3b6f4..e9fd61c17b 100644
--- a/packages/cli/src/task-runners/auth/task-runner-auth.controller.ts
+++ b/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.controller.ts
@@ -2,19 +2,19 @@ import { Service } from '@n8n/di';
 import type { NextFunction, Response } from 'express';
 
 import type { AuthlessRequest } from '@/requests';
+import type { TaskBrokerServerInitRequest } from '@/task-runners/task-broker/task-broker-types';
 
-import { taskRunnerAuthRequestBodySchema } from './task-runner-auth.schema';
-import { TaskRunnerAuthService } from './task-runner-auth.service';
-import { BadRequestError } from '../../errors/response-errors/bad-request.error';
-import { ForbiddenError } from '../../errors/response-errors/forbidden.error';
-import type { TaskRunnerServerInitRequest } from '../task-runner-types';
+import { taskBrokerAuthRequestBodySchema } from './task-broker-auth.schema';
+import { TaskBrokerAuthService } from './task-broker-auth.service';
+import { BadRequestError } from '../../../errors/response-errors/bad-request.error';
+import { ForbiddenError } from '../../../errors/response-errors/forbidden.error';
 
 /**
  * Controller responsible for authenticating Task Runner connections
  */
 @Service()
-export class TaskRunnerAuthController {
-	constructor(private readonly taskRunnerAuthService: TaskRunnerAuthService) {
+export class TaskBrokerAuthController {
+	constructor(private readonly authService: TaskBrokerAuthService) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		this.authMiddleware = this.authMiddleware.bind(this);
 	}
@@ -24,17 +24,17 @@ export class TaskRunnerAuthController {
 	 * which can be used to initiate a task runner connection.
 	 */
 	async createGrantToken(req: AuthlessRequest) {
-		const result = await taskRunnerAuthRequestBodySchema.safeParseAsync(req.body);
+		const result = await taskBrokerAuthRequestBodySchema.safeParseAsync(req.body);
 		if (!result.success) {
 			throw new BadRequestError(result.error.errors[0].code);
 		}
 
 		const { token: authToken } = result.data;
-		if (!this.taskRunnerAuthService.isValidAuthToken(authToken)) {
+		if (!this.authService.isValidAuthToken(authToken)) {
 			throw new ForbiddenError();
 		}
 
-		const grantToken = await this.taskRunnerAuthService.createGrantToken();
+		const grantToken = await this.authService.createGrantToken();
 		return {
 			token: grantToken,
 		};
@@ -43,7 +43,7 @@ export class TaskRunnerAuthController {
 	/**
 	 * Middleware to authenticate task runner init requests
 	 */
-	async authMiddleware(req: TaskRunnerServerInitRequest, res: Response, next: NextFunction) {
+	async authMiddleware(req: TaskBrokerServerInitRequest, res: Response, next: NextFunction) {
 		const authHeader = req.headers.authorization;
 		if (typeof authHeader !== 'string' || !authHeader.startsWith('Bearer ')) {
 			res.status(401).json({ code: 401, message: 'Unauthorized' });
@@ -51,7 +51,7 @@ export class TaskRunnerAuthController {
 		}
 
 		const grantToken = authHeader.slice('Bearer '.length);
-		const isConsumed = await this.taskRunnerAuthService.tryConsumeGrantToken(grantToken);
+		const isConsumed = await this.authService.tryConsumeGrantToken(grantToken);
 		if (!isConsumed) {
 			res.status(403).json({ code: 403, message: 'Forbidden' });
 			return;
diff --git a/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.schema.ts b/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.schema.ts
new file mode 100644
index 0000000000..89c1acefb8
--- /dev/null
+++ b/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.schema.ts
@@ -0,0 +1,5 @@
+import { z } from 'zod';
+
+export const taskBrokerAuthRequestBodySchema = z.object({
+	token: z.string().min(1),
+});
diff --git a/packages/cli/src/task-runners/auth/task-runner-auth.service.ts b/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.service.ts
similarity index 80%
rename from packages/cli/src/task-runners/auth/task-runner-auth.service.ts
rename to packages/cli/src/task-runners/task-broker/auth/task-broker-auth.service.ts
index c16afc5c63..1c401afed5 100644
--- a/packages/cli/src/task-runners/auth/task-runner-auth.service.ts
+++ b/packages/cli/src/task-runners/task-broker/auth/task-broker-auth.service.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
-import { randomBytes } from 'crypto';
+import { randomBytes, timingSafeEqual } from 'crypto';
 
 import { Time } from '@/constants';
 import { CacheService } from '@/services/cache/cache.service';
@@ -8,7 +8,9 @@ import { CacheService } from '@/services/cache/cache.service';
 const GRANT_TOKEN_TTL = 15 * Time.seconds.toMilliseconds;
 
 @Service()
-export class TaskRunnerAuthService {
+export class TaskBrokerAuthService {
+	private readonly authToken = Buffer.from(this.globalConfig.taskRunners.authToken);
+
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly cacheService: CacheService,
@@ -17,7 +19,10 @@ export class TaskRunnerAuthService {
 	) {}
 
 	isValidAuthToken(token: string) {
-		return token === this.globalConfig.taskRunners.authToken;
+		const tokenBuffer = Buffer.from(token);
+		if (tokenBuffer.length !== this.authToken.length) return false;
+
+		return timingSafeEqual(tokenBuffer, this.authToken);
 	}
 
 	/**
diff --git a/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts b/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts
new file mode 100644
index 0000000000..34f365af5f
--- /dev/null
+++ b/packages/cli/src/task-runners/task-broker/errors/task-deferred.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskDeferredError extends ApplicationError {
+	constructor() {
+		super('Task deferred until runner is ready', { level: 'info' });
+	}
+}
diff --git a/packages/cli/src/task-runners/errors.ts b/packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts
similarity index 52%
rename from packages/cli/src/task-runners/errors.ts
rename to packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts
index c530e5a95d..4e3f903dd8 100644
--- a/packages/cli/src/task-runners/errors.ts
+++ b/packages/cli/src/task-runners/task-broker/errors/task-reject.error.ts
@@ -5,11 +5,3 @@ export class TaskRejectError extends ApplicationError {
 		super(`Task rejected with reason: ${reason}`, { level: 'info' });
 	}
 }
-
-export class TaskDeferredError extends ApplicationError {
-	constructor() {
-		super('Task deferred until runner is ready', { level: 'info' });
-	}
-}
-
-export class TaskError extends ApplicationError {}
diff --git a/packages/cli/src/task-runners/errors/task-runner-timeout.error.ts b/packages/cli/src/task-runners/task-broker/errors/task-runner-timeout.error.ts
similarity index 100%
rename from packages/cli/src/task-runners/errors/task-runner-timeout.error.ts
rename to packages/cli/src/task-runners/task-broker/errors/task-runner-timeout.error.ts
diff --git a/packages/cli/src/task-runners/task-runner-server.ts b/packages/cli/src/task-runners/task-broker/task-broker-server.ts
similarity index 83%
rename from packages/cli/src/task-runners/task-runner-server.ts
rename to packages/cli/src/task-runners/task-broker/task-broker-server.ts
index 80679f8c41..ef2f0a5b28 100644
--- a/packages/cli/src/task-runners/task-runner-server.ts
+++ b/packages/cli/src/task-runners/task-broker/task-broker-server.ts
@@ -14,18 +14,18 @@ import { Server as WSServer } from 'ws';
 import { inTest } from '@/constants';
 import { bodyParser, rawBodyReader } from '@/middlewares';
 import { send } from '@/response-helper';
-import { TaskRunnerAuthController } from '@/task-runners/auth/task-runner-auth.controller';
+import { TaskBrokerAuthController } from '@/task-runners/task-broker/auth/task-broker-auth.controller';
 import type {
-	TaskRunnerServerInitRequest,
-	TaskRunnerServerInitResponse,
-} from '@/task-runners/task-runner-types';
-import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-server';
+	TaskBrokerServerInitRequest,
+	TaskBrokerServerInitResponse,
+} from '@/task-runners/task-broker/task-broker-types';
+import { TaskBrokerWsServer } from '@/task-runners/task-broker/task-broker-ws-server';
 
 /**
- * Task Runner HTTP & WS server
+ * Task Broker HTTP & WS server
  */
 @Service()
-export class TaskRunnerServer {
+export class TaskBrokerServer {
 	private server: Server | undefined;
 
 	private wsServer: WSServer | undefined;
@@ -43,8 +43,8 @@ export class TaskRunnerServer {
 	constructor(
 		private readonly logger: Logger,
 		private readonly globalConfig: GlobalConfig,
-		private readonly taskRunnerAuthController: TaskRunnerAuthController,
-		private readonly taskRunnerWsServer: TaskRunnerWsServer,
+		private readonly authController: TaskBrokerAuthController,
+		private readonly taskBrokerWsServer: TaskBrokerWsServer,
 	) {
 		this.app = express();
 		this.app.disable('x-powered-by');
@@ -82,7 +82,7 @@ export class TaskRunnerServer {
 			}
 		})();
 
-		const stopWsServerTask = this.taskRunnerWsServer.stop();
+		const stopWsServerTask = this.taskBrokerWsServer.stop();
 
 		await Promise.all([stopHttpServerTask, stopWsServerTask]);
 	}
@@ -100,7 +100,7 @@ export class TaskRunnerServer {
 		this.server.on('error', (error: Error & { code: string }) => {
 			if (error.code === 'EADDRINUSE') {
 				this.logger.info(
-					`n8n Task Runner's port ${port} is already in use. Do you have another instance of n8n running already?`,
+					`n8n Task Broker's port ${port} is already in use. Do you have another instance of n8n running already?`,
 				);
 				process.exit(1);
 			}
@@ -111,7 +111,7 @@ export class TaskRunnerServer {
 			this.server.listen(port, address, () => resolve());
 		});
 
-		this.logger.info(`n8n Task Runner server ready on ${address}, port ${port}`);
+		this.logger.info(`n8n Task Broker ready on ${address}, port ${port}`);
 	}
 
 	/** Creates WebSocket server for handling upgrade requests */
@@ -126,7 +126,7 @@ export class TaskRunnerServer {
 		});
 		this.server.on('upgrade', this.handleUpgradeRequest);
 
-		this.taskRunnerWsServer.start();
+		this.taskBrokerWsServer.start();
 	}
 
 	private async setupErrorHandlers() {
@@ -159,23 +159,23 @@ export class TaskRunnerServer {
 			this.upgradeEndpoint,
 			createRateLimiter(),
 			// eslint-disable-next-line @typescript-eslint/unbound-method
-			this.taskRunnerAuthController.authMiddleware,
-			(req: TaskRunnerServerInitRequest, res: TaskRunnerServerInitResponse) =>
-				this.taskRunnerWsServer.handleRequest(req, res),
+			this.authController.authMiddleware,
+			(req: TaskBrokerServerInitRequest, res: TaskBrokerServerInitResponse) =>
+				this.taskBrokerWsServer.handleRequest(req, res),
 		);
 
 		const authEndpoint = `${this.getEndpointBasePath()}/auth`;
 		this.app.post(
 			authEndpoint,
 			createRateLimiter(),
-			send(async (req) => await this.taskRunnerAuthController.createGrantToken(req)),
+			send(async (req) => await this.authController.createGrantToken(req)),
 		);
 
 		this.app.get('/healthz', (_, res) => res.send({ status: 'ok' }));
 	}
 
 	private handleUpgradeRequest = (
-		request: TaskRunnerServerInitRequest,
+		request: TaskBrokerServerInitRequest,
 		socket: Socket,
 		head: Buffer,
 	) => {
diff --git a/packages/cli/src/task-runners/task-runner-types.ts b/packages/cli/src/task-runners/task-broker/task-broker-types.ts
similarity index 53%
rename from packages/cli/src/task-runners/task-runner-types.ts
rename to packages/cli/src/task-runners/task-broker/task-broker-types.ts
index ca26ed41b8..71a55cc053 100644
--- a/packages/cli/src/task-runners/task-runner-types.ts
+++ b/packages/cli/src/task-runners/task-broker/task-broker-types.ts
@@ -1,9 +1,8 @@
+import type { TaskRunner } from '@n8n/task-runner';
 import type { Response } from 'express';
-import type { INodeExecutionData } from 'n8n-workflow';
 import type WebSocket from 'ws';
 
-import type { TaskRunner } from './task-broker.service';
-import type { AuthlessRequest } from '../requests';
+import type { AuthlessRequest } from '../../requests';
 
 export interface DisconnectAnalyzer {
 	isCloudDeployment: boolean;
@@ -11,19 +10,12 @@ export interface DisconnectAnalyzer {
 	toDisconnectError(opts: DisconnectErrorOptions): Promise<Error>;
 }
 
-export type DataRequestType = 'input' | 'node' | 'all';
-
-export interface TaskResultData {
-	result: INodeExecutionData[];
-	customData?: Record<string, string>;
-}
-
-export interface TaskRunnerServerInitRequest
+export interface TaskBrokerServerInitRequest
 	extends AuthlessRequest<{}, {}, {}, { id: TaskRunner['id']; token?: string }> {
 	ws: WebSocket;
 }
 
-export type TaskRunnerServerInitResponse = Response & { req: TaskRunnerServerInitRequest };
+export type TaskBrokerServerInitResponse = Response & { req: TaskBrokerServerInitRequest };
 
 export type DisconnectReason = 'shutting-down' | 'failed-heartbeat-check' | 'unknown';
 
diff --git a/packages/cli/src/task-runners/task-runner-ws-server.ts b/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts
similarity index 90%
rename from packages/cli/src/task-runners/task-runner-ws-server.ts
rename to packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts
index dbec7cef3e..7b65140717 100644
--- a/packages/cli/src/task-runners/task-runner-ws-server.ts
+++ b/packages/cli/src/task-runners/task-broker/task-broker-ws-server.ts
@@ -6,16 +6,16 @@ import { ApplicationError, jsonStringify } from 'n8n-workflow';
 import type WebSocket from 'ws';
 
 import { Time, WsStatusCodes } from '@/constants';
-
-import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
-import { TaskBroker, type MessageCallback, type TaskRunner } from './task-broker.service';
-import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
+import { DefaultTaskRunnerDisconnectAnalyzer } from '@/task-runners/default-task-runner-disconnect-analyzer';
 import type {
 	DisconnectAnalyzer,
 	DisconnectReason,
-	TaskRunnerServerInitRequest,
-	TaskRunnerServerInitResponse,
-} from './task-runner-types';
+	TaskBrokerServerInitRequest,
+	TaskBrokerServerInitResponse,
+} from '@/task-runners/task-broker/task-broker-types';
+import { TaskRunnerLifecycleEvents } from '@/task-runners/task-runner-lifecycle-events';
+
+import { TaskBroker, type MessageCallback, type TaskRunner } from './task-broker.service';
 
 function heartbeat(this: WebSocket) {
 	this.isAlive = true;
@@ -23,8 +23,12 @@ function heartbeat(this: WebSocket) {
 
 type WsStatusCode = (typeof WsStatusCodes)[keyof typeof WsStatusCodes];
 
+/**
+ * Responsible for handling WebSocket connections with task runners
+ * and monitoring the connection liveness
+ */
 @Service()
-export class TaskRunnerWsServer {
+export class TaskBrokerWsServer {
 	runnerConnections: Map<TaskRunner['id'], WebSocket> = new Map();
 
 	private heartbeatTimer: NodeJS.Timer | undefined;
@@ -164,7 +168,7 @@ export class TaskRunnerWsServer {
 		}
 	}
 
-	handleRequest(req: TaskRunnerServerInitRequest, _res: TaskRunnerServerInitResponse) {
+	handleRequest(req: TaskBrokerServerInitRequest, _res: TaskBrokerServerInitResponse) {
 		this.add(req.query.id, req.ws);
 	}
 
diff --git a/packages/cli/src/task-runners/task-broker.service.ts b/packages/cli/src/task-runners/task-broker/task-broker.service.ts
similarity index 97%
rename from packages/cli/src/task-runners/task-broker.service.ts
rename to packages/cli/src/task-runners/task-broker/task-broker.service.ts
index 42e0d3cd25..3afd182914 100644
--- a/packages/cli/src/task-runners/task-broker.service.ts
+++ b/packages/cli/src/task-runners/task-broker/task-broker.service.ts
@@ -12,10 +12,10 @@ import { nanoid } from 'nanoid';
 
 import config from '@/config';
 import { Time } from '@/constants';
-
-import { TaskDeferredError, TaskRejectError } from './errors';
-import { TaskRunnerTimeoutError } from './errors/task-runner-timeout.error';
-import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
+import { TaskDeferredError } from '@/task-runners/task-broker/errors/task-deferred.error';
+import { TaskRejectError } from '@/task-runners/task-broker/errors/task-reject.error';
+import { TaskRunnerTimeoutError } from '@/task-runners/task-broker/errors/task-runner-timeout.error';
+import { TaskRunnerLifecycleEvents } from '@/task-runners/task-runner-lifecycle-events';
 
 export interface TaskRunner {
 	id: string;
diff --git a/packages/cli/src/task-runners/task-managers/local-task-requester.ts b/packages/cli/src/task-runners/task-managers/local-task-requester.ts
index 1de959936b..4fc45ccd6c 100644
--- a/packages/cli/src/task-runners/task-managers/local-task-requester.ts
+++ b/packages/cli/src/task-runners/task-managers/local-task-requester.ts
@@ -2,10 +2,10 @@ import { Container, Service } from '@n8n/di';
 import type { RequesterMessage } from '@n8n/task-runner';
 
 import { NodeTypes } from '@/node-types';
+import type { RequesterMessageCallback } from '@/task-runners/task-broker/task-broker.service';
+import { TaskBroker } from '@/task-runners/task-broker/task-broker.service';
 
 import { TaskRequester } from './task-requester';
-import type { RequesterMessageCallback } from '../task-broker.service';
-import { TaskBroker } from '../task-broker.service';
 
 @Service()
 export class LocalTaskRequester extends TaskRequester {
diff --git a/packages/cli/src/task-runners/task-runner-module.ts b/packages/cli/src/task-runners/task-runner-module.ts
index bcc54f653f..0ba60123f9 100644
--- a/packages/cli/src/task-runners/task-runner-module.ts
+++ b/packages/cli/src/task-runners/task-runner-module.ts
@@ -6,13 +6,13 @@ import * as a from 'node:assert/strict';
 
 import { OnShutdown } from '@/decorators/on-shutdown';
 import type { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
+import { TaskBrokerWsServer } from '@/task-runners/task-broker/task-broker-ws-server';
 import type { TaskRunnerProcess } from '@/task-runners/task-runner-process';
 import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
 
 import { MissingAuthTokenError } from './errors/missing-auth-token.error';
+import type { TaskBrokerServer } from './task-broker/task-broker-server';
 import type { LocalTaskRequester } from './task-managers/local-task-requester';
-import type { TaskRunnerServer } from './task-runner-server';
-import { TaskRunnerWsServer } from './task-runner-ws-server';
 
 /**
  * Module responsible for loading and starting task runner. Task runner can be
@@ -21,9 +21,9 @@ import { TaskRunnerWsServer } from './task-runner-ws-server';
  */
 @Service()
 export class TaskRunnerModule {
-	private taskRunnerHttpServer: TaskRunnerServer | undefined;
+	private taskBrokerHttpServer: TaskBrokerServer | undefined;
 
-	private taskRunnerWsServer: TaskRunnerWsServer | undefined;
+	private taskBrokerWsServer: TaskBrokerWsServer | undefined;
 
 	private taskRequester: LocalTaskRequester | undefined;
 
@@ -47,7 +47,7 @@ export class TaskRunnerModule {
 		if (mode === 'external' && !authToken) throw new MissingAuthTokenError();
 
 		await this.loadTaskRequester();
-		await this.loadTaskRunnerServer();
+		await this.loadTaskBroker();
 
 		if (mode === 'internal') {
 			await this.startInternalTaskRunner();
@@ -64,9 +64,9 @@ export class TaskRunnerModule {
 		})();
 
 		const stopRunnerServerTask = (async () => {
-			if (this.taskRunnerHttpServer) {
-				await this.taskRunnerHttpServer.stop();
-				this.taskRunnerHttpServer = undefined;
+			if (this.taskBrokerHttpServer) {
+				await this.taskBrokerHttpServer.stop();
+				this.taskBrokerHttpServer = undefined;
 			}
 		})();
 
@@ -82,18 +82,18 @@ export class TaskRunnerModule {
 		Container.set(TaskRequester, this.taskRequester);
 	}
 
-	private async loadTaskRunnerServer() {
+	private async loadTaskBroker() {
 		// These are imported dynamically because we need to set the task manager
 		// instance before importing them
-		const { TaskRunnerServer } = await import('@/task-runners/task-runner-server');
-		this.taskRunnerHttpServer = Container.get(TaskRunnerServer);
-		this.taskRunnerWsServer = Container.get(TaskRunnerWsServer);
+		const { TaskBrokerServer } = await import('@/task-runners/task-broker/task-broker-server');
+		this.taskBrokerHttpServer = Container.get(TaskBrokerServer);
+		this.taskBrokerWsServer = Container.get(TaskBrokerWsServer);
 
-		await this.taskRunnerHttpServer.start();
+		await this.taskBrokerHttpServer.start();
 	}
 
 	private async startInternalTaskRunner() {
-		a.ok(this.taskRunnerWsServer, 'Task Runner WS Server not loaded');
+		a.ok(this.taskBrokerWsServer, 'Task Runner WS Server not loaded');
 
 		const { TaskRunnerProcess } = await import('@/task-runners/task-runner-process');
 		this.taskRunnerProcess = Container.get(TaskRunnerProcess);
@@ -110,7 +110,7 @@ export class TaskRunnerModule {
 		const { InternalTaskRunnerDisconnectAnalyzer } = await import(
 			'@/task-runners/internal-task-runner-disconnect-analyzer'
 		);
-		this.taskRunnerWsServer.setDisconnectAnalyzer(
+		this.taskBrokerWsServer.setDisconnectAnalyzer(
 			Container.get(InternalTaskRunnerDisconnectAnalyzer),
 		);
 	}
diff --git a/packages/cli/src/task-runners/task-runner-process.ts b/packages/cli/src/task-runners/task-runner-process.ts
index 5129ae98b1..26cfefc469 100644
--- a/packages/cli/src/task-runners/task-runner-process.ts
+++ b/packages/cli/src/task-runners/task-runner-process.ts
@@ -7,9 +7,9 @@ import * as process from 'node:process';
 
 import { OnShutdown } from '@/decorators/on-shutdown';
 
-import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
 import { forwardToLogger } from './forward-to-logger';
 import { NodeProcessOomDetector } from './node-process-oom-detector';
+import { TaskBrokerAuthService } from './task-broker/auth/task-broker-auth.service';
 import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
 import { TypedEmitter } from '../typed-emitter';
 
@@ -54,6 +54,7 @@ export class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
 
 	private readonly passthroughEnvVars = [
 		'PATH',
+		'HOME', // So home directory can be resolved correctly
 		'GENERIC_TIMEZONE',
 		'NODE_FUNCTION_ALLOW_BUILTIN',
 		'NODE_FUNCTION_ALLOW_EXTERNAL',
@@ -67,7 +68,7 @@ export class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
 	constructor(
 		logger: Logger,
 		private readonly runnerConfig: TaskRunnersConfig,
-		private readonly authService: TaskRunnerAuthService,
+		private readonly authService: TaskBrokerAuthService,
 		private readonly runnerLifecycleEvents: TaskRunnerLifecycleEvents,
 	) {
 		super();
@@ -106,9 +107,13 @@ export class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
 	startNode(grantToken: string, taskBrokerUri: string) {
 		const startScript = require.resolve('@n8n/task-runner/start');
 
-		return spawn('node', [startScript], {
-			env: this.getProcessEnvVars(grantToken, taskBrokerUri),
-		});
+		return spawn(
+			'node',
+			['--disallow-code-generation-from-strings', '--disable-proto=delete', startScript],
+			{
+				env: this.getProcessEnvVars(grantToken, taskBrokerUri),
+			},
+		);
 	}
 
 	@OnShutdown()
diff --git a/packages/cli/src/__tests__/object-to-error.test.ts b/packages/cli/src/utils/__tests__/object-to-error.test.ts
similarity index 94%
rename from packages/cli/src/__tests__/object-to-error.test.ts
rename to packages/cli/src/utils/__tests__/object-to-error.test.ts
index 311f4dce55..c65676a426 100644
--- a/packages/cli/src/__tests__/object-to-error.test.ts
+++ b/packages/cli/src/utils/__tests__/object-to-error.test.ts
@@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended';
 import type { INode } from 'n8n-workflow';
 import { NodeOperationError, type Workflow } from 'n8n-workflow';
 
-import { objectToError } from '../workflow-execute-additional-data';
+import { objectToError } from '../object-to-error';
 
 describe('objectToError', () => {
 	describe('node error handling', () => {
diff --git a/packages/cli/src/utils/object-to-error.ts b/packages/cli/src/utils/object-to-error.ts
new file mode 100644
index 0000000000..ffb0cd8fb3
--- /dev/null
+++ b/packages/cli/src/utils/object-to-error.ts
@@ -0,0 +1,53 @@
+import { isObjectLiteral } from 'n8n-core';
+import { NodeOperationError } from 'n8n-workflow';
+import type { Workflow } from 'n8n-workflow';
+
+export function objectToError(errorObject: unknown, workflow: Workflow): Error {
+	// TODO: Expand with other error types
+	if (errorObject instanceof Error) {
+		// If it's already an Error instance, return it as is.
+		return errorObject;
+	} else if (
+		isObjectLiteral(errorObject) &&
+		'message' in errorObject &&
+		typeof errorObject.message === 'string'
+	) {
+		// If it's an object with a 'message' property, create a new Error instance.
+		let error: Error | undefined;
+		if (
+			'node' in errorObject &&
+			isObjectLiteral(errorObject.node) &&
+			typeof errorObject.node.name === 'string'
+		) {
+			const node = workflow.getNode(errorObject.node.name);
+
+			if (node) {
+				error = new NodeOperationError(
+					node,
+					errorObject as unknown as Error,
+					errorObject as object,
+				);
+			}
+		}
+
+		if (error === undefined) {
+			error = new Error(errorObject.message);
+		}
+
+		if ('description' in errorObject) {
+			// @ts-expect-error Error descriptions are surfaced by the UI but
+			// not all backend errors account for this property yet.
+			error.description = errorObject.description as string;
+		}
+
+		if ('stack' in errorObject) {
+			// If there's a 'stack' property, set it on the new Error instance.
+			error.stack = errorObject.stack as string;
+		}
+
+		return error;
+	} else {
+		// If it's neither an Error nor an object with a 'message' property, create a generic Error.
+		return new Error('An error occurred');
+	}
+}
diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts
index 1711d18056..ca54a14b52 100644
--- a/packages/cli/src/webhooks/webhook-helpers.ts
+++ b/packages/cli/src/webhooks/webhook-helpers.ts
@@ -454,7 +454,7 @@ export async function executeWebhook(
 		}
 
 		let pinData: IPinData | undefined;
-		const usePinData = executionMode === 'manual';
+		const usePinData = ['manual', 'evaluation'].includes(executionMode);
 		if (usePinData) {
 			pinData = workflowData.pinData;
 			runExecutionData.resultData.pinData = pinData;
@@ -530,6 +530,7 @@ export async function executeWebhook(
 						`Error with Webhook-Response for execution "${executionId}": "${error.message}"`,
 						{ executionId, workflowId: workflow.id },
 					);
+					responseCallback(error, {});
 				});
 		}
 
diff --git a/packages/cli/src/webhooks/webhook-request-handler.ts b/packages/cli/src/webhooks/webhook-request-handler.ts
index 96cf6da745..8eb62358b1 100644
--- a/packages/cli/src/webhooks/webhook-request-handler.ts
+++ b/packages/cli/src/webhooks/webhook-request-handler.ts
@@ -1,5 +1,7 @@
+import { Container } from '@n8n/di';
 import type express from 'express';
-import type { IHttpRequestMethods } from 'n8n-workflow';
+import { Logger } from 'n8n-core';
+import { ensureError, type IHttpRequestMethods } from 'n8n-workflow';
 
 import * as ResponseHelper from '@/response-helper';
 import type {
@@ -52,8 +54,14 @@ class WebhookRequestHandler {
 					response.headers,
 				);
 			}
-		} catch (error) {
-			return ResponseHelper.sendErrorResponse(res, error as Error);
+		} catch (e) {
+			const error = ensureError(e);
+			Container.get(Logger).debug(
+				`Error in handling webhook request ${req.method} ${req.path}: ${error.message}`,
+				{ stacktrace: error.stack },
+			);
+
+			return ResponseHelper.sendErrorResponse(res, error);
 		}
 	}
 
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index e350086f9d..1c5dfcbf67 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -5,15 +5,8 @@
 import type { PushMessage, PushType } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
-import { stringify } from 'flatted';
-import {
-	ErrorReporter,
-	Logger,
-	InstanceSettings,
-	WorkflowExecute,
-	isObjectLiteral,
-} from 'n8n-core';
-import { ApplicationError, NodeOperationError, Workflow, WorkflowHooks } from 'n8n-workflow';
+import { Logger, WorkflowExecute } from 'n8n-core';
+import { ApplicationError, Workflow } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteData,
@@ -23,11 +16,8 @@ import type {
 	INodeParameters,
 	IRun,
 	IRunExecutionData,
-	ITaskData,
 	IWorkflowBase,
 	IWorkflowExecuteAdditionalData,
-	IWorkflowExecuteHooks,
-	IWorkflowHooksOptionalParameters,
 	IWorkflowSettings,
 	WorkflowExecuteMode,
 	ExecutionStatus,
@@ -42,636 +32,24 @@ import type {
 } from 'n8n-workflow';
 
 import { ActiveExecutions } from '@/active-executions';
-import config from '@/config';
 import { CredentialsHelper } from '@/credentials-helper';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { EventService } from '@/events/event.service';
 import type { AiEventMap, AiEventPayload } from '@/events/maps/ai.event-map';
-import { ExternalHooks } from '@/external-hooks';
-import type { IWorkflowErrorData, UpdateExecutionPayload } from '@/interfaces';
+import { getLifecycleHooksForSubExecutions } from '@/execution-lifecycle/execution-lifecycle-hooks';
+import type { UpdateExecutionPayload } from '@/interfaces';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
-import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
-import { findSubworkflowStart, isWorkflowIdValid } from '@/utils';
+import { SecretsHelper } from '@/secrets-helpers.ee';
+import { UrlService } from '@/services/url.service';
+import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
+import { TaskRequester } from '@/task-runners/task-managers/task-requester';
+import { PermissionChecker } from '@/user-management/permission-checker';
+import { findSubworkflowStart } from '@/utils';
+import { objectToError } from '@/utils/object-to-error';
 import * as WorkflowHelpers from '@/workflow-helpers';
 
-import { WorkflowRepository } from './databases/repositories/workflow.repository';
-import { EventService } from './events/event.service';
-import { restoreBinaryDataId } from './execution-lifecycle-hooks/restore-binary-data-id';
-import { saveExecutionProgress } from './execution-lifecycle-hooks/save-execution-progress';
-import {
-	determineFinalExecutionStatus,
-	prepareExecutionDataForDbUpdate,
-	updateExistingExecution,
-} from './execution-lifecycle-hooks/shared/shared-hook-functions';
-import { toSaveSettings } from './execution-lifecycle-hooks/to-save-settings';
-import { SecretsHelper } from './secrets-helpers.ee';
-import { OwnershipService } from './services/ownership.service';
-import { UrlService } from './services/url.service';
-import { SubworkflowPolicyChecker } from './subworkflows/subworkflow-policy-checker.service';
-import { TaskRequester } from './task-runners/task-managers/task-requester';
-import { PermissionChecker } from './user-management/permission-checker';
-import { WorkflowExecutionService } from './workflows/workflow-execution.service';
-import { WorkflowStaticDataService } from './workflows/workflow-static-data.service';
-
-export function objectToError(errorObject: unknown, workflow: Workflow): Error {
-	// TODO: Expand with other error types
-	if (errorObject instanceof Error) {
-		// If it's already an Error instance, return it as is.
-		return errorObject;
-	} else if (
-		isObjectLiteral(errorObject) &&
-		'message' in errorObject &&
-		typeof errorObject.message === 'string'
-	) {
-		// If it's an object with a 'message' property, create a new Error instance.
-		let error: Error | undefined;
-		if (
-			'node' in errorObject &&
-			isObjectLiteral(errorObject.node) &&
-			typeof errorObject.node.name === 'string'
-		) {
-			const node = workflow.getNode(errorObject.node.name);
-
-			if (node) {
-				error = new NodeOperationError(
-					node,
-					errorObject as unknown as Error,
-					errorObject as object,
-				);
-			}
-		}
-
-		if (error === undefined) {
-			error = new Error(errorObject.message);
-		}
-
-		if ('description' in errorObject) {
-			// @ts-expect-error Error descriptions are surfaced by the UI but
-			// not all backend errors account for this property yet.
-			error.description = errorObject.description as string;
-		}
-
-		if ('stack' in errorObject) {
-			// If there's a 'stack' property, set it on the new Error instance.
-			error.stack = errorObject.stack as string;
-		}
-
-		return error;
-	} else {
-		// If it's neither an Error nor an object with a 'message' property, create a generic Error.
-		return new Error('An error occurred');
-	}
-}
-
-/**
- * Checks if there was an error and if errorWorkflow or a trigger is defined. If so it collects
- * all the data and executes it
- *
- * @param {IWorkflowBase} workflowData The workflow which got executed
- * @param {IRun} fullRunData The run which produced the error
- * @param {WorkflowExecuteMode} mode The mode in which the workflow got started in
- * @param {string} [executionId] The id the execution got saved as
- */
-export function executeErrorWorkflow(
-	workflowData: IWorkflowBase,
-	fullRunData: IRun,
-	mode: WorkflowExecuteMode,
-	executionId?: string,
-	retryOf?: string,
-): void {
-	const logger = Container.get(Logger);
-
-	// Check if there was an error and if so if an errorWorkflow or a trigger is set
-	let pastExecutionUrl: string | undefined;
-	if (executionId !== undefined) {
-		pastExecutionUrl = `${Container.get(UrlService).getWebhookBaseUrl()}workflow/${
-			workflowData.id
-		}/executions/${executionId}`;
-	}
-
-	if (fullRunData.data.resultData.error !== undefined) {
-		let workflowErrorData: IWorkflowErrorData;
-		const workflowId = workflowData.id;
-
-		if (executionId) {
-			// The error did happen in an execution
-			workflowErrorData = {
-				execution: {
-					id: executionId,
-					url: pastExecutionUrl,
-					error: fullRunData.data.resultData.error,
-					lastNodeExecuted: fullRunData.data.resultData.lastNodeExecuted!,
-					mode,
-					retryOf,
-				},
-				workflow: {
-					id: workflowId,
-					name: workflowData.name,
-				},
-			};
-		} else {
-			// The error did happen in a trigger
-			workflowErrorData = {
-				trigger: {
-					error: fullRunData.data.resultData.error,
-					mode,
-				},
-				workflow: {
-					id: workflowId,
-					name: workflowData.name,
-				},
-			};
-		}
-
-		const { errorTriggerType } = Container.get(GlobalConfig).nodes;
-		// Run the error workflow
-		// To avoid an infinite loop do not run the error workflow again if the error-workflow itself failed and it is its own error-workflow.
-		const { errorWorkflow } = workflowData.settings ?? {};
-		if (errorWorkflow && !(mode === 'error' && workflowId && errorWorkflow === workflowId)) {
-			logger.debug('Start external error workflow', {
-				executionId,
-				errorWorkflowId: errorWorkflow,
-				workflowId,
-			});
-			// If a specific error workflow is set run only that one
-
-			// First, do permission checks.
-			if (!workflowId) {
-				// Manual executions do not trigger error workflows
-				// So this if should never happen. It was added to
-				// make sure there are no possible security gaps
-				return;
-			}
-
-			Container.get(OwnershipService)
-				.getWorkflowProjectCached(workflowId)
-				.then((project) => {
-					void Container.get(WorkflowExecutionService).executeErrorWorkflow(
-						errorWorkflow,
-						workflowErrorData,
-						project,
-					);
-				})
-				.catch((error: Error) => {
-					Container.get(ErrorReporter).error(error);
-					logger.error(
-						`Could not execute ErrorWorkflow for execution ID ${this.executionId} because of error querying the workflow owner`,
-						{
-							executionId,
-							errorWorkflowId: errorWorkflow,
-							workflowId,
-							error,
-							workflowErrorData,
-						},
-					);
-				});
-		} else if (
-			mode !== 'error' &&
-			workflowId !== undefined &&
-			workflowData.nodes.some((node) => node.type === errorTriggerType)
-		) {
-			logger.debug('Start internal error workflow', { executionId, workflowId });
-			void Container.get(OwnershipService)
-				.getWorkflowProjectCached(workflowId)
-				.then((project) => {
-					void Container.get(WorkflowExecutionService).executeErrorWorkflow(
-						workflowId,
-						workflowErrorData,
-						project,
-					);
-				});
-		}
-	}
-}
-
-/**
- * Returns hook functions to push data to Editor-UI
- *
- */
-function hookFunctionsPush(): IWorkflowExecuteHooks {
-	const logger = Container.get(Logger);
-	const pushInstance = Container.get(Push);
-	return {
-		nodeExecuteBefore: [
-			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				const { pushRef, executionId } = this;
-				// Push data to session which started workflow before each
-				// node which starts rendering
-				if (pushRef === undefined) {
-					return;
-				}
-
-				logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
-					executionId,
-					pushRef,
-					workflowId: this.workflowData.id,
-				});
-
-				pushInstance.send({ type: 'nodeExecuteBefore', data: { executionId, nodeName } }, pushRef);
-			},
-		],
-		nodeExecuteAfter: [
-			async function (this: WorkflowHooks, nodeName: string, data: ITaskData): Promise<void> {
-				const { pushRef, executionId } = this;
-				// Push data to session which started workflow after each rendered node
-				if (pushRef === undefined) {
-					return;
-				}
-
-				logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
-					executionId,
-					pushRef,
-					workflowId: this.workflowData.id,
-				});
-
-				pushInstance.send(
-					{ type: 'nodeExecuteAfter', data: { executionId, nodeName, data } },
-					pushRef,
-				);
-			},
-		],
-		workflowExecuteBefore: [
-			async function (this: WorkflowHooks, _workflow, data): Promise<void> {
-				const { pushRef, executionId } = this;
-				const { id: workflowId, name: workflowName } = this.workflowData;
-				logger.debug('Executing hook (hookFunctionsPush)', {
-					executionId,
-					pushRef,
-					workflowId,
-				});
-				// Push data to session which started the workflow
-				if (pushRef === undefined) {
-					return;
-				}
-				pushInstance.send(
-					{
-						type: 'executionStarted',
-						data: {
-							executionId,
-							mode: this.mode,
-							startedAt: new Date(),
-							retryOf: this.retryOf,
-							workflowId,
-							workflowName,
-							flattedRunData: data?.resultData.runData
-								? stringify(data.resultData.runData)
-								: stringify({}),
-						},
-					},
-					pushRef,
-				);
-			},
-		],
-		workflowExecuteAfter: [
-			async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
-				const { pushRef, executionId } = this;
-				if (pushRef === undefined) return;
-
-				const { id: workflowId } = this.workflowData;
-				logger.debug('Executing hook (hookFunctionsPush)', {
-					executionId,
-					pushRef,
-					workflowId,
-				});
-
-				const { status } = fullRunData;
-				if (status === 'waiting') {
-					pushInstance.send({ type: 'executionWaiting', data: { executionId } }, pushRef);
-				} else {
-					const rawData = stringify(fullRunData.data);
-					pushInstance.send(
-						{ type: 'executionFinished', data: { executionId, workflowId, status, rawData } },
-						pushRef,
-					);
-				}
-			},
-		],
-	};
-}
-
-export function hookFunctionsPreExecute(): IWorkflowExecuteHooks {
-	const externalHooks = Container.get(ExternalHooks);
-	return {
-		workflowExecuteBefore: [
-			async function (this: WorkflowHooks, workflow: Workflow): Promise<void> {
-				await externalHooks.run('workflow.preExecute', [workflow, this.mode]);
-			},
-		],
-		nodeExecuteAfter: [
-			async function (
-				this: WorkflowHooks,
-				nodeName: string,
-				data: ITaskData,
-				executionData: IRunExecutionData,
-			): Promise<void> {
-				await saveExecutionProgress(
-					this.workflowData,
-					this.executionId,
-					nodeName,
-					data,
-					executionData,
-					this.pushRef,
-				);
-			},
-		],
-	};
-}
-
-/**
- * Returns hook functions to save workflow execution and call error workflow
- *
- */
-function hookFunctionsSave(): IWorkflowExecuteHooks {
-	const logger = Container.get(Logger);
-	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
-	const eventService = Container.get(EventService);
-	return {
-		nodeExecuteBefore: [
-			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				const { executionId, workflowData: workflow } = this;
-
-				eventService.emit('node-pre-execute', { executionId, workflow, nodeName });
-			},
-		],
-		nodeExecuteAfter: [
-			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				const { executionId, workflowData: workflow } = this;
-
-				eventService.emit('node-post-execute', { executionId, workflow, nodeName });
-			},
-		],
-		workflowExecuteBefore: [],
-		workflowExecuteAfter: [
-			async function (
-				this: WorkflowHooks,
-				fullRunData: IRun,
-				newStaticData: IDataObject,
-			): Promise<void> {
-				logger.debug('Executing hook (hookFunctionsSave)', {
-					executionId: this.executionId,
-					workflowId: this.workflowData.id,
-				});
-
-				await restoreBinaryDataId(fullRunData, this.executionId, this.mode);
-
-				const isManualMode = this.mode === 'manual';
-
-				try {
-					if (!isManualMode && isWorkflowIdValid(this.workflowData.id) && newStaticData) {
-						// Workflow is saved so update in database
-						try {
-							await Container.get(WorkflowStaticDataService).saveStaticDataById(
-								this.workflowData.id,
-								newStaticData,
-							);
-						} catch (e) {
-							Container.get(ErrorReporter).error(e);
-							logger.error(
-								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`,
-								{ executionId: this.executionId, workflowId: this.workflowData.id },
-							);
-						}
-					}
-
-					const executionStatus = determineFinalExecutionStatus(fullRunData);
-					fullRunData.status = executionStatus;
-
-					const saveSettings = toSaveSettings(this.workflowData.settings);
-
-					if (isManualMode && !saveSettings.manual && !fullRunData.waitTill) {
-						/**
-						 * When manual executions are not being saved, we only soft-delete
-						 * the execution so that the user can access its binary data
-						 * while building their workflow.
-						 *
-						 * The manual execution and its binary data will be hard-deleted
-						 * on the next pruning cycle after the grace period set by
-						 * `EXECUTIONS_DATA_HARD_DELETE_BUFFER`.
-						 */
-						await Container.get(ExecutionRepository).softDelete(this.executionId);
-
-						return;
-					}
-
-					const shouldNotSave =
-						(executionStatus === 'success' && !saveSettings.success) ||
-						(executionStatus !== 'success' && !saveSettings.error);
-
-					if (shouldNotSave && !fullRunData.waitTill && !isManualMode) {
-						executeErrorWorkflow(
-							this.workflowData,
-							fullRunData,
-							this.mode,
-							this.executionId,
-							this.retryOf,
-						);
-
-						await Container.get(ExecutionRepository).hardDelete({
-							workflowId: this.workflowData.id,
-							executionId: this.executionId,
-						});
-
-						return;
-					}
-
-					// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
-					// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
-					const fullExecutionData = prepareExecutionDataForDbUpdate({
-						runData: fullRunData,
-						workflowData: this.workflowData,
-						workflowStatusFinal: executionStatus,
-						retryOf: this.retryOf,
-					});
-
-					// When going into the waiting state, store the pushRef in the execution-data
-					if (fullRunData.waitTill && isManualMode) {
-						fullExecutionData.data.pushRef = this.pushRef;
-					}
-
-					await updateExistingExecution({
-						executionId: this.executionId,
-						workflowId: this.workflowData.id,
-						executionData: fullExecutionData,
-					});
-
-					if (!isManualMode) {
-						executeErrorWorkflow(
-							this.workflowData,
-							fullRunData,
-							this.mode,
-							this.executionId,
-							this.retryOf,
-						);
-					}
-				} catch (error) {
-					Container.get(ErrorReporter).error(error);
-					logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
-						executionId: this.executionId,
-						workflowId: this.workflowData.id,
-						error,
-					});
-					if (!isManualMode) {
-						executeErrorWorkflow(
-							this.workflowData,
-							fullRunData,
-							this.mode,
-							this.executionId,
-							this.retryOf,
-						);
-					}
-				} finally {
-					workflowStatisticsService.emit('workflowExecutionCompleted', {
-						workflowData: this.workflowData,
-						fullRunData,
-					});
-				}
-			},
-		],
-		nodeFetchedData: [
-			async (workflowId: string, node: INode) => {
-				workflowStatisticsService.emit('nodeFetchedData', { workflowId, node });
-			},
-		],
-	};
-}
-
-/**
- * Returns hook functions to save workflow execution and call error workflow
- * for running with queues. Manual executions should never run on queues as
- * they are always executed in the main process.
- *
- */
-function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
-	const logger = Container.get(Logger);
-	const workflowStatisticsService = Container.get(WorkflowStatisticsService);
-	const eventService = Container.get(EventService);
-	return {
-		nodeExecuteBefore: [
-			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				const { executionId, workflowData: workflow } = this;
-
-				eventService.emit('node-pre-execute', { executionId, workflow, nodeName });
-			},
-		],
-		nodeExecuteAfter: [
-			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
-				const { executionId, workflowData: workflow } = this;
-
-				eventService.emit('node-post-execute', { executionId, workflow, nodeName });
-			},
-		],
-		workflowExecuteBefore: [
-			async function (): Promise<void> {
-				const { executionId, workflowData } = this;
-
-				eventService.emit('workflow-pre-execute', { executionId, data: workflowData });
-			},
-		],
-		workflowExecuteAfter: [
-			async function (
-				this: WorkflowHooks,
-				fullRunData: IRun,
-				newStaticData: IDataObject,
-			): Promise<void> {
-				logger.debug('Executing hook (hookFunctionsSaveWorker)', {
-					executionId: this.executionId,
-					workflowId: this.workflowData.id,
-				});
-				try {
-					if (isWorkflowIdValid(this.workflowData.id) && newStaticData) {
-						// Workflow is saved so update in database
-						try {
-							await Container.get(WorkflowStaticDataService).saveStaticDataById(
-								this.workflowData.id,
-								newStaticData,
-							);
-						} catch (e) {
-							Container.get(ErrorReporter).error(e);
-							logger.error(
-								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`,
-								{ pushRef: this.pushRef, workflowId: this.workflowData.id },
-							);
-						}
-					}
-
-					const workflowStatusFinal = determineFinalExecutionStatus(fullRunData);
-					fullRunData.status = workflowStatusFinal;
-
-					if (workflowStatusFinal !== 'success' && workflowStatusFinal !== 'waiting') {
-						executeErrorWorkflow(
-							this.workflowData,
-							fullRunData,
-							this.mode,
-							this.executionId,
-							this.retryOf,
-						);
-					}
-
-					// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
-					// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
-					const fullExecutionData = prepareExecutionDataForDbUpdate({
-						runData: fullRunData,
-						workflowData: this.workflowData,
-						workflowStatusFinal,
-						retryOf: this.retryOf,
-					});
-
-					await updateExistingExecution({
-						executionId: this.executionId,
-						workflowId: this.workflowData.id,
-						executionData: fullExecutionData,
-					});
-				} catch (error) {
-					executeErrorWorkflow(
-						this.workflowData,
-						fullRunData,
-						this.mode,
-						this.executionId,
-						this.retryOf,
-					);
-				} finally {
-					workflowStatisticsService.emit('workflowExecutionCompleted', {
-						workflowData: this.workflowData,
-						fullRunData,
-					});
-				}
-			},
-			async function (this: WorkflowHooks, runData: IRun): Promise<void> {
-				const { executionId, workflowData: workflow } = this;
-
-				eventService.emit('workflow-post-execute', {
-					workflow,
-					executionId,
-					runData,
-				});
-			},
-			async function (this: WorkflowHooks, fullRunData: IRun) {
-				const externalHooks = Container.get(ExternalHooks);
-				if (externalHooks.exists('workflow.postExecute')) {
-					try {
-						await externalHooks.run('workflow.postExecute', [
-							fullRunData,
-							this.workflowData,
-							this.executionId,
-						]);
-					} catch (error) {
-						Container.get(ErrorReporter).error(error);
-						Container.get(Logger).error(
-							'There was a problem running hook "workflow.postExecute"',
-							error,
-						);
-					}
-				}
-			},
-		],
-		nodeFetchedData: [
-			async (workflowId: string, node: INode) => {
-				workflowStatisticsService.emit('nodeFetchedData', { workflowId, node });
-			},
-		],
-	};
-}
-
 export async function getRunData(
 	workflowData: IWorkflowBase,
 	inputData?: INodeExecutionData[],
@@ -734,7 +112,7 @@ export async function getWorkflowData(
 
 	let workflowData: IWorkflowBase | null;
 	if (workflowInfo.id !== undefined) {
-		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
+		const relations = Container.get(GlobalConfig).tags.disabled ? [] : ['tags'];
 
 		workflowData = await Container.get(WorkflowRepository).get(
 			{ id: workflowInfo.id },
@@ -803,12 +181,8 @@ async function startExecution(
 	runData: IWorkflowExecutionDataProcess,
 	workflowData: IWorkflowBase,
 ): Promise<ExecuteWorkflowData> {
-	const externalHooks = Container.get(ExternalHooks);
-	await externalHooks.init();
-
 	const nodeTypes = Container.get(NodeTypes);
 	const activeExecutions = Container.get(ActiveExecutions);
-	const eventService = Container.get(EventService);
 	const executionRepository = Container.get(ExecutionRepository);
 
 	const workflowName = workflowData ? workflowData.name : undefined;
@@ -830,8 +204,6 @@ async function startExecution(
 	 */
 	await executionRepository.setRunning(executionId);
 
-	Container.get(EventService).emit('workflow-pre-execute', { executionId, data: runData });
-
 	let data;
 	try {
 		await Container.get(PermissionChecker).check(workflowData.id, workflowData.nodes);
@@ -845,10 +217,11 @@ async function startExecution(
 		// Create new additionalData to have different workflow loaded and to call
 		// different webhooks
 		const additionalDataIntegrated = await getBase();
-		additionalDataIntegrated.hooks = getWorkflowHooksIntegrated(
+		additionalDataIntegrated.hooks = getLifecycleHooksForSubExecutions(
 			runData.executionMode,
 			executionId,
 			workflowData,
+			additionalData.userId,
 		);
 		additionalDataIntegrated.executionId = executionId;
 		additionalDataIntegrated.parentCallbackManager = options.parentCallbackManager;
@@ -929,15 +302,6 @@ async function startExecution(
 		);
 	}
 
-	await externalHooks.run('workflow.postExecute', [data, workflowData, executionId]);
-
-	eventService.emit('workflow-post-execute', {
-		workflow: workflowData,
-		executionId,
-		userId: additionalData.userId,
-		runData: data,
-	});
-
 	// subworkflow either finished, or is in status waiting due to a wait node, both cases are considered successes here
 	if (data.finished === true || data.status === 'waiting') {
 		// Workflow did finish successfully
@@ -1062,137 +426,3 @@ export async function getBase(
 			eventService.emit(eventName, payload),
 	};
 }
-
-/**
- * Returns WorkflowHooks instance for running integrated workflows
- * (Workflows which get started inside of another workflow)
- */
-function getWorkflowHooksIntegrated(
-	mode: WorkflowExecuteMode,
-	executionId: string,
-	workflowData: IWorkflowBase,
-): WorkflowHooks {
-	const hookFunctions = hookFunctionsSave();
-	const preExecuteFunctions = hookFunctionsPreExecute();
-	for (const key of Object.keys(preExecuteFunctions)) {
-		const hooks = hookFunctions[key] ?? [];
-		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
-	}
-	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData);
-}
-
-/**
- * Returns WorkflowHooks instance for worker in scaling mode.
- */
-export function getWorkflowHooksWorkerExecuter(
-	mode: WorkflowExecuteMode,
-	executionId: string,
-	workflowData: IWorkflowBase,
-	optionalParameters?: IWorkflowHooksOptionalParameters,
-): WorkflowHooks {
-	optionalParameters = optionalParameters || {};
-	const hookFunctions = hookFunctionsSaveWorker();
-	const preExecuteFunctions = hookFunctionsPreExecute();
-	for (const key of Object.keys(preExecuteFunctions)) {
-		const hooks = hookFunctions[key] ?? [];
-		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
-	}
-
-	if (mode === 'manual' && Container.get(InstanceSettings).isWorker) {
-		const pushHooks = hookFunctionsPush();
-		for (const key of Object.keys(pushHooks)) {
-			if (hookFunctions[key] === undefined) {
-				hookFunctions[key] = [];
-			}
-			// eslint-disable-next-line prefer-spread
-			hookFunctions[key].push.apply(hookFunctions[key], pushHooks[key]);
-		}
-	}
-
-	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
-}
-
-/**
- * Returns WorkflowHooks instance for main process if workflow runs via worker
- */
-export function getWorkflowHooksWorkerMain(
-	mode: WorkflowExecuteMode,
-	executionId: string,
-	workflowData: IWorkflowBase,
-	optionalParameters?: IWorkflowHooksOptionalParameters,
-): WorkflowHooks {
-	optionalParameters = optionalParameters || {};
-	const hookFunctions = hookFunctionsPreExecute();
-
-	// TODO: why are workers pushing to frontend?
-	// TODO: simplifying this for now to just leave the bare minimum hooks
-
-	// const hookFunctions = hookFunctionsPush();
-	// const preExecuteFunctions = hookFunctionsPreExecute();
-	// for (const key of Object.keys(preExecuteFunctions)) {
-	// 	if (hookFunctions[key] === undefined) {
-	// 		hookFunctions[key] = [];
-	// 	}
-	// 	hookFunctions[key]!.push.apply(hookFunctions[key], preExecuteFunctions[key]);
-	// }
-
-	// When running with worker mode, main process executes
-	// Only workflowExecuteBefore + workflowExecuteAfter
-	// So to avoid confusion, we are removing other hooks.
-	hookFunctions.nodeExecuteBefore = [];
-	hookFunctions.nodeExecuteAfter = [];
-	hookFunctions.workflowExecuteAfter = [
-		async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
-			// Don't delete executions before they are finished
-			if (!fullRunData.finished) return;
-
-			const executionStatus = determineFinalExecutionStatus(fullRunData);
-			fullRunData.status = executionStatus;
-
-			const saveSettings = toSaveSettings(this.workflowData.settings);
-
-			const shouldNotSave =
-				(executionStatus === 'success' && !saveSettings.success) ||
-				(executionStatus !== 'success' && !saveSettings.error);
-
-			if (shouldNotSave) {
-				await Container.get(ExecutionRepository).hardDelete({
-					workflowId: this.workflowData.id,
-					executionId: this.executionId,
-				});
-			}
-		},
-	];
-
-	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
-}
-
-/**
- * Returns WorkflowHooks instance for running the main workflow
- *
- */
-export function getWorkflowHooksMain(
-	data: IWorkflowExecutionDataProcess,
-	executionId: string,
-): WorkflowHooks {
-	const hookFunctions = hookFunctionsSave();
-	const pushFunctions = hookFunctionsPush();
-	for (const key of Object.keys(pushFunctions)) {
-		const hooks = hookFunctions[key] ?? [];
-		hooks.push.apply(hookFunctions[key], pushFunctions[key]);
-	}
-
-	const preExecuteFunctions = hookFunctionsPreExecute();
-	for (const key of Object.keys(preExecuteFunctions)) {
-		const hooks = hookFunctions[key] ?? [];
-		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
-	}
-
-	if (!hookFunctions.nodeExecuteBefore) hookFunctions.nodeExecuteBefore = [];
-	if (!hookFunctions.nodeExecuteAfter) hookFunctions.nodeExecuteAfter = [];
-
-	return new WorkflowHooks(hookFunctions, data.executionMode, executionId, data.workflowData, {
-		pushRef: data.pushRef,
-		retryOf: data.retryOf as string,
-	});
-}
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index a5ffb728d6..82beb20648 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -3,6 +3,7 @@
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { Container, Service } from '@n8n/di';
+import type { ExecutionLifecycleHooks } from 'n8n-core';
 import { ErrorReporter, InstanceSettings, Logger, WorkflowExecute } from 'n8n-core';
 import type {
 	ExecutionError,
@@ -11,7 +12,6 @@ import type {
 	IPinData,
 	IRun,
 	WorkflowExecuteMode,
-	WorkflowHooks,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
 import { ExecutionCancelledError, Workflow } from 'n8n-workflow';
@@ -20,7 +20,13 @@ import PCancelable from 'p-cancelable';
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { ExternalHooks } from '@/external-hooks';
+import { ExecutionNotFoundError } from '@/errors/execution-not-found-error';
+import {
+	getLifecycleHooksForRegularMain,
+	getLifecycleHooksForScalingWorker,
+	getLifecycleHooksForScalingMain,
+} from '@/execution-lifecycle/execution-lifecycle-hooks';
+import { ManualExecutionService } from '@/manual-execution.service';
 import { NodeTypes } from '@/node-types';
 import type { ScalingService } from '@/scaling/scaling.service';
 import type { Job, JobData } from '@/scaling/scaling.types';
@@ -29,9 +35,7 @@ import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-da
 import { generateFailedExecutionFromError } from '@/workflow-helpers';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
-import { ExecutionNotFoundError } from './errors/execution-not-found-error';
-import { EventService } from './events/event.service';
-import { ManualExecutionService } from './manual-execution.service';
+import { MaxStalledCountError } from './errors/max-stalled-count.error';
 
 @Service()
 export class WorkflowRunner {
@@ -44,11 +48,9 @@ export class WorkflowRunner {
 		private readonly errorReporter: ErrorReporter,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly executionRepository: ExecutionRepository,
-		private readonly externalHooks: ExternalHooks,
 		private readonly workflowStaticDataService: WorkflowStaticDataService,
 		private readonly nodeTypes: NodeTypes,
 		private readonly permissionChecker: PermissionChecker,
-		private readonly eventService: EventService,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly manualExecutionService: ManualExecutionService,
 	) {}
@@ -59,7 +61,7 @@ export class WorkflowRunner {
 		startedAt: Date,
 		executionMode: WorkflowExecuteMode,
 		executionId: string,
-		hooks?: WorkflowHooks,
+		hooks?: ExecutionLifecycleHooks,
 	) {
 		// This means the execution was probably cancelled and has already
 		// been cleaned up.
@@ -114,9 +116,7 @@ export class WorkflowRunner {
 		// set the execution to failed.
 		this.activeExecutions.finalizeExecution(executionId, fullRunData);
 
-		if (hooks) {
-			await hooks.executeHookFunctions('workflowExecuteAfter', [fullRunData]);
-		}
+		await hooks?.runHook('workflowExecuteAfter', [fullRunData]);
 	}
 
 	/** Run the workflow
@@ -138,12 +138,9 @@ export class WorkflowRunner {
 		} catch (error) {
 			// Create a failed execution with the data for the node, save it and abort execution
 			const runData = generateFailedExecutionFromError(data.executionMode, error, error.node);
-			const workflowHooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
-			await workflowHooks.executeHookFunctions('workflowExecuteBefore', [
-				undefined,
-				data.executionData,
-			]);
-			await workflowHooks.executeHookFunctions('workflowExecuteAfter', [runData]);
+			const lifecycleHooks = getLifecycleHooksForRegularMain(data, executionId);
+			await lifecycleHooks.runHook('workflowExecuteBefore', [undefined, data.executionData]);
+			await lifecycleHooks.runHook('workflowExecuteAfter', [runData]);
 			responsePromise?.reject(error);
 			this.activeExecutions.finalizeExecution(executionId);
 			return executionId;
@@ -163,7 +160,6 @@ export class WorkflowRunner {
 			await this.enqueueExecution(executionId, data, loadStaticData, realtime);
 		} else {
 			await this.runMainProcess(executionId, data, loadStaticData, restartExecutionId);
-			this.eventService.emit('workflow-pre-execute', { executionId, data });
 		}
 
 		// only run these when not in queue mode or when the execution is manual,
@@ -174,35 +170,17 @@ export class WorkflowRunner {
 			data.executionMode === 'manual'
 		) {
 			const postExecutePromise = this.activeExecutions.getPostExecutePromise(executionId);
-			postExecutePromise
-				.then(async (executionData) => {
-					this.eventService.emit('workflow-post-execute', {
-						workflow: data.workflowData,
-						executionId,
-						userId: data.userId,
-						runData: executionData,
-					});
-					if (this.externalHooks.exists('workflow.postExecute')) {
-						try {
-							await this.externalHooks.run('workflow.postExecute', [
-								executionData,
-								data.workflowData,
-								executionId,
-							]);
-						} catch (error) {
-							this.errorReporter.error(error);
-							this.logger.error('There was a problem running hook "workflow.postExecute"', error);
-						}
-					}
-				})
-				.catch((error) => {
-					if (error instanceof ExecutionCancelledError) return;
-					this.errorReporter.error(error);
-					this.logger.error(
-						'There was a problem running internal hook "onWorkflowPostExecute"',
-						error,
-					);
+			postExecutePromise.catch((error) => {
+				if (error instanceof ExecutionCancelledError) return;
+				this.errorReporter.error(error, {
+					extra: { executionId, workflowId },
 				});
+				this.logger.error('There was an error in the post-execution promise', {
+					error,
+					executionId,
+					workflowId,
+				});
+			});
 		}
 
 		return executionId;
@@ -234,7 +212,7 @@ export class WorkflowRunner {
 		}
 
 		let pinData: IPinData | undefined;
-		if (data.executionMode === 'manual') {
+		if (['manual', 'evaluation'].includes(data.executionMode)) {
 			pinData = data.pinData ?? data.workflowData.pinData;
 		}
 
@@ -267,13 +245,12 @@ export class WorkflowRunner {
 		await this.executionRepository.setRunning(executionId); // write
 
 		try {
-			additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksMain(data, executionId);
+			const lifecycleHooks = getLifecycleHooksForRegularMain(data, executionId);
+			additionalData.hooks = lifecycleHooks;
 
-			additionalData.hooks.hookFunctions.sendResponse = [
-				async (response: IExecuteResponsePromiseData): Promise<void> => {
-					this.activeExecutions.resolveResponsePromise(executionId, response);
-				},
-			];
+			lifecycleHooks.addHandler('sendResponse', (response) => {
+				this.activeExecutions.resolveResponsePromise(executionId, response);
+			});
 
 			additionalData.setExecutionStatus = WorkflowExecuteAdditionalData.setExecutionStatus.bind({
 				executionId,
@@ -364,30 +341,32 @@ export class WorkflowRunner {
 		// TODO: For realtime jobs should probably also not do retry or not retry if they are older than x seconds.
 		//       Check if they get retried by default and how often.
 		let job: Job;
-		let hooks: WorkflowHooks;
+		let lifecycleHooks: ExecutionLifecycleHooks;
 		try {
 			job = await this.scalingService.addJob(jobData, { priority: realtime ? 50 : 100 });
 
-			hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(
+			lifecycleHooks = getLifecycleHooksForScalingMain(
 				data.executionMode,
 				executionId,
 				data.workflowData,
-				{ retryOf: data.retryOf ? data.retryOf.toString() : undefined },
+				{
+					retryOf: data.retryOf ?? undefined,
+				},
 			);
 
 			// Normally also workflow should be supplied here but as it only used for sending
 			// data to editor-UI is not needed.
-			await hooks.executeHookFunctions('workflowExecuteBefore', [undefined, data.executionData]);
+			await lifecycleHooks.runHook('workflowExecuteBefore', [undefined, data.executionData]);
 		} catch (error) {
-			// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
+			// We use "getLifecycleHooksForScalingWorker" as "getLifecycleHooksForScalingMain" does not contain the
 			// "workflowExecuteAfter" which we require.
-			const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
+			const lifecycleHooks = getLifecycleHooksForScalingWorker(
 				data.executionMode,
 				executionId,
 				data.workflowData,
-				{ retryOf: data.retryOf ? data.retryOf.toString() : undefined },
+				{ retryOf: data.retryOf ?? undefined },
 			);
-			await this.processError(error, new Date(), data.executionMode, executionId, hooks);
+			await this.processError(error, new Date(), data.executionMode, executionId, lifecycleHooks);
 			throw error;
 		}
 
@@ -397,17 +376,23 @@ export class WorkflowRunner {
 				onCancel(async () => {
 					await this.scalingService.stopJob(job);
 
-					// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
+					// We use "getLifecycleHooksForScalingWorker" as "getLifecycleHooksForScalingMain" does not contain the
 					// "workflowExecuteAfter" which we require.
-					const hooksWorker = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
+					const lifecycleHooks = getLifecycleHooksForScalingWorker(
 						data.executionMode,
 						executionId,
 						data.workflowData,
-						{ retryOf: data.retryOf ? data.retryOf.toString() : undefined },
+						{ retryOf: data.retryOf ?? undefined },
 					);
 
 					const error = new ExecutionCancelledError(executionId);
-					await this.processError(error, new Date(), data.executionMode, executionId, hooksWorker);
+					await this.processError(
+						error,
+						new Date(),
+						data.executionMode,
+						executionId,
+						lifecycleHooks,
+					);
 
 					reject(error);
 				});
@@ -415,15 +400,29 @@ export class WorkflowRunner {
 				try {
 					await job.finished();
 				} catch (error) {
-					// We use "getWorkflowHooksWorkerExecuter" as "getWorkflowHooksWorkerMain" does not contain the
+					if (
+						error instanceof Error &&
+						error.message.includes('job stalled more than maxStalledCount')
+					) {
+						error = new MaxStalledCountError(error);
+					}
+
+					// We use "getLifecycleHooksForScalingWorker" as "getLifecycleHooksForScalingMain" does not contain the
 					// "workflowExecuteAfter" which we require.
-					const hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
+					const lifecycleHooks = getLifecycleHooksForScalingWorker(
 						data.executionMode,
 						executionId,
 						data.workflowData,
-						{ retryOf: data.retryOf ? data.retryOf.toString() : undefined },
+						{ retryOf: data.retryOf ?? undefined },
+					);
+
+					await this.processError(
+						error,
+						new Date(),
+						data.executionMode,
+						executionId,
+						lifecycleHooks,
 					);
-					await this.processError(error, new Date(), data.executionMode, executionId, hooks);
 
 					reject(error);
 				}
@@ -449,7 +448,7 @@ export class WorkflowRunner {
 
 				// Normally also static data should be supplied here but as it only used for sending
 				// data to editor-UI is not needed.
-				await hooks.executeHookFunctions('workflowExecuteAfter', [runData]);
+				await lifecycleHooks.runHook('workflowExecuteAfter', [runData]);
 
 				resolve(runData);
 			},
diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
index 3d0bec39de..00a81700e0 100644
--- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
+++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
@@ -1,11 +1,15 @@
 import { mock } from 'jest-mock-extended';
-import type { INode } from 'n8n-workflow';
+import type { INode, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 
+import type { User } from '@/databases/entities/user';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import type { IWorkflowDb } from '@/interfaces';
+import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import type { WorkflowRunner } from '@/workflow-runner';
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 
+import type { WorkflowRequest } from '../workflow.request';
+
 const webhookNode: INode = {
 	name: 'Webhook',
 	type: 'n8n-nodes-base.webhook',
@@ -63,6 +67,9 @@ describe('WorkflowExecutionService', () => {
 		mock(),
 	);
 
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({});
+	jest.spyOn(WorkflowExecuteAdditionalData, 'getBase').mockResolvedValue(additionalData);
+
 	describe('runWorkflow()', () => {
 		test('should call `WorkflowRunner.run()`', async () => {
 			const node = mock<INode>();
@@ -76,6 +83,222 @@ describe('WorkflowExecutionService', () => {
 		});
 	});
 
+	describe('executeManually()', () => {
+		test('should call `WorkflowRunner.run()` with correct parameters with default partial execution logic', async () => {
+			const executionId = 'fake-execution-id';
+			const userId = 'user-id';
+			const user = mock<User>({ id: userId });
+			const runPayload = mock<WorkflowRequest.ManualRunPayload>({ startNodes: [] });
+
+			workflowRunner.run.mockResolvedValue(executionId);
+
+			const result = await workflowExecutionService.executeManually(runPayload, user);
+
+			expect(workflowRunner.run).toHaveBeenCalledWith({
+				destinationNode: runPayload.destinationNode,
+				executionMode: 'manual',
+				runData: runPayload.runData,
+				pinData: undefined,
+				pushRef: undefined,
+				workflowData: runPayload.workflowData,
+				userId,
+				partialExecutionVersion: 1,
+				startNodes: runPayload.startNodes,
+				dirtyNodeNames: runPayload.dirtyNodeNames,
+				triggerToStartFrom: runPayload.triggerToStartFrom,
+			});
+			expect(result).toEqual({ executionId });
+		});
+
+		[
+			{
+				name: 'trigger',
+				type: 'n8n-nodes-base.airtableTrigger',
+				// Avoid mock constructor evaluated as true
+				disabled: undefined,
+			},
+			{
+				name: 'webhook',
+				type: 'n8n-nodes-base.webhook',
+				disabled: undefined,
+			},
+		].forEach((triggerNode: Partial<INode>) => {
+			test(`should call WorkflowRunner.run() with pinned trigger with type ${triggerNode.name}`, async () => {
+				const additionalData = mock<IWorkflowExecuteAdditionalData>({});
+				jest.spyOn(WorkflowExecuteAdditionalData, 'getBase').mockResolvedValue(additionalData);
+				const executionId = 'fake-execution-id';
+				const userId = 'user-id';
+				const user = mock<User>({ id: userId });
+				const runPayload = mock<WorkflowRequest.ManualRunPayload>({
+					startNodes: [],
+					workflowData: {
+						pinData: {
+							trigger: [{}],
+						},
+						nodes: [triggerNode],
+					},
+					triggerToStartFrom: undefined,
+				});
+
+				workflowRunner.run.mockResolvedValue(executionId);
+
+				const result = await workflowExecutionService.executeManually(runPayload, user);
+
+				expect(workflowRunner.run).toHaveBeenCalledWith({
+					destinationNode: runPayload.destinationNode,
+					executionMode: 'manual',
+					runData: runPayload.runData,
+					pinData: runPayload.workflowData.pinData,
+					pushRef: undefined,
+					workflowData: runPayload.workflowData,
+					userId,
+					partialExecutionVersion: 1,
+					startNodes: [
+						{
+							name: triggerNode.name,
+							sourceData: null,
+						},
+					],
+					dirtyNodeNames: runPayload.dirtyNodeNames,
+					triggerToStartFrom: runPayload.triggerToStartFrom,
+				});
+				expect(result).toEqual({ executionId });
+			});
+		});
+
+		test('should start from pinned trigger', async () => {
+			const executionId = 'fake-execution-id';
+			const userId = 'user-id';
+			const user = mock<User>({ id: userId });
+
+			const pinnedTrigger: INode = {
+				id: '1',
+				typeVersion: 1,
+				position: [1, 2],
+				parameters: {},
+				name: 'pinned',
+				type: 'n8n-nodes-base.airtableTrigger',
+			};
+
+			const unexecutedTrigger: INode = {
+				id: '1',
+				typeVersion: 1,
+				position: [1, 2],
+				parameters: {},
+				name: 'to-start-from',
+				type: 'n8n-nodes-base.airtableTrigger',
+			};
+
+			const runPayload: WorkflowRequest.ManualRunPayload = {
+				startNodes: [],
+				workflowData: {
+					id: 'abc',
+					name: 'test',
+					active: false,
+					pinData: {
+						[pinnedTrigger.name]: [{ json: {} }],
+					},
+					nodes: [unexecutedTrigger, pinnedTrigger],
+					connections: {},
+					createdAt: new Date(),
+					updatedAt: new Date(),
+				},
+				runData: {},
+			};
+
+			workflowRunner.run.mockResolvedValue(executionId);
+
+			const result = await workflowExecutionService.executeManually(runPayload, user);
+
+			expect(workflowRunner.run).toHaveBeenCalledWith({
+				destinationNode: runPayload.destinationNode,
+				executionMode: 'manual',
+				runData: runPayload.runData,
+				pinData: runPayload.workflowData.pinData,
+				pushRef: undefined,
+				workflowData: runPayload.workflowData,
+				userId,
+				partialExecutionVersion: 1,
+				startNodes: [
+					{
+						// Start from pinned trigger
+						name: pinnedTrigger.name,
+						sourceData: null,
+					},
+				],
+				dirtyNodeNames: runPayload.dirtyNodeNames,
+				// no trigger to start from
+				triggerToStartFrom: undefined,
+			});
+			expect(result).toEqual({ executionId });
+		});
+
+		test('should ignore pinned trigger and start from unexecuted trigger', async () => {
+			const executionId = 'fake-execution-id';
+			const userId = 'user-id';
+			const user = mock<User>({ id: userId });
+
+			const pinnedTrigger: INode = {
+				id: '1',
+				typeVersion: 1,
+				position: [1, 2],
+				parameters: {},
+				name: 'pinned',
+				type: 'n8n-nodes-base.airtableTrigger',
+			};
+
+			const unexecutedTrigger: INode = {
+				id: '1',
+				typeVersion: 1,
+				position: [1, 2],
+				parameters: {},
+				name: 'to-start-from',
+				type: 'n8n-nodes-base.airtableTrigger',
+			};
+
+			const runPayload: WorkflowRequest.ManualRunPayload = {
+				startNodes: [],
+				workflowData: {
+					id: 'abc',
+					name: 'test',
+					active: false,
+					pinData: {
+						[pinnedTrigger.name]: [{ json: {} }],
+					},
+					nodes: [unexecutedTrigger, pinnedTrigger],
+					connections: {},
+					createdAt: new Date(),
+					updatedAt: new Date(),
+				},
+				runData: {},
+				triggerToStartFrom: {
+					name: unexecutedTrigger.name,
+				},
+			};
+
+			workflowRunner.run.mockResolvedValue(executionId);
+
+			const result = await workflowExecutionService.executeManually(runPayload, user);
+
+			expect(workflowRunner.run).toHaveBeenCalledWith({
+				destinationNode: runPayload.destinationNode,
+				executionMode: 'manual',
+				runData: runPayload.runData,
+				pinData: runPayload.workflowData.pinData,
+				pushRef: undefined,
+				workflowData: runPayload.workflowData,
+				userId,
+				partialExecutionVersion: 1,
+				// ignore pinned trigger
+				startNodes: [],
+				dirtyNodeNames: runPayload.dirtyNodeNames,
+				// pass unexecuted trigger to start from
+				triggerToStartFrom: runPayload.triggerToStartFrom,
+			});
+			expect(result).toEqual({ executionId });
+		});
+	});
+
 	describe('selectPinnedActivatorStarter()', () => {
 		const workflow = mock<IWorkflowDb>({
 			nodes: [],
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index bccd5c1f13..23394493df 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -97,15 +97,21 @@ export class WorkflowExecutionService {
 		}: WorkflowRequest.ManualRunPayload,
 		user: User,
 		pushRef?: string,
-		partialExecutionVersion?: string,
+		partialExecutionVersion: 1 | 2 = 1,
 	) {
 		const pinData = workflowData.pinData;
-		const pinnedTrigger = this.selectPinnedActivatorStarter(
+		let pinnedTrigger = this.selectPinnedActivatorStarter(
 			workflowData,
 			startNodes?.map((nodeData) => nodeData.name),
 			pinData,
 		);
 
+		// if we have a trigger to start from and it's not the pinned trigger
+		// ignore the pinned trigger
+		if (pinnedTrigger && triggerToStartFrom && pinnedTrigger.name !== triggerToStartFrom.name) {
+			pinnedTrigger = null;
+		}
+
 		// If webhooks nodes exist and are active we have to wait for till we receive a call
 		if (
 			pinnedTrigger === null &&
@@ -142,7 +148,7 @@ export class WorkflowExecutionService {
 			startNodes,
 			workflowData,
 			userId: user.id,
-			partialExecutionVersion: partialExecutionVersion ?? '0',
+			partialExecutionVersion,
 			dirtyNodeNames,
 			triggerToStartFrom,
 		};
diff --git a/packages/cli/src/workflows/workflow-sharing.service.ts b/packages/cli/src/workflows/workflow-sharing.service.ts
index 220c9adaf9..d10ad45083 100644
--- a/packages/cli/src/workflows/workflow-sharing.service.ts
+++ b/packages/cli/src/workflows/workflow-sharing.service.ts
@@ -1,9 +1,9 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow';
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
diff --git a/packages/cli/src/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts
index 47fd2cdb93..3e44d5b950 100644
--- a/packages/cli/src/workflows/workflow.request.ts
+++ b/packages/cli/src/workflows/workflow.request.ts
@@ -55,12 +55,7 @@ export declare namespace WorkflowRequest {
 
 	type NewName = AuthenticatedRequest<{}, {}, {}, { name?: string }>;
 
-	type ManualRun = AuthenticatedRequest<
-		{ workflowId: string },
-		{},
-		ManualRunPayload,
-		{ partialExecutionVersion?: string }
-	>;
+	type ManualRun = AuthenticatedRequest<{ workflowId: string }, {}, ManualRunPayload, {}>;
 
 	type Share = AuthenticatedRequest<{ workflowId: string }, {}, { shareWithIds: string[] }>;
 
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index 2141e79ed5..fdb53c1832 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -1,3 +1,4 @@
+import { GlobalConfig } from '@n8n/config';
 import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -54,6 +55,7 @@ export class WorkflowService {
 		private readonly projectService: ProjectService,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly eventService: EventService,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	async getMany(user: User, options?: ListQuery.Options, includeScopes?: boolean) {
@@ -202,7 +204,9 @@ export class WorkflowService {
 			]),
 		);
 
-		if (tagIds && !config.getEnv('workflowTagsDisabled')) {
+		const tagsDisabled = this.globalConfig.tags.disabled;
+
+		if (tagIds && !tagsDisabled) {
 			await this.workflowTagMappingRepository.overwriteTaggings(workflowId, tagIds);
 		}
 
@@ -210,7 +214,7 @@ export class WorkflowService {
 			await this.workflowHistoryService.saveVersion(user, workflowUpdateData, workflowId);
 		}
 
-		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
+		const relations = tagsDisabled ? [] : ['tags'];
 
 		// We sadly get nothing back from "update". Neither if it updated a record
 		// nor the new value. So query now the hopefully updated entry.
@@ -268,6 +272,13 @@ export class WorkflowService {
 		return updatedWorkflow;
 	}
 
+	/**
+	 * Deletes a workflow and returns it.
+	 *
+	 * If the workflow is active this will deactivate the workflow.
+	 * If the user does not have the permissions to delete the workflow this does
+	 * nothing and returns void.
+	 */
 	async delete(user: User, workflowId: string): Promise<WorkflowEntity | undefined> {
 		await this.externalHooks.run('workflow.delete', [workflowId]);
 
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 865b38450e..76904e5201 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -1,4 +1,4 @@
-import { ImportWorkflowFromUrlDto } from '@n8n/api-types';
+import { ImportWorkflowFromUrlDto, ManualRunQueryDto } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, type FindOptionsRelations } from '@n8n/typeorm';
@@ -9,7 +9,6 @@ import { ApplicationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import { z } from 'zod';
 
-import config from '@/config';
 import type { Project } from '@/databases/entities/project';
 import { SharedWorkflow } from '@/databases/entities/shared-workflow';
 import { WorkflowEntity } from '@/databases/entities/workflow-entity';
@@ -89,7 +88,7 @@ export class WorkflowsController {
 
 		const { tags: tagIds } = req.body;
 
-		if (tagIds?.length && !config.getEnv('workflowTagsDisabled')) {
+		if (tagIds?.length && !this.globalConfig.tags.disabled) {
 			newWorkflow.tags = await this.tagRepository.findMany(tagIds);
 		}
 
@@ -164,7 +163,7 @@ export class WorkflowsController {
 
 		await this.workflowHistoryService.saveVersion(req.user, savedWorkflow, savedWorkflow.id);
 
-		if (tagIds && !config.getEnv('workflowTagsDisabled') && savedWorkflow.tags) {
+		if (tagIds && !this.globalConfig.tags.disabled && savedWorkflow.tags) {
 			savedWorkflow.tags = this.tagService.sortByRequestOrder(savedWorkflow.tags, {
 				requestOrder: tagIds,
 			});
@@ -260,7 +259,7 @@ export class WorkflowsController {
 				},
 			};
 
-			if (!config.getEnv('workflowTagsDisabled')) {
+			if (!this.globalConfig.tags.disabled) {
 				relations.tags = true;
 			}
 
@@ -268,7 +267,7 @@ export class WorkflowsController {
 				workflowId,
 				req.user,
 				['workflow:read'],
-				{ includeTags: !config.getEnv('workflowTagsDisabled') },
+				{ includeTags: !this.globalConfig.tags.disabled },
 			);
 
 			if (!workflow) {
@@ -296,7 +295,7 @@ export class WorkflowsController {
 			workflowId,
 			req.user,
 			['workflow:read'],
-			{ includeTags: !config.getEnv('workflowTagsDisabled') },
+			{ includeTags: !this.globalConfig.tags.disabled },
 		);
 
 		if (!workflow) {
@@ -367,7 +366,11 @@ export class WorkflowsController {
 
 	@Post('/:workflowId/run')
 	@ProjectScope('workflow:execute')
-	async runManually(req: WorkflowRequest.ManualRun) {
+	async runManually(
+		req: WorkflowRequest.ManualRun,
+		_res: unknown,
+		@Query query: ManualRunQueryDto,
+	) {
 		if (!req.body.workflowData.id) {
 			throw new ApplicationError('You cannot execute a workflow without an ID', {
 				level: 'warning',
@@ -395,9 +398,7 @@ export class WorkflowsController {
 			req.body,
 			req.user,
 			req.headers['push-ref'],
-			req.query.partialExecutionVersion === '-1'
-				? config.getEnv('featureFlags.partialExecutionVersionDefault')
-				: req.query.partialExecutionVersion,
+			query.partialExecutionVersion,
 		);
 	}
 
diff --git a/packages/cli/templates/form-trigger-completion.handlebars b/packages/cli/templates/form-trigger-completion.handlebars
index a15855d371..880a7f91d1 100644
--- a/packages/cli/templates/form-trigger-completion.handlebars
+++ b/packages/cli/templates/form-trigger-completion.handlebars
@@ -26,49 +26,53 @@
 	</head>
 
 	<body>
-		<div class='container'>
-			<section>
-				<div class='card'>
-					<div class='header'>
-						<h1>{{title}}</h1>
-						<p>{{message}}</p>
+		{{#if responseText}}
+			{{{responseText}}}
+		{{else}}
+			<div class='container'>
+				<section>
+					<div class='card'>
+						<div class='header'>
+							<h1>{{title}}</h1>
+							<p>{{message}}</p>
+						</div>
 					</div>
-				</div>
-				{{#if appendAttribution}}
-					<div class='n8n-link'>
-						<a href={{n8nWebsiteLink}} target='_blank'>
-							Form automated with
-							<svg
-								width='73'
-								height='20'
-								viewBox='0 0 73 20'
-								fill='none'
-								xmlns='http://www.w3.org/2000/svg'
-							>
-								<path
-									fill-rule='evenodd'
-									clip-rule='evenodd'
-									d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
-									fill='#EA4B71'
-								/>
-								<path
-									d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
-									fill='#101330'
-								/>
-								<path
-									d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
-									fill='#101330'
-								/>
-								<path
-									d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
-									fill='#101330'
-								/>
-							</svg>
-						</a>
-					</div>
-				{{/if}}
-			</section>
-		</div>
+					{{#if appendAttribution}}
+						<div class='n8n-link'>
+							<a href={{n8nWebsiteLink}} target='_blank'>
+								Form automated with
+								<svg
+									width='73'
+									height='20'
+									viewBox='0 0 73 20'
+									fill='none'
+									xmlns='http://www.w3.org/2000/svg'
+								>
+									<path
+										fill-rule='evenodd'
+										clip-rule='evenodd'
+										d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+										fill='#EA4B71'
+									/>
+									<path
+										d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+										fill='#101330'
+									/>
+									<path
+										d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+										fill='#101330'
+									/>
+									<path
+										d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+										fill='#101330'
+									/>
+								</svg>
+							</a>
+						</div>
+					{{/if}}
+				</section>
+			</div>
+		{{/if}}
 		<script>
 			fetch('', { method: 'POST', body: {}, }).catch(() => {});
 		</script>
diff --git a/packages/cli/templates/form-trigger.handlebars b/packages/cli/templates/form-trigger.handlebars
index ee868b072f..18324e6dc7 100644
--- a/packages/cli/templates/form-trigger.handlebars
+++ b/packages/cli/templates/form-trigger.handlebars
@@ -2,12 +2,13 @@
 	<head>
 		<meta charset='UTF-8' />
 		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+		<meta name="description" content="{{formDescriptionMetadata}}" />
+		<meta property="og:title" content="{{formTitle}}" />
+		<meta property="og:description" content="{{formDescriptionMetadata}}" />
+		<meta property="og:type" content="website" />
+		<meta property="og:image" content="/static/og_image.png" />
 		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
-		<link
-			href='https://fonts.googleapis.com/css?family=Open+Sans'
-			rel='stylesheet'
-			type='text/css'
-		/>
+		<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
 		<title>{{formTitle}}</title>
 		<style>
 			*,
@@ -20,7 +21,7 @@
 
 			body {
 				font-family:
-					Open Sans,
+					"Open Sans",
 					sans-serif;
 				font-weight: 400;
 				font-size: 12px;
@@ -283,6 +284,60 @@
 					display: inline-block;
 			}
 
+			div.html {
+					text-align: left;
+					color: #555;
+					font-size: 14px;
+			}
+			div.html h1, div.html h2, div.html h3, div.html h4, div.html h5, div.html h6, div.html p, div.html ul, div.html ol, div.html a {
+					font-weight: 400;
+					font-style: normal;
+					margin-bottom: 8px;
+			}
+			div.html li {
+					margin-bottom: 8px;
+					margin-left: 24px;
+			}
+			div.html ul, div.html ol {
+					font-size: 14px;
+					display: flex;
+					flex-direction: column;
+					align-self: stretch;
+					line-height: normal;
+			}
+			div.html b {
+					font-weight: 600;
+			}
+			div.html h1 {
+					font-size: 28px;
+					line-height: 35px;
+			}
+			div.html h2 {
+					font-size: 20px;
+					line-height: 26px;
+			}
+			div.html h3 {
+					font-size: 16px;
+					line-height: 24px;
+			}
+			div.html h4 {
+					font-size: 14px;
+					line-height: 18px;
+			}
+			div.html h5 {
+					font-size: 12px;
+			}
+			div.html h6 {
+					font-size: 10px;
+			}
+			div.html p {
+					margin-bottom: 8px;
+			}
+			div.html a {
+					color:  #FF6D5A;
+					font-size: 14px;
+			}
+
 			@media only screen and (max-width: 500px) {
 				body {
 					background-color: white;
@@ -327,7 +382,7 @@
 					<form class='card' action='#' method='POST' name='n8n-form' id='n8n-form' novalidate>
 						<div class='form-header'>
 							<h1>{{formTitle}}</h1>
-							<p style="white-space: pre-line">{{formDescription}} </p>
+							<p style="white-space: pre-line">{{{formDescription}}} </p>
 						</div>
 
 						<div class='inputs-wrapper'>
@@ -366,6 +421,17 @@
 									</div>
 								{{/if}}
 
+								{{#if isHtml}}
+									<div class="form-group html">
+										{{{html}}}
+										<input type="hidden" id="{{id}}" name="{{id}}" value="{{html}}" />
+									</div>
+								{{/if}}
+
+								{{#if isHidden}}
+									<input type="hidden" id="{{id}}" name="{{id}}" value="{{hiddenValue}}" />
+								{{/if}}
+
 								{{#if isTextarea}}
 									<div class='form-group'>
 										<label class='form-label {{inputRequired}}' for='{{id}}'>{{label}}</label>
diff --git a/packages/cli/templates/oauth-callback.handlebars b/packages/cli/templates/oauth-callback.handlebars
index c0d8a0cfab..311e4656fa 100644
--- a/packages/cli/templates/oauth-callback.handlebars
+++ b/packages/cli/templates/oauth-callback.handlebars
@@ -1,10 +1,99 @@
 <html>
-	<script>
-		(function messageParent() {
-			const broadcastChannel = new BroadcastChannel('oauth-callback');
-			broadcastChannel.postMessage('success');
-		})();
-	</script>
+	<head>
+		<link rel="preconnect" href="https://fonts.googleapis.com">
+		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+		<link href="https://fonts.googleapis.com/css2?family=Open+Sans:ital,wght@0,300..800;1,300..800&display=swap" rel="stylesheet">
+		<style>
+			html {
+				font-size: 16px;
+			}
+			body {
+				font-family: "Open Sans", sans-serif;
+				padding: 1rem;
+				margin: 0;
+				display: flex;
+				flex-direction: column;
+				height: 100vh;
+				box-sizing: border-box;
+			}
 
-	Got connected. The window can be closed now.
+			.center-container {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex: 1;
+			}
+
+			.row {
+				display: flex;
+				flex-direction: row;
+				gap: 20px;
+				justify-content: center;
+				text-align: center;
+			}
+
+			.icon {
+				width: 1.4rem;
+				fill: #2AA568;
+			}
+
+			img.logo {
+				width: 8rem;
+			}
+
+			div.logo {
+				display: flex;
+				justify-content: center;
+			}
+
+			h1 {
+				font-size: 1.75rem;
+				font-weight: 400;
+				color: #525456;
+				margin-block-end: 0;
+			}
+
+			p {
+				font-size: 0.875rem;
+				font-weight: 400;
+				color: #909298;
+			}
+		</style>
+	</head>
+	<body>
+		<div class="logo">
+			<img src="/static/n8n-logo.png" class="logo" />
+		</div>
+		<div class="center-container">
+			<div>
+				<div class="row">
+					<svg
+							xmlns="http://www.w3.org/2000/svg"
+							viewBox="0 0 512 512"
+							class="icon"
+					>
+							<!--!Font Awesome Free 6.7.2 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license/free Copyright 2025 Fonticons, Inc.-->
+							<path
+									d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM369 209L241 337c-9.4 9.4-24.6 9.4-33.9 0l-64-64c-9.4-9.4-9.4-24.6 0-33.9s24.6-9.4 33.9 0l47 47L335 175c9.4-9.4 24.6-9.4 33.9 0s9.4 24.6 0 33.9z"
+							/>
+					</svg>
+				</div>
+				<div class="row">
+					<h1>Connection successful</h1>
+				</div>
+				<div class="row">
+					<p>This window will close automatically in 5 seconds.</p>
+				</div>
+			</div>
+		</div>
+		<script type="text/javascript">
+			(function messageParent() {
+				const broadcastChannel = new BroadcastChannel('oauth-callback');
+				broadcastChannel.postMessage('success');
+			})();
+			(function autoclose(){
+				setTimeout(function() { window.close(); }, 5000);
+			})();
+		</script>
+	</body>
 </html>
diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
index 3c98c2a4f1..8c502bba94 100644
--- a/packages/cli/test/integration/active-workflow-manager.test.ts
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -76,10 +76,7 @@ describe('init()', () => {
 	it('should call external hook', async () => {
 		await activeWorkflowManager.init();
 
-		const [hook, arg] = externalHooks.run.mock.calls[0];
-
-		expect(hook).toBe('activeWorkflows.initialized');
-		expect(arg).toBeEmptyArray();
+		expect(externalHooks.run).toHaveBeenCalledWith('activeWorkflows.initialized');
 	});
 
 	it('should check that workflow can be activated', async () => {
diff --git a/packages/cli/test/integration/api-keys.api.test.ts b/packages/cli/test/integration/api-keys.api.test.ts
index 14050b543a..0f0dbf4e9e 100644
--- a/packages/cli/test/integration/api-keys.api.test.ts
+++ b/packages/cli/test/integration/api-keys.api.test.ts
@@ -1,9 +1,10 @@
+import type { ApiKeyWithRawValue } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 
-import type { ApiKey } from '@/databases/entities/api-key';
 import type { User } from '@/databases/entities/user';
 import { ApiKeyRepository } from '@/databases/repositories/api-key.repository';
+import { License } from '@/license';
 import { PublicApiKeyService } from '@/services/public-api-key.service';
 import { mockInstance } from '@test/mocking';
 
@@ -13,6 +14,10 @@ import * as testDb from './shared/test-db';
 import type { SuperAgentTest } from './shared/types';
 import * as utils from './shared/utils/';
 
+const license = mockInstance(License);
+
+license.getApiKeysPerUserLimit.mockImplementation(() => 2);
+
 const testServer = utils.setupTestServer({ endpointGroups: ['apiKeys'] });
 let publicApiKeyService: PublicApiKeyService;
 
@@ -56,10 +61,13 @@ describe('Owner shell', () => {
 		ownerShell = await createUserShell('global:owner');
 	});
 
-	test('POST /api-keys should create an api key', async () => {
-		const newApiKeyResponse = await testServer.authAgentFor(ownerShell).post('/api-keys');
+	test('POST /api-keys should create an api key with no expiration', async () => {
+		const newApiKeyResponse = await testServer
+			.authAgentFor(ownerShell)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt: null });
 
-		const newApiKey = newApiKeyResponse.body.data as ApiKey;
+		const newApiKey = newApiKeyResponse.body.data as ApiKeyWithRawValue;
 
 		expect(newApiKeyResponse.statusCode).toBe(200);
 		expect(newApiKey).toBeDefined();
@@ -72,31 +80,99 @@ describe('Owner shell', () => {
 			id: expect.any(String),
 			label: 'My API Key',
 			userId: ownerShell.id,
-			apiKey: newApiKey.apiKey,
+			apiKey: newApiKey.rawApiKey,
 			createdAt: expect.any(Date),
 			updatedAt: expect.any(Date),
 		});
+
+		expect(newApiKey.expiresAt).toBeNull();
+		expect(newApiKey.rawApiKey).toBeDefined();
+	});
+
+	test('POST /api-keys should create an api key with expiration', async () => {
+		const expiresAt = Date.now() + 1000;
+
+		const newApiKeyResponse = await testServer
+			.authAgentFor(ownerShell)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt });
+
+		const newApiKey = newApiKeyResponse.body.data as ApiKeyWithRawValue;
+
+		expect(newApiKeyResponse.statusCode).toBe(200);
+		expect(newApiKey).toBeDefined();
+
+		const newStoredApiKey = await Container.get(ApiKeyRepository).findOneByOrFail({
+			userId: ownerShell.id,
+		});
+
+		expect(newStoredApiKey).toEqual({
+			id: expect.any(String),
+			label: 'My API Key',
+			userId: ownerShell.id,
+			apiKey: newApiKey.rawApiKey,
+			createdAt: expect.any(Date),
+			updatedAt: expect.any(Date),
+		});
+
+		expect(newApiKey.expiresAt).toBe(expiresAt);
+		expect(newApiKey.rawApiKey).toBeDefined();
+	});
+
+	test('POST /api-keys should fail if max number of API keys reached', async () => {
+		await testServer.authAgentFor(ownerShell).post('/api-keys').send({ label: 'My API Key' });
+
+		const secondApiKey = await testServer
+			.authAgentFor(ownerShell)
+			.post('/api-keys')
+			.send({ label: 'My API Key' });
+
+		expect(secondApiKey.statusCode).toBe(400);
 	});
 
 	test('GET /api-keys should fetch the api key redacted', async () => {
-		const newApiKeyResponse = await testServer.authAgentFor(ownerShell).post('/api-keys');
+		const expirationDateInTheFuture = Date.now() + 1000;
+
+		const apiKeyWithNoExpiration = await testServer
+			.authAgentFor(ownerShell)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt: null });
+
+		const apiKeyWithExpiration = await testServer
+			.authAgentFor(ownerShell)
+			.post('/api-keys')
+			.send({ label: 'My API Key 2', expiresAt: expirationDateInTheFuture });
 
 		const retrieveAllApiKeysResponse = await testServer.authAgentFor(ownerShell).get('/api-keys');
 
 		expect(retrieveAllApiKeysResponse.statusCode).toBe(200);
 
-		expect(retrieveAllApiKeysResponse.body.data[0]).toEqual({
-			id: newApiKeyResponse.body.data.id,
-			label: 'My API Key',
+		expect(retrieveAllApiKeysResponse.body.data[1]).toEqual({
+			id: apiKeyWithExpiration.body.data.id,
+			label: 'My API Key 2',
 			userId: ownerShell.id,
-			apiKey: publicApiKeyService.redactApiKey(newApiKeyResponse.body.data.apiKey),
+			apiKey: publicApiKeyService.redactApiKey(apiKeyWithExpiration.body.data.rawApiKey),
 			createdAt: expect.any(String),
 			updatedAt: expect.any(String),
+			expiresAt: expirationDateInTheFuture,
+		});
+
+		expect(retrieveAllApiKeysResponse.body.data[0]).toEqual({
+			id: apiKeyWithNoExpiration.body.data.id,
+			label: 'My API Key',
+			userId: ownerShell.id,
+			apiKey: publicApiKeyService.redactApiKey(apiKeyWithNoExpiration.body.data.rawApiKey),
+			createdAt: expect.any(String),
+			updatedAt: expect.any(String),
+			expiresAt: null,
 		});
 	});
 
 	test('DELETE /api-keys/:id should delete the api key', async () => {
-		const newApiKeyResponse = await testServer.authAgentFor(ownerShell).post('/api-keys');
+		const newApiKeyResponse = await testServer
+			.authAgentFor(ownerShell)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt: null });
 
 		const deleteApiKeyResponse = await testServer
 			.authAgentFor(ownerShell)
@@ -121,8 +197,11 @@ describe('Member', () => {
 		await utils.setInstanceOwnerSetUp(true);
 	});
 
-	test('POST /api-keys should create an api key', async () => {
-		const newApiKeyResponse = await testServer.authAgentFor(member).post('/api-keys');
+	test('POST /api-keys should create an api key with no expiration', async () => {
+		const newApiKeyResponse = await testServer
+			.authAgentFor(member)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt: null });
 
 		expect(newApiKeyResponse.statusCode).toBe(200);
 		expect(newApiKeyResponse.body.data.apiKey).toBeDefined();
@@ -136,35 +215,99 @@ describe('Member', () => {
 			id: expect.any(String),
 			label: 'My API Key',
 			userId: member.id,
-			apiKey: newApiKeyResponse.body.data.apiKey,
+			apiKey: newApiKeyResponse.body.data.rawApiKey,
 			createdAt: expect.any(Date),
 			updatedAt: expect.any(Date),
 		});
+
+		expect(newApiKeyResponse.body.data.expiresAt).toBeNull();
+		expect(newApiKeyResponse.body.data.rawApiKey).toBeDefined();
+	});
+
+	test('POST /api-keys should create an api key with expiration', async () => {
+		const expiresAt = Date.now() + 1000;
+
+		const newApiKeyResponse = await testServer
+			.authAgentFor(member)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt });
+
+		const newApiKey = newApiKeyResponse.body.data as ApiKeyWithRawValue;
+
+		expect(newApiKeyResponse.statusCode).toBe(200);
+		expect(newApiKey).toBeDefined();
+
+		const newStoredApiKey = await Container.get(ApiKeyRepository).findOneByOrFail({
+			userId: member.id,
+		});
+
+		expect(newStoredApiKey).toEqual({
+			id: expect.any(String),
+			label: 'My API Key',
+			userId: member.id,
+			apiKey: newApiKey.rawApiKey,
+			createdAt: expect.any(Date),
+			updatedAt: expect.any(Date),
+		});
+
+		expect(newApiKey.expiresAt).toBe(expiresAt);
+		expect(newApiKey.rawApiKey).toBeDefined();
+	});
+
+	test('POST /api-keys should fail if max number of API keys reached', async () => {
+		await testServer.authAgentFor(member).post('/api-keys').send({ label: 'My API Key' });
+
+		const secondApiKey = await testServer
+			.authAgentFor(member)
+			.post('/api-keys')
+			.send({ label: 'My API Key' });
+
+		expect(secondApiKey.statusCode).toBe(400);
 	});
 
 	test('GET /api-keys should fetch the api key redacted', async () => {
-		const newApiKeyResponse = await testServer.authAgentFor(member).post('/api-keys');
+		const expirationDateInTheFuture = Date.now() + 1000;
+
+		const apiKeyWithNoExpiration = await testServer
+			.authAgentFor(member)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt: null });
+
+		const apiKeyWithExpiration = await testServer
+			.authAgentFor(member)
+			.post('/api-keys')
+			.send({ label: 'My API Key 2', expiresAt: expirationDateInTheFuture });
 
 		const retrieveAllApiKeysResponse = await testServer.authAgentFor(member).get('/api-keys');
 
 		expect(retrieveAllApiKeysResponse.statusCode).toBe(200);
 
-		expect(retrieveAllApiKeysResponse.body.data[0]).toEqual({
-			id: newApiKeyResponse.body.data.id,
-			label: 'My API Key',
+		expect(retrieveAllApiKeysResponse.body.data[1]).toEqual({
+			id: apiKeyWithExpiration.body.data.id,
+			label: 'My API Key 2',
 			userId: member.id,
-			apiKey: publicApiKeyService.redactApiKey(newApiKeyResponse.body.data.apiKey),
+			apiKey: publicApiKeyService.redactApiKey(apiKeyWithExpiration.body.data.rawApiKey),
 			createdAt: expect.any(String),
 			updatedAt: expect.any(String),
+			expiresAt: expirationDateInTheFuture,
 		});
 
-		expect(newApiKeyResponse.body.data.apiKey).not.toEqual(
-			retrieveAllApiKeysResponse.body.data[0].apiKey,
-		);
+		expect(retrieveAllApiKeysResponse.body.data[0]).toEqual({
+			id: apiKeyWithNoExpiration.body.data.id,
+			label: 'My API Key',
+			userId: member.id,
+			apiKey: publicApiKeyService.redactApiKey(apiKeyWithNoExpiration.body.data.rawApiKey),
+			createdAt: expect.any(String),
+			updatedAt: expect.any(String),
+			expiresAt: null,
+		});
 	});
 
 	test('DELETE /api-keys/:id should delete the api key', async () => {
-		const newApiKeyResponse = await testServer.authAgentFor(member).post('/api-keys');
+		const newApiKeyResponse = await testServer
+			.authAgentFor(member)
+			.post('/api-keys')
+			.send({ label: 'My API Key', expiresAt: null });
 
 		const deleteApiKeyResponse = await testServer
 			.authAgentFor(member)
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 8b9cebe854..36d6322ec7 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -17,8 +17,8 @@ import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { ScalingService } from '@/scaling/scaling.service';
 import { OrchestrationService } from '@/services/orchestration.service';
+import { TaskBrokerServer } from '@/task-runners/task-broker/task-broker-server';
 import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
-import { TaskRunnerServer } from '@/task-runners/task-runner-server';
 import { Telemetry } from '@/telemetry';
 import { setupTestCommand } from '@test-integration/utils/test-command';
 
@@ -36,7 +36,7 @@ const messageEventBus = mockInstance(MessageEventBus);
 const logStreamingEventRelay = mockInstance(LogStreamingEventRelay);
 const scalingService = mockInstance(ScalingService);
 const orchestrationService = mockInstance(OrchestrationService);
-const taskRunnerServer = mockInstance(TaskRunnerServer);
+const taskBrokerServer = mockInstance(TaskBrokerServer);
 const taskRunnerProcess = mockInstance(TaskRunnerProcess);
 mockInstance(Publisher);
 mockInstance(Subscriber);
@@ -60,7 +60,7 @@ test('worker initializes all its components', async () => {
 	expect(logStreamingEventRelay.init).toHaveBeenCalledTimes(1);
 	expect(orchestrationService.init).toHaveBeenCalledTimes(1);
 	expect(messageEventBus.send).toHaveBeenCalledTimes(1);
-	expect(taskRunnerServer.start).toHaveBeenCalledTimes(1);
+	expect(taskBrokerServer.start).toHaveBeenCalledTimes(1);
 	expect(taskRunnerProcess.start).toHaveBeenCalledTimes(1);
 
 	expect(config.getEnv('executions.mode')).toBe('queue');
diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
index 090de90603..98cecb6664 100644
--- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
@@ -1,10 +1,10 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import { In } from '@n8n/typeorm';
 
 import config from '@/config';
 import { CredentialsService } from '@/credentials/credentials.service';
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
@@ -226,12 +226,12 @@ describe('GET /credentials', () => {
 		//
 		// ARRANGE
 		//
-		const project1 = await projectService.createTeamProject('Team Project', member);
+		const project1 = await projectService.createTeamProject(member, { name: 'Team Project' });
 		await projectService.addUser(project1.id, anotherMember.id, 'project:editor');
 		// anotherMember should see this one
 		const credential1 = await saveCredential(randomCredentialPayload(), { project: project1 });
 
-		const project2 = await projectService.createTeamProject('Team Project', member);
+		const project2 = await projectService.createTeamProject(member, { name: 'Team Project' });
 		// anotherMember should NOT see this one
 		await saveCredential(randomCredentialPayload(), { project: project2 });
 
diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts
index 7bb0a8918a..ece8340e83 100644
--- a/packages/cli/test/integration/credentials/credentials.api.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.test.ts
@@ -4,6 +4,7 @@ import type { Scope } from '@sentry/node';
 import { Credentials } from 'n8n-core';
 import { randomString } from 'n8n-workflow';
 
+import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialsService } from '@/credentials/credentials.service';
 import type { Project } from '@/databases/entities/project';
 import type { User } from '@/databases/entities/user';
@@ -632,25 +633,25 @@ describe('GET /credentials', () => {
 			expect(response.body.data.map((credential) => credential.id)).toContain(memberCredential.id);
 		});
 
-		test('should return all credentials to instance owners when working on their own personal project', async () => {
+		test('should not ignore the project filter when the request is done by an owner and also includes the scopes', async () => {
 			const ownerCredential = await saveCredential(payload(), {
 				user: owner,
 				role: 'credential:owner',
 			});
-			const memberCredential = await saveCredential(payload(), {
-				user: member,
-				role: 'credential:owner',
-			});
+			// should not show up
+			await saveCredential(payload(), { user: member, role: 'credential:owner' });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
 				.get('/credentials')
-				.query(`filter={ "projectId": "${ownerPersonalProject.id}" }&includeScopes=true`)
+				.query({
+					filter: JSON.stringify({ projectId: ownerPersonalProject.id }),
+					includeScopes: true,
+				})
 				.expect(200);
 
-			expect(response.body.data).toHaveLength(2);
-			expect(response.body.data.map((credential) => credential.id)).toContain(ownerCredential.id);
-			expect(response.body.data.map((credential) => credential.id)).toContain(memberCredential.id);
+			expect(response.body.data).toHaveLength(1);
+			expect(response.body.data[0].id).toBe(ownerCredential.id);
 		});
 	});
 
@@ -1164,6 +1165,73 @@ describe('PATCH /credentials/:id', () => {
 		expect(shellCredential.name).toBe(patchPayload.name); // updated
 	});
 
+	test('should not store redacted value in the db for oauthTokenData', async () => {
+		// ARRANGE
+		const credentialService = Container.get(CredentialsService);
+		const redactSpy = jest.spyOn(credentialService, 'redact').mockReturnValueOnce({
+			accessToken: CREDENTIAL_BLANKING_VALUE,
+			oauthTokenData: CREDENTIAL_BLANKING_VALUE,
+		});
+
+		const payload = randomCredentialPayload();
+		payload.data.oauthTokenData = { tokenData: true };
+		const savedCredential = await saveCredential(payload, {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		// ACT
+		const patchPayload = { ...payload, data: { foo: 'bar' } };
+		await authOwnerAgent.patch(`/credentials/${savedCredential.id}`).send(patchPayload).expect(200);
+
+		// ASSERT
+		const response = await authOwnerAgent
+			.get(`/credentials/${savedCredential.id}`)
+			.query({ includeData: true })
+			.expect(200);
+
+		const { id, data } = response.body.data;
+
+		expect(id).toBe(savedCredential.id);
+		expect(data).toEqual({
+			...patchPayload.data,
+			// should be the original
+			oauthTokenData: payload.data.oauthTokenData,
+		});
+		expect(redactSpy).not.toHaveBeenCalled();
+	});
+
+	test('should not allow to overwrite oauthTokenData', async () => {
+		// ARRANGE
+		const payload = randomCredentialPayload();
+		payload.data.oauthTokenData = { tokenData: true };
+		const savedCredential = await saveCredential(payload, {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		// ACT
+		const patchPayload = {
+			...payload,
+			data: { accessToken: 'new', oauthTokenData: { tokenData: false } },
+		};
+		await authOwnerAgent.patch(`/credentials/${savedCredential.id}`).send(patchPayload).expect(200);
+
+		// ASSERT
+		const response = await authOwnerAgent
+			.get(`/credentials/${savedCredential.id}`)
+			.query({ includeData: true })
+			.expect(200);
+
+		const { id, data } = response.body.data;
+
+		expect(id).toBe(savedCredential.id);
+		// was overwritten
+		expect(data.accessToken).toBe(patchPayload.data.accessToken);
+		// was not overwritten
+		expect(data.oauthTokenData).toEqual(payload.data.oauthTokenData);
+	});
+
 	test('should fail with invalid inputs', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), {
 			user: owner,
diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
index 63b87df7e8..c92dcdde0a 100644
--- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
@@ -73,7 +73,7 @@ describe('WorkflowRepository', () => {
 	});
 
 	describe('getActiveIds', () => {
-		it('should return active workflow IDs', async () => {
+		it('should return all active workflow IDs when invoked without maxResults', async () => {
 			//
 			// ARRANGE
 			//
@@ -92,6 +92,28 @@ describe('WorkflowRepository', () => {
 			// ASSERT
 			//
 			expect(activeIds).toEqual([workflows[0].id]);
+			expect(activeIds).toHaveLength(1);
+		});
+
+		it('should return a capped number of active workflow IDs when invoked with maxResults', async () => {
+			//
+			// ARRANGE
+			//
+			await Promise.all([
+				createWorkflow({ active: true }),
+				createWorkflow({ active: false }),
+				createWorkflow({ active: true }),
+			]);
+
+			//
+			// ACT
+			//
+			const activeIds = await Container.get(WorkflowRepository).getActiveIds({ maxResults: 1 });
+
+			//
+			// ASSERT
+			//
+			expect(activeIds).toHaveLength(1);
 		});
 	});
 });
diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts
index 6835d18f58..5bfd5d0e79 100644
--- a/packages/cli/test/integration/environments/source-control-import.service.test.ts
+++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts
@@ -1,3 +1,4 @@
+import type { SourceControlledFile } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
@@ -9,9 +10,9 @@ import fsp from 'node:fs/promises';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { SourceControlImportService } from '@/environments.ee/source-control/source-control-import.service.ee';
 import type { ExportableCredential } from '@/environments.ee/source-control/types/exportable-credential';
-import type { SourceControlledFile } from '@/environments.ee/source-control/types/source-controlled-file';
 
 import { mockInstance } from '../../shared/mocking';
 import { saveCredential } from '../shared/db/credentials';
@@ -21,11 +22,32 @@ import { randomCredentialPayload } from '../shared/random';
 import * as testDb from '../shared/test-db';
 
 describe('SourceControlImportService', () => {
+	let credentialsRepository: CredentialsRepository;
+	let projectRepository: ProjectRepository;
+	let sharedCredentialsRepository: SharedCredentialsRepository;
+	let userRepository: UserRepository;
 	let service: SourceControlImportService;
 	const cipher = mockInstance(Cipher);
 
 	beforeAll(async () => {
+		await testDb.init();
+
+		credentialsRepository = Container.get(CredentialsRepository);
+		projectRepository = Container.get(ProjectRepository);
+		sharedCredentialsRepository = Container.get(SharedCredentialsRepository);
+		userRepository = Container.get(UserRepository);
 		service = new SourceControlImportService(
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			credentialsRepository,
+			projectRepository,
+			mock(),
+			mock(),
+			sharedCredentialsRepository,
+			userRepository,
+			mock(),
 			mock(),
 			mock(),
 			mock(),
@@ -33,8 +55,6 @@ describe('SourceControlImportService', () => {
 			mock(),
 			mock<InstanceSettings>({ n8nFolder: '/some-path' }),
 		);
-
-		await testDb.init();
 	});
 
 	afterEach(async () => {
@@ -75,7 +95,7 @@ describe('SourceControlImportService', () => {
 
 				const personalProject = await getPersonalProject(member);
 
-				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+				const sharing = await sharedCredentialsRepository.findOneBy({
 					credentialsId: CREDENTIAL_ID,
 					projectId: personalProject.id,
 					role: 'credential:owner',
@@ -112,7 +132,7 @@ describe('SourceControlImportService', () => {
 
 				const personalProject = await getPersonalProject(importingUser);
 
-				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+				const sharing = await sharedCredentialsRepository.findOneBy({
 					credentialsId: CREDENTIAL_ID,
 					projectId: personalProject.id,
 					role: 'credential:owner',
@@ -149,7 +169,7 @@ describe('SourceControlImportService', () => {
 
 				const personalProject = await getPersonalProject(importingUser);
 
-				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+				const sharing = await sharedCredentialsRepository.findOneBy({
 					credentialsId: CREDENTIAL_ID,
 					projectId: personalProject.id,
 					role: 'credential:owner',
@@ -190,7 +210,7 @@ describe('SourceControlImportService', () => {
 
 			const personalProject = await getPersonalProject(importingUser);
 
-			const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+			const sharing = await sharedCredentialsRepository.findOneBy({
 				credentialsId: CREDENTIAL_ID,
 				projectId: personalProject.id,
 				role: 'credential:owner',
@@ -223,7 +243,7 @@ describe('SourceControlImportService', () => {
 			cipher.encrypt.mockReturnValue('some-encrypted-data');
 
 			{
-				const project = await Container.get(ProjectRepository).findOne({
+				const project = await projectRepository.findOne({
 					where: [
 						{
 							id: '1234-asdf',
@@ -241,7 +261,7 @@ describe('SourceControlImportService', () => {
 				importingUser.id,
 			);
 
-			const sharing = await Container.get(SharedCredentialsRepository).findOne({
+			const sharing = await sharedCredentialsRepository.findOne({
 				where: {
 					credentialsId: CREDENTIAL_ID,
 					role: 'credential:owner',
@@ -288,7 +308,7 @@ describe('SourceControlImportService', () => {
 				importingUser.id,
 			);
 
-			const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+			const sharing = await sharedCredentialsRepository.findOneBy({
 				credentialsId: CREDENTIAL_ID,
 				projectId: project.id,
 				role: 'credential:owner',
@@ -332,7 +352,7 @@ describe('SourceControlImportService', () => {
 			);
 
 			await expect(
-				Container.get(SharedCredentialsRepository).findBy({
+				sharedCredentialsRepository.findBy({
 					credentialsId: credential.id,
 				}),
 			).resolves.toMatchObject([
@@ -342,7 +362,7 @@ describe('SourceControlImportService', () => {
 				},
 			]);
 			await expect(
-				Container.get(CredentialsRepository).findBy({
+				credentialsRepository.findBy({
 					id: credential.id,
 				}),
 			).resolves.toMatchObject([
diff --git a/packages/cli/test/integration/environments/source-control.test.ts b/packages/cli/test/integration/environments/source-control.api.test.ts
similarity index 73%
rename from packages/cli/test/integration/environments/source-control.test.ts
rename to packages/cli/test/integration/environments/source-control.api.test.ts
index 11a7ad8a2b..6ad771493b 100644
--- a/packages/cli/test/integration/environments/source-control.test.ts
+++ b/packages/cli/test/integration/environments/source-control.api.test.ts
@@ -1,10 +1,9 @@
+import type { SourceControlledFile } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 
-import config from '@/config';
 import type { User } from '@/databases/entities/user';
 import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
 import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';
-import type { SourceControlledFile } from '@/environments.ee/source-control/types/source-controlled-file';
 import { Telemetry } from '@/telemetry';
 import { mockInstance } from '@test/mocking';
 
@@ -21,11 +20,17 @@ const testServer = utils.setupTestServer({
 	enabledFeatures: ['feat:sourceControl', 'feat:sharing'],
 });
 
+let sourceControlPreferencesService: SourceControlPreferencesService;
+
 beforeAll(async () => {
 	owner = await createUser({ role: 'global:owner' });
 	authOwnerAgent = testServer.authAgentFor(owner);
 
-	Container.get(SourceControlPreferencesService).isSourceControlConnected = () => true;
+	sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
+	await sourceControlPreferencesService.setPreferences({
+		connected: true,
+		keyGeneratorType: 'rsa',
+	});
 });
 
 describe('GET /sourceControl/preferences', () => {
@@ -65,19 +70,11 @@ describe('GET /sourceControl/preferences', () => {
 	});
 
 	test('refreshing key pairsshould return new rsa key', async () => {
-		config.set('sourceControl.defaultKeyPairType', 'rsa');
-		await authOwnerAgent
-			.post('/source-control/generate-key-pair')
-			.send()
-			.expect(200)
-			.expect((res) => {
-				expect(
-					Container.get(SourceControlPreferencesService).getPreferences().keyGeneratorType,
-				).toBe('rsa');
-				expect(res.body.data).toHaveProperty('publicKey');
-				expect(res.body.data).toHaveProperty('keyGeneratorType');
-				expect(res.body.data.keyGeneratorType).toBe('rsa');
-				expect(res.body.data.publicKey).toContain('ssh-rsa');
-			});
+		const res = await authOwnerAgent.post('/source-control/generate-key-pair').send().expect(200);
+
+		expect(res.body.data).toHaveProperty('publicKey');
+		expect(res.body.data).toHaveProperty('keyGeneratorType');
+		expect(res.body.data.keyGeneratorType).toBe('rsa');
+		expect(res.body.data.publicKey).toContain('ssh-rsa');
 	});
 });
diff --git a/packages/cli/test/integration/evaluation/test-runs.api.test.ts b/packages/cli/test/integration/evaluation/test-runs.api.test.ts
index 3fcc321cc9..9690d1b50e 100644
--- a/packages/cli/test/integration/evaluation/test-runs.api.test.ts
+++ b/packages/cli/test/integration/evaluation/test-runs.api.test.ts
@@ -1,4 +1,5 @@
 import { Container } from '@n8n/di';
+import { mockInstance } from 'n8n-core/test/utils';
 
 import type { TestDefinition } from '@/databases/entities/test-definition.ee';
 import type { User } from '@/databases/entities/user';
@@ -6,6 +7,7 @@ import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee';
 import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee';
 import { createUserShell } from '@test-integration/db/users';
 import { createWorkflow } from '@test-integration/db/workflows';
 import * as testDb from '@test-integration/test-db';
@@ -19,9 +21,11 @@ let testDefinition: TestDefinition;
 let otherTestDefinition: TestDefinition;
 let ownerShell: User;
 
+const testRunner = mockInstance(TestRunnerService);
+
 const testServer = utils.setupTestServer({
 	endpointGroups: ['workflows', 'evaluation'],
-	enabledFeatures: ['feat:sharing'],
+	enabledFeatures: ['feat:sharing', 'feat:multipleMainInstances'],
 });
 
 beforeAll(async () => {
@@ -57,13 +61,13 @@ describe('GET /evaluation/test-definitions/:testDefinitionId/runs', () => {
 		expect(resp.body.data).toEqual([]);
 	});
 
-	test('should retrieve 404 if test definition does not exist', async () => {
+	test('should return 404 if test definition does not exist', async () => {
 		const resp = await authOwnerAgent.get('/evaluation/test-definitions/123/runs');
 
 		expect(resp.statusCode).toBe(404);
 	});
 
-	test('should retrieve 404 if user does not have access to test definition', async () => {
+	test('should return 404 if user does not have access to test definition', async () => {
 		const resp = await authOwnerAgent.get(
 			`/evaluation/test-definitions/${otherTestDefinition.id}/runs`,
 		);
@@ -151,7 +155,7 @@ describe('GET /evaluation/test-definitions/:testDefinitionId/runs/:id', () => {
 		);
 	});
 
-	test('should retrieve 404 if test run does not exist', async () => {
+	test('should return 404 if test run does not exist', async () => {
 		const resp = await authOwnerAgent.get(
 			`/evaluation/test-definitions/${testDefinition.id}/runs/123`,
 		);
@@ -159,7 +163,7 @@ describe('GET /evaluation/test-definitions/:testDefinitionId/runs/:id', () => {
 		expect(resp.statusCode).toBe(404);
 	});
 
-	test('should retrieve 404 if user does not have access to test definition', async () => {
+	test('should return 404 if user does not have access to test definition', async () => {
 		const testRunRepository = Container.get(TestRunRepository);
 		const testRun = await testRunRepository.createTestRun(otherTestDefinition.id);
 
@@ -218,7 +222,7 @@ describe('DELETE /evaluation/test-definitions/:testDefinitionId/runs/:id', () =>
 		expect(testRunAfterDelete).toBeNull();
 	});
 
-	test('should retrieve 404 if test run does not exist', async () => {
+	test('should return 404 if test run does not exist', async () => {
 		const resp = await authOwnerAgent.delete(
 			`/evaluation/test-definitions/${testDefinition.id}/runs/123`,
 		);
@@ -226,7 +230,7 @@ describe('DELETE /evaluation/test-definitions/:testDefinitionId/runs/:id', () =>
 		expect(resp.statusCode).toBe(404);
 	});
 
-	test('should retrieve 404 if user does not have access to test definition', async () => {
+	test('should return 404 if user does not have access to test definition', async () => {
 		const testRunRepository = Container.get(TestRunRepository);
 		const testRun = await testRunRepository.createTestRun(otherTestDefinition.id);
 
@@ -237,3 +241,46 @@ describe('DELETE /evaluation/test-definitions/:testDefinitionId/runs/:id', () =>
 		expect(resp.statusCode).toBe(404);
 	});
 });
+
+describe('POST /evaluation/test-definitions/:testDefinitionId/runs/:id/cancel', () => {
+	test('should cancel test run', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(testDefinition.id);
+
+		jest.spyOn(testRunRepository, 'markAsCancelled');
+
+		const resp = await authOwnerAgent.post(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/${testRun.id}/cancel`,
+		);
+
+		expect(resp.statusCode).toBe(202);
+		expect(resp.body).toEqual({ success: true });
+
+		expect(testRunner.cancelTestRun).toHaveBeenCalledWith(testRun.id);
+	});
+
+	test('should return 404 if test run does not exist', async () => {
+		const resp = await authOwnerAgent.post(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/123/cancel`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions/123/runs/123/cancel');
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if user does not have access to test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(otherTestDefinition.id);
+
+		const resp = await authOwnerAgent.post(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/runs/${testRun.id}/cancel`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
diff --git a/packages/cli/test/integration/project.api.test.ts b/packages/cli/test/integration/project.api.test.ts
index a75aad9566..5f7c7e1b27 100644
--- a/packages/cli/test/integration/project.api.test.ts
+++ b/packages/cli/test/integration/project.api.test.ts
@@ -1,10 +1,10 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import { EntityNotFoundError } from '@n8n/typeorm';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { GlobalRole } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -177,11 +177,7 @@ describe('GET /projects/my-projects', () => {
 		//
 		// ACT
 		//
-		const resp = await testServer
-			.authAgentFor(testUser1)
-			.get('/projects/my-projects')
-			.query({ includeScopes: true })
-			.expect(200);
+		const resp = await testServer.authAgentFor(testUser1).get('/projects/my-projects').expect(200);
 		const respProjects: Array<Project & { role: ProjectRole | GlobalRole; scopes?: Scope[] }> =
 			resp.body.data;
 
@@ -258,11 +254,7 @@ describe('GET /projects/my-projects', () => {
 		//
 		// ACT
 		//
-		const resp = await testServer
-			.authAgentFor(ownerUser)
-			.get('/projects/my-projects')
-			.query({ includeScopes: true })
-			.expect(200);
+		const resp = await testServer.authAgentFor(ownerUser).get('/projects/my-projects').expect(200);
 		const respProjects: Array<Project & { role: ProjectRole | GlobalRole; scopes?: Scope[] }> =
 			resp.body.data;
 
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index 943d33bc35..7a1fa9591d 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -1,8 +1,8 @@
+import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import type { INode } from 'n8n-workflow';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import config from '@/config';
 import { STARTING_NODES } from '@/constants';
 import type { Project } from '@/databases/entities/project';
 import type { TagEntity } from '@/databases/entities/tag-entity';
@@ -36,6 +36,8 @@ let activeWorkflowManager: ActiveWorkflowManager;
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 const license = testServer.license;
 
+const globalConfig = Container.get(GlobalConfig);
+
 mockInstance(ExecutionService);
 
 beforeAll(async () => {
@@ -69,6 +71,8 @@ beforeEach(async () => {
 
 	authOwnerAgent = testServer.publicApiAgentFor(owner);
 	authMemberAgent = testServer.publicApiAgentFor(member);
+
+	globalConfig.tags.disabled = false;
 });
 
 afterEach(async () => {
@@ -263,8 +267,12 @@ describe('GET /workflows', () => {
 
 	test('for owner, should return all workflows filtered by `projectId`', async () => {
 		license.setQuota('quota:maxTeamProjects', -1);
-		const firstProject = await Container.get(ProjectService).createTeamProject('First', owner);
-		const secondProject = await Container.get(ProjectService).createTeamProject('Second', member);
+		const firstProject = await Container.get(ProjectService).createTeamProject(owner, {
+			name: 'First',
+		});
+		const secondProject = await Container.get(ProjectService).createTeamProject(member, {
+			name: 'Second',
+		});
 
 		await Promise.all([
 			createWorkflow({ name: 'First workflow' }, firstProject),
@@ -285,10 +293,9 @@ describe('GET /workflows', () => {
 
 	test('for member, should return all member-accessible workflows filtered by `projectId`', async () => {
 		license.setQuota('quota:maxTeamProjects', -1);
-		const otherProject = await Container.get(ProjectService).createTeamProject(
-			'Other project',
-			member,
-		);
+		const otherProject = await Container.get(ProjectService).createTeamProject(member, {
+			name: 'Other project',
+		});
 
 		await Promise.all([
 			createWorkflow({}, member),
@@ -1284,8 +1291,8 @@ describe('GET /workflows/:id/tags', () => {
 
 	test('should fail due to invalid API Key', testWithAPIKey('get', '/workflows/2/tags', 'abcXYZ'));
 
-	test('should fail if workflowTagsDisabled', async () => {
-		config.set('workflowTagsDisabled', true);
+	test('should fail if N8N_WORKFLOW_TAGS_DISABLED', async () => {
+		globalConfig.tags.disabled = true;
 
 		const response = await authOwnerAgent.get('/workflows/2/tags');
 
@@ -1294,16 +1301,12 @@ describe('GET /workflows/:id/tags', () => {
 	});
 
 	test('should fail due to non-existing workflow', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const response = await authOwnerAgent.get('/workflows/2/tags');
 
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should return all tags of owned workflow', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 
 		const workflow = await createWorkflow({ tags }, member);
@@ -1328,8 +1331,6 @@ describe('GET /workflows/:id/tags', () => {
 	});
 
 	test('should return empty array if workflow does not have tags', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const workflow = await createWorkflow({}, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}/tags`);
@@ -1344,8 +1345,8 @@ describe('PUT /workflows/:id/tags', () => {
 
 	test('should fail due to invalid API Key', testWithAPIKey('put', '/workflows/2/tags', 'abcXYZ'));
 
-	test('should fail if workflowTagsDisabled', async () => {
-		config.set('workflowTagsDisabled', true);
+	test('should fail if N8N_WORKFLOW_TAGS_DISABLED', async () => {
+		globalConfig.tags.disabled = true;
 
 		const response = await authOwnerAgent.put('/workflows/2/tags').send([]);
 
@@ -1354,16 +1355,12 @@ describe('PUT /workflows/:id/tags', () => {
 	});
 
 	test('should fail due to non-existing workflow', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const response = await authOwnerAgent.put('/workflows/2/tags').send([]);
 
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should add the tags, workflow have not got tags previously', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const workflow = await createWorkflow({}, member);
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 
@@ -1422,8 +1419,6 @@ describe('PUT /workflows/:id/tags', () => {
 	});
 
 	test('should add the tags, workflow have some tags previously', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const tags = await Promise.all([await createTag({}), await createTag({}), await createTag({})]);
 		const oldTags = [tags[0], tags[1]];
 		const newTags = [tags[0], tags[2]];
@@ -1510,8 +1505,6 @@ describe('PUT /workflows/:id/tags', () => {
 	});
 
 	test('should fail to add the tags as one does not exist, workflow should maintain previous tags', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 		const oldTags = [tags[0], tags[1]];
 		const workflow = await createWorkflow({ tags: oldTags }, member);
diff --git a/packages/cli/test/integration/role.api.test.ts b/packages/cli/test/integration/role.api.test.ts
index 85888347cc..d8f56604a3 100644
--- a/packages/cli/test/integration/role.api.test.ts
+++ b/packages/cli/test/integration/role.api.test.ts
@@ -1,7 +1,7 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { CredentialSharingRole } from '@/databases/entities/shared-credentials';
 import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow';
 import type { GlobalRole } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
index ddf3fce556..05a6b2c31f 100644
--- a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
@@ -240,6 +240,7 @@ test('should not report outdated instance when up to date', async () => {
 
 test('should report security settings', async () => {
 	Container.get(GlobalConfig).diagnostics.enabled = true;
+
 	const testAudit = await securityAuditService.run(['instance']);
 
 	const section = getRiskSection(
diff --git a/packages/cli/test/integration/services/project.service.test.ts b/packages/cli/test/integration/services/project.service.test.ts
index bf83c6159c..b01aed3b3b 100644
--- a/packages/cli/test/integration/services/project.service.test.ts
+++ b/packages/cli/test/integration/services/project.service.test.ts
@@ -1,7 +1,7 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { ProjectService } from '@/services/project.service.ee';
diff --git a/packages/cli/test/integration/shared/db/projects.ts b/packages/cli/test/integration/shared/db/projects.ts
index 6ca0fcfad2..9d61c2a667 100644
--- a/packages/cli/test/integration/shared/db/projects.ts
+++ b/packages/cli/test/integration/shared/db/projects.ts
@@ -1,7 +1,8 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation';
+import type { ProjectRelation } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index bb4332f9de..af0cf99820 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -81,7 +81,10 @@ export async function createUserWithMfaEnabled(
 }
 
 export const addApiKey = async (user: User) => {
-	return await Container.get(PublicApiKeyService).createPublicApiKeyForUser(user);
+	return await Container.get(PublicApiKeyService).createPublicApiKeyForUser(user, {
+		label: randomName(),
+		expiresAt: null,
+	});
 };
 
 export async function createOwnerWithApiKey() {
diff --git a/packages/cli/test/integration/shared/utils/task-broker-test-server.ts b/packages/cli/test/integration/shared/utils/task-broker-test-server.ts
index 63a96678a2..a908d5ce5d 100644
--- a/packages/cli/test/integration/shared/utils/task-broker-test-server.ts
+++ b/packages/cli/test/integration/shared/utils/task-broker-test-server.ts
@@ -3,10 +3,10 @@ import { Container } from '@n8n/di';
 import request from 'supertest';
 import type TestAgent from 'supertest/lib/agent';
 
-import { TaskRunnerServer } from '@/task-runners/task-runner-server';
+import { TaskBrokerServer } from '@/task-runners/task-broker/task-broker-server';
 
 export interface TestTaskBrokerServer {
-	server: TaskRunnerServer;
+	server: TaskBrokerServer;
 	agent: TestAgent;
 	config: TaskRunnersConfig;
 }
@@ -29,11 +29,11 @@ export const setupBrokerTestServer = (
 	runnerConfig.enabled = true;
 	runnerConfig.port = 0; // Use any port
 
-	const taskRunnerServer = Container.get(TaskRunnerServer);
-	const agent = request.agent(taskRunnerServer.app);
+	const taskBrokerServer = Container.get(TaskBrokerServer);
+	const agent = request.agent(taskBrokerServer.app);
 
 	return {
-		server: taskRunnerServer,
+		server: taskBrokerServer,
 		agent,
 		config: runnerConfig,
 	};
diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts
index 5d9a724f78..90d764f534 100644
--- a/packages/cli/test/integration/tags.api.test.ts
+++ b/packages/cli/test/integration/tags.api.test.ts
@@ -8,6 +8,7 @@ import type { SuperAgentTest } from './shared/types';
 import * as utils from './shared/utils/';
 
 let authOwnerAgent: SuperAgentTest;
+
 const testServer = utils.setupTestServer({ endpointGroups: ['tags'] });
 
 beforeAll(async () => {
@@ -22,8 +23,8 @@ beforeEach(async () => {
 describe('POST /tags', () => {
 	test('should create tag', async () => {
 		const resp = await authOwnerAgent.post('/tags').send({ name: 'test' });
-		expect(resp.statusCode).toBe(200);
 
+		expect(resp.statusCode).toBe(200);
 		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
 		expect(dbTag.length === 1);
 	});
@@ -38,4 +39,59 @@ describe('POST /tags', () => {
 		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
 		expect(dbTag.length).toBe(1);
 	});
+
+	test('should delete tag', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.delete(`/tags/${newTag.id}`);
+		expect(resp.status).toBe(200);
+
+		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
+		expect(dbTag.length).toBe(0);
+	});
+
+	test('should update tag name', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.patch(`/tags/${newTag.id}`).send({ name: 'updated' });
+		expect(resp.status).toBe(200);
+
+		const dbTag = await Container.get(TagRepository).findBy({ name: 'updated' });
+		expect(dbTag.length).toBe(1);
+	});
+
+	test('should retrieve all tags', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		const savedTag = await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.get('/tags');
+		expect(resp.status).toBe(200);
+
+		expect(resp.body.data.length).toBe(1);
+		expect(resp.body.data[0]).toMatchObject({
+			id: savedTag.id,
+			name: savedTag.name,
+			createdAt: savedTag.createdAt.toISOString(),
+			updatedAt: savedTag.updatedAt.toISOString(),
+		});
+	});
+
+	test('should retrieve all tags with with usage count', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		const savedTag = await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.get('/tags').query({ withUsageCount: 'true' });
+		expect(resp.status).toBe(200);
+
+		expect(resp.body.data.length).toBe(1);
+		expect(resp.body.data[0]).toMatchObject({
+			id: savedTag.id,
+			name: savedTag.name,
+			createdAt: savedTag.createdAt.toISOString(),
+			updatedAt: savedTag.updatedAt.toISOString(),
+			usageCount: 0,
+		});
+	});
 });
diff --git a/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts b/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts
new file mode 100644
index 0000000000..a69f60d198
--- /dev/null
+++ b/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts
@@ -0,0 +1,269 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import type {
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	INodeParameters,
+	INodeTypes,
+	IRunExecutionData,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { createEnvProviderState, NodeConnectionType, Workflow } from 'n8n-workflow';
+
+import { LocalTaskRequester } from '@/task-runners/task-managers/local-task-requester';
+import { TaskRunnerModule } from '@/task-runners/task-runner-module';
+
+/**
+ * Integration tests for the JS TaskRunner execution. Starts the TaskRunner
+ * as a child process and executes tasks on it via the broker.
+ */
+describe('JS TaskRunner execution on internal mode', () => {
+	const runnerConfig = Container.get(TaskRunnersConfig);
+	runnerConfig.mode = 'internal';
+	runnerConfig.enabled = true;
+	runnerConfig.port = 45678;
+
+	const taskRunnerModule = Container.get(TaskRunnerModule);
+	const taskRequester = Container.get(LocalTaskRequester);
+
+	/**
+	 * Sets up task data that includes a workflow with manual trigger and a
+	 * code node with the given JS code. The input data is a single item:
+	 * ```json
+	 * {
+	 *   "input": "item"
+	 * }
+	 * ```
+	 */
+	const newTaskData = (jsCode: string) => {
+		const taskSettings = {
+			code: jsCode,
+			nodeMode: 'runOnceForAllItems',
+			workflowMode: 'manual',
+			continueOnFail: false,
+		};
+
+		const codeNode: INode = {
+			parameters: {
+				jsCode,
+			},
+			type: 'n8n-nodes-base.code',
+			typeVersion: 2,
+			position: [200, 80],
+			id: 'b35fd455-32e4-4d52-b840-36aa28dd1910',
+			name: 'Code',
+		};
+
+		const workflow = new Workflow({
+			id: 'testWorkflow',
+			name: 'testWorkflow',
+			nodes: [
+				{
+					parameters: {},
+					type: 'n8n-nodes-base.manualTrigger',
+					typeVersion: 1,
+					position: [0, 0],
+					id: 'a39a566a-283a-433e-88bc-b3857aab706f',
+					name: 'ManualTrigger',
+				},
+				codeNode,
+			],
+			connections: {
+				ManualTrigger: {
+					main: [
+						[
+							{
+								node: 'Code',
+								type: NodeConnectionType.Main,
+								index: 0,
+							},
+						],
+					],
+				},
+			},
+			active: true,
+			nodeTypes: mock<INodeTypes>(),
+		});
+
+		const inputData: INodeExecutionData[] = [
+			{
+				json: {
+					input: 'item',
+				},
+			},
+		];
+
+		const inputConnections: ITaskDataConnections = {
+			main: [inputData],
+		};
+
+		const runExecutionData: IRunExecutionData = {
+			startData: {},
+			resultData: {
+				runData: {
+					ManualTrigger: [
+						{
+							startTime: Date.now(),
+							executionTime: 0,
+							executionStatus: 'success',
+							source: [],
+							data: {
+								main: [inputData],
+							},
+						},
+					],
+				},
+				lastNodeExecuted: 'ManualTrigger',
+			},
+			executionData: {
+				contextData: {},
+				nodeExecutionStack: [],
+				metadata: {},
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
+		};
+
+		return {
+			additionalData: mock<IWorkflowExecuteAdditionalData>(),
+			executeFunctions: mock<IExecuteFunctions>(),
+			taskSettings,
+			codeNode,
+			workflow,
+			inputData,
+			inputConnections,
+			runExecutionData,
+			envProviderState: createEnvProviderState(),
+		};
+	};
+
+	const runTaskWithCode = async (jsCode: string) => {
+		const {
+			additionalData,
+			taskSettings,
+			codeNode,
+			workflow,
+			inputData,
+			inputConnections,
+			runExecutionData,
+			executeFunctions,
+			envProviderState,
+		} = newTaskData(jsCode);
+
+		return await taskRequester.startTask<INodeExecutionData[], Error>(
+			additionalData,
+			'javascript',
+			taskSettings,
+			executeFunctions,
+			inputConnections,
+			codeNode,
+			workflow,
+			runExecutionData,
+			0,
+			0,
+			codeNode.name,
+			inputData,
+			mock<INodeParameters>(),
+			mock<WorkflowExecuteMode>(),
+			envProviderState,
+		);
+	};
+
+	describe('Basic code execution', () => {
+		beforeAll(async () => {
+			await taskRunnerModule.start();
+		});
+
+		afterAll(async () => {
+			await taskRunnerModule.stop();
+		});
+
+		it('should execute a simple JS task', async () => {
+			// Act
+			const result = await runTaskWithCode('return [{ hello: "world" }]');
+
+			// Assert
+			expect(result).toEqual({
+				ok: true,
+				result: [{ json: { hello: 'world' } }],
+			});
+		});
+	});
+
+	describe('Internal and external libs', () => {
+		beforeAll(async () => {
+			process.env.NODE_FUNCTION_ALLOW_BUILTIN = 'crypto';
+			process.env.NODE_FUNCTION_ALLOW_EXTERNAL = 'moment';
+			await taskRunnerModule.start();
+		});
+
+		afterAll(async () => {
+			await taskRunnerModule.stop();
+		});
+
+		it('should allow importing allowed internal module', async () => {
+			// Act
+			const result = await runTaskWithCode(`
+				const crypto = require("crypto");
+				return [{
+					digest: crypto
+						.createHmac("sha256", Buffer.from("MySecretKey"))
+						.update("MESSAGE")
+						.digest("base64")
+				}]
+			`);
+
+			expect(result).toEqual({
+				ok: true,
+				result: [{ json: { digest: 'T09DMv7upNDKMD3Ht36FkwzrmWSgWpPiUNlcIX9/yaI=' } }],
+			});
+		});
+
+		it('should not allow importing disallowed internal module', async () => {
+			// Act
+			const result = await runTaskWithCode(`
+				const fs = require("fs");
+				return [{ file: fs.readFileSync("test.txt") }]
+			`);
+
+			expect(result).toEqual({
+				ok: false,
+				error: expect.objectContaining({
+					message: "Cannot find module 'fs' [line 2]",
+				}),
+			});
+		});
+
+		it('should allow importing allowed external module', async () => {
+			// Act
+			const result = await runTaskWithCode(`
+				const moment = require("moment");
+				return [{ time: moment("1995-12-25").format("YYYY-MM-DD") }]
+			`);
+
+			expect(result).toEqual({
+				ok: true,
+				result: [{ json: { time: '1995-12-25' } }],
+			});
+		});
+
+		it('should not allow importing disallowed external module', async () => {
+			// Act
+			const result = await runTaskWithCode(`
+				const lodash = require("lodash");
+				return [{ obj: lodash.cloneDeep({}) }]
+			`);
+
+			expect(result).toEqual({
+				ok: false,
+				error: expect.objectContaining({
+					message: "Cannot find module 'lodash' [line 2]",
+				}),
+			});
+		});
+	});
+});
diff --git a/packages/cli/test/integration/task-runners/task-broker-server.test.ts b/packages/cli/test/integration/task-runners/task-broker-server.test.ts
new file mode 100644
index 0000000000..ab17d54820
--- /dev/null
+++ b/packages/cli/test/integration/task-runners/task-broker-server.test.ts
@@ -0,0 +1,44 @@
+import { setupBrokerTestServer } from '@test-integration/utils/task-broker-test-server';
+
+describe('TaskBrokerServer', () => {
+	const { agent, server } = setupBrokerTestServer({
+		authToken: 'token',
+		mode: 'external',
+	});
+
+	beforeAll(async () => {
+		await server.start();
+	});
+
+	afterAll(async () => {
+		await server.stop();
+	});
+
+	describe('/healthz', () => {
+		it('should return 200', async () => {
+			await agent.get('/healthz').expect(200);
+		});
+	});
+
+	describe('/runners/_ws', () => {
+		it('should return 429 when too many requests are made', async () => {
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(429);
+		});
+	});
+
+	describe('/runners/auth', () => {
+		it('should return 429 when too many requests are made', async () => {
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(429);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/runners/task-runner-module.external.test.ts b/packages/cli/test/integration/task-runners/task-runner-module.external.test.ts
similarity index 91%
rename from packages/cli/test/integration/runners/task-runner-module.external.test.ts
rename to packages/cli/test/integration/task-runners/task-runner-module.external.test.ts
index d111854db6..f60b53bdad 100644
--- a/packages/cli/test/integration/runners/task-runner-module.external.test.ts
+++ b/packages/cli/test/integration/task-runners/task-runner-module.external.test.ts
@@ -3,10 +3,10 @@ import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 
 import { MissingAuthTokenError } from '@/task-runners/errors/missing-auth-token.error';
+import { TaskBrokerWsServer } from '@/task-runners/task-broker/task-broker-ws-server';
 import { TaskRunnerModule } from '@/task-runners/task-runner-module';
 
 import { DefaultTaskRunnerDisconnectAnalyzer } from '../../../src/task-runners/default-task-runner-disconnect-analyzer';
-import { TaskRunnerWsServer } from '../../../src/task-runners/task-runner-ws-server';
 
 describe('TaskRunnerModule in external mode', () => {
 	const runnerConfig = Container.get(TaskRunnersConfig);
@@ -46,7 +46,7 @@ describe('TaskRunnerModule in external mode', () => {
 		});
 
 		it('should use DefaultTaskRunnerDisconnectAnalyzer', () => {
-			const wsServer = Container.get(TaskRunnerWsServer);
+			const wsServer = Container.get(TaskBrokerWsServer);
 
 			expect(wsServer.getDisconnectAnalyzer()).toBeInstanceOf(DefaultTaskRunnerDisconnectAnalyzer);
 		});
diff --git a/packages/cli/test/integration/runners/task-runner-module.internal.test.ts b/packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts
similarity index 88%
rename from packages/cli/test/integration/runners/task-runner-module.internal.test.ts
rename to packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts
index 3c373e9614..15876f04ac 100644
--- a/packages/cli/test/integration/runners/task-runner-module.internal.test.ts
+++ b/packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts
@@ -1,10 +1,10 @@
 import { TaskRunnersConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 
+import { TaskBrokerWsServer } from '@/task-runners/task-broker/task-broker-ws-server';
 import { TaskRunnerModule } from '@/task-runners/task-runner-module';
 
 import { InternalTaskRunnerDisconnectAnalyzer } from '../../../src/task-runners/internal-task-runner-disconnect-analyzer';
-import { TaskRunnerWsServer } from '../../../src/task-runners/task-runner-ws-server';
 
 describe('TaskRunnerModule in internal mode', () => {
 	const runnerConfig = Container.get(TaskRunnersConfig);
@@ -33,7 +33,7 @@ describe('TaskRunnerModule in internal mode', () => {
 		});
 
 		it('should use InternalTaskRunnerDisconnectAnalyzer', () => {
-			const wsServer = Container.get(TaskRunnerWsServer);
+			const wsServer = Container.get(TaskBrokerWsServer);
 
 			expect(wsServer.getDisconnectAnalyzer()).toBeInstanceOf(InternalTaskRunnerDisconnectAnalyzer);
 		});
diff --git a/packages/cli/test/integration/runners/task-runner-process.test.ts b/packages/cli/test/integration/task-runners/task-runner-process.test.ts
similarity index 93%
rename from packages/cli/test/integration/runners/task-runner-process.test.ts
rename to packages/cli/test/integration/task-runners/task-runner-process.test.ts
index bd6dae00b0..6e5100e24a 100644
--- a/packages/cli/test/integration/runners/task-runner-process.test.ts
+++ b/packages/cli/test/integration/task-runners/task-runner-process.test.ts
@@ -1,9 +1,9 @@
 import { Container } from '@n8n/di';
 
-import { TaskBroker } from '@/task-runners/task-broker.service';
+import { TaskBrokerWsServer } from '@/task-runners/task-broker/task-broker-ws-server';
+import { TaskBroker } from '@/task-runners/task-broker/task-broker.service';
 import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
 import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
-import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-server';
 import { retryUntil } from '@test-integration/retry-until';
 import { setupBrokerTestServer } from '@test-integration/utils/task-broker-test-server';
 
@@ -13,7 +13,7 @@ describe('TaskRunnerProcess', () => {
 	});
 	const runnerProcess = Container.get(TaskRunnerProcess);
 	const taskBroker = Container.get(TaskBroker);
-	const taskRunnerService = Container.get(TaskRunnerWsServer);
+	const taskRunnerService = Container.get(TaskBrokerWsServer);
 
 	beforeAll(async () => {
 		await taskRunnerServer.start();
diff --git a/packages/cli/test/integration/runners/task-runner-server.test.ts b/packages/cli/test/integration/task-runners/task-runner-server.test.ts
similarity index 97%
rename from packages/cli/test/integration/runners/task-runner-server.test.ts
rename to packages/cli/test/integration/task-runners/task-runner-server.test.ts
index 6088af3525..ab17d54820 100644
--- a/packages/cli/test/integration/runners/task-runner-server.test.ts
+++ b/packages/cli/test/integration/task-runners/task-runner-server.test.ts
@@ -1,6 +1,6 @@
 import { setupBrokerTestServer } from '@test-integration/utils/task-broker-test-server';
 
-describe('TaskRunnerServer', () => {
+describe('TaskBrokerServer', () => {
 	const { agent, server } = setupBrokerTestServer({
 		authToken: 'token',
 		mode: 'external',
diff --git a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts
index bfd068e2a0..3f54420873 100644
--- a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts
+++ b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts
@@ -72,7 +72,7 @@ describe('WorkflowSharingService', () => {
 			//
 			// ARRANGE
 			//
-			const project = await projectService.createTeamProject('Team Project', member);
+			const project = await projectService.createTeamProject(member, { name: 'Team Project' });
 			await projectService.addUser(project.id, anotherMember.id, 'project:admin');
 			const workflow = await createWorkflow(undefined, project);
 
@@ -93,9 +93,9 @@ describe('WorkflowSharingService', () => {
 			//
 			// ARRANGE
 			//
-			const project1 = await projectService.createTeamProject('Team Project 1', member);
+			const project1 = await projectService.createTeamProject(member, { name: 'Team Project 1' });
 			const workflow1 = await createWorkflow(undefined, project1);
-			const project2 = await projectService.createTeamProject('Team Project 2', member);
+			const project2 = await projectService.createTeamProject(member, { name: 'Team Project 2' });
 			const workflow2 = await createWorkflow(undefined, project2);
 			await projectService.addUser(project1.id, anotherMember.id, 'project:admin');
 			await projectService.addUser(project2.id, anotherMember.id, 'project:viewer');
diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts
index 8e2c76c981..b7d9c033b4 100644
--- a/packages/cli/test/integration/workflows/workflow.service.test.ts
+++ b/packages/cli/test/integration/workflows/workflow.service.test.ts
@@ -40,6 +40,7 @@ beforeAll(async () => {
 		mock(),
 		mock(),
 		mock(),
+		mock(),
 	);
 });
 
diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
index d376500484..b95304a583 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
@@ -1,3 +1,4 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { Container } from '@n8n/di';
 import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
@@ -5,7 +6,6 @@ import { v4 as uuid } from 'uuid';
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index e69e172f97..55c34f633c 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -854,6 +854,97 @@ describe('GET /workflows', () => {
 			});
 		});
 	});
+
+	describe('sortBy', () => {
+		test('should fail when trying to sort by non sortable column', async () => {
+			await authOwnerAgent.get('/workflows').query('sortBy=nonSortableColumn:asc').expect(500);
+		});
+
+		test('should sort by createdAt column', async () => {
+			await createWorkflow({ name: 'First' }, owner);
+			await createWorkflow({ name: 'Second' }, owner);
+
+			let response = await authOwnerAgent
+				.get('/workflows')
+				.query('sortBy=createdAt:asc')
+				.expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					expect.objectContaining({ name: 'First' }),
+					expect.objectContaining({ name: 'Second' }),
+				]),
+			});
+
+			response = await authOwnerAgent.get('/workflows').query('sortBy=createdAt:desc').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					expect.objectContaining({ name: 'Second' }),
+					expect.objectContaining({ name: 'First' }),
+				]),
+			});
+		});
+
+		test('should sort by name column', async () => {
+			await createWorkflow({ name: 'a' }, owner);
+			await createWorkflow({ name: 'b' }, owner);
+
+			let response;
+
+			response = await authOwnerAgent.get('/workflows').query('sortBy=name:asc').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					expect.objectContaining({ name: 'a' }),
+					expect.objectContaining({ name: 'b' }),
+				]),
+			});
+
+			response = await authOwnerAgent.get('/workflows').query('sortBy=name:desc').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					expect.objectContaining({ name: 'b' }),
+					expect.objectContaining({ name: 'a' }),
+				]),
+			});
+		});
+
+		test('should sort by updatedAt column', async () => {
+			const futureDate = new Date();
+			futureDate.setDate(futureDate.getDate() + 10);
+
+			await createWorkflow({ name: 'First', updatedAt: futureDate }, owner);
+			await createWorkflow({ name: 'Second' }, owner);
+
+			let response;
+
+			response = await authOwnerAgent.get('/workflows').query('sortBy=updatedAt:asc').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					expect.objectContaining({ name: 'Second' }),
+					expect.objectContaining({ name: 'First' }),
+				]),
+			});
+
+			response = await authOwnerAgent.get('/workflows').query('sortBy=name:desc').expect(200);
+
+			expect(response.body).toEqual({
+				count: 2,
+				data: arrayContaining([
+					expect.objectContaining({ name: 'First' }),
+					expect.objectContaining({ name: 'Second' }),
+				]),
+			});
+		});
+	});
 });
 
 describe('PATCH /workflows/:workflowId', () => {
diff --git a/packages/cli/test/setup-test-folder.ts b/packages/cli/test/setup-test-folder.ts
index 8a58c48f86..80b9953333 100644
--- a/packages/cli/test/setup-test-folder.ts
+++ b/packages/cli/test/setup-test-folder.ts
@@ -20,3 +20,8 @@ writeFileSync(
 		mode: 0o600,
 	},
 );
+
+// This is needed to ensure that `process.env` overrides in tests
+// are set before any of the config classes are instantiated.
+// TODO: delete this after we are done migrating everything to config classes
+import '@/config';
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
index 9bfae8a9eb..ceb431ce40 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
 
 	rules: {
 		complexity: 'error',
+		'unicorn/filename-case': ['error', { case: 'kebabCase' }],
 
 		// TODO: Remove this
 		'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': true }],
diff --git a/packages/core/bin/copy-icons b/packages/core/bin/copy-static-files
similarity index 56%
rename from packages/core/bin/copy-icons
rename to packages/core/bin/copy-static-files
index bdcb011c25..a178a40816 100755
--- a/packages/core/bin/copy-icons
+++ b/packages/core/bin/copy-static-files
@@ -6,13 +6,18 @@ const { cp } = require('fs/promises');
 const { packageDir } = require('./common');
 
 const limiter = pLimit(20);
-const icons = glob.sync('{nodes,credentials}/**/*.{png,svg}', { cwd: packageDir });
+const staticFiles = glob.sync(
+	['{nodes,credentials}/**/*.{png,svg}', 'nodes/**/__schema__/**/*.json'],
+	{
+		cwd: packageDir,
+	},
+);
 
 (async () => {
 	await Promise.all(
-		icons.map((icon) =>
+		staticFiles.map((path) =>
 			limiter(() => {
-				return cp(icon, `dist/${icon}`, { recursive: true });
+				return cp(path, `dist/${path}`, { recursive: true });
 			}),
 		),
 	);
diff --git a/packages/core/bin/generate-metadata b/packages/core/bin/generate-metadata
index 18dbca687a..b4001ccd84 100755
--- a/packages/core/bin/generate-metadata
+++ b/packages/core/bin/generate-metadata
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 const { LoggerProxy } = require('n8n-workflow');
-const { PackageDirectoryLoader } = require('../dist/DirectoryLoader');
+const { PackageDirectoryLoader } = require('../dist/nodes-loader/package-directory-loader');
 const { packageDir, writeJSON } = require('./common');
 
 LoggerProxy.init(console);
diff --git a/packages/core/package.json b/packages/core/package.json
index 8773d134ea..b7bf18088c 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,11 +1,11 @@
 {
   "name": "n8n-core",
-  "version": "1.74.0",
+  "version": "1.78.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "bin": {
-    "n8n-copy-icons": "./bin/copy-icons",
+    "n8n-copy-static-files": "./bin/copy-static-files",
     "n8n-generate-translations": "./bin/generate-translations",
     "n8n-generate-metadata": "./bin/generate-metadata"
   },
diff --git a/packages/core/src/CreateNodeAsTool.ts b/packages/core/src/CreateNodeAsTool.ts
deleted file mode 100644
index da34b377df..0000000000
--- a/packages/core/src/CreateNodeAsTool.ts
+++ /dev/null
@@ -1,419 +0,0 @@
-import { DynamicStructuredTool } from '@langchain/core/tools';
-import type { IDataObject, INode, INodeType } from 'n8n-workflow';
-import { jsonParse, NodeOperationError } from 'n8n-workflow';
-import { z } from 'zod';
-
-type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
-interface FromAIArgument {
-	key: string;
-	description?: string;
-	type?: AllowedTypes;
-	defaultValue?: string | number | boolean | Record<string, unknown>;
-}
-
-type ParserOptions = {
-	node: INode;
-	nodeType: INodeType;
-	handleToolInvocation: (toolArgs: IDataObject) => Promise<unknown>;
-};
-
-// This file is temporarily duplicated in `packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts`
-// Please apply any changes in both files
-
-/**
- * AIParametersParser
- *
- * This class encapsulates the logic for parsing node parameters, extracting $fromAI calls,
- * generating Zod schemas, and creating LangChain tools.
- */
-class AIParametersParser {
-	/**
-	 * Constructs an instance of AIParametersParser.
-	 */
-	constructor(private readonly options: ParserOptions) {}
-
-	/**
-	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
-	 * @param placeholder The FromAIArgument object containing key, type, description, and defaultValue.
-	 * @returns A Zod schema corresponding to the placeholder's type and constraints.
-	 */
-	private generateZodSchema(placeholder: FromAIArgument): z.ZodTypeAny {
-		let schema: z.ZodTypeAny;
-
-		switch (placeholder.type?.toLowerCase()) {
-			case 'string':
-				schema = z.string();
-				break;
-			case 'number':
-				schema = z.number();
-				break;
-			case 'boolean':
-				schema = z.boolean();
-				break;
-			case 'json':
-				schema = z.record(z.any());
-				break;
-			default:
-				schema = z.string();
-		}
-
-		if (placeholder.description) {
-			schema = schema.describe(`${schema.description ?? ''} ${placeholder.description}`.trim());
-		}
-
-		if (placeholder.defaultValue !== undefined) {
-			schema = schema.default(placeholder.defaultValue);
-		}
-
-		return schema;
-	}
-
-	/**
-	 * Recursively traverses the nodeParameters object to find all $fromAI calls.
-	 * @param payload The current object or value being traversed.
-	 * @param collectedArgs The array collecting FromAIArgument objects.
-	 */
-	private traverseNodeParameters(payload: unknown, collectedArgs: FromAIArgument[]) {
-		if (typeof payload === 'string') {
-			const fromAICalls = this.extractFromAICalls(payload);
-			fromAICalls.forEach((call) => collectedArgs.push(call));
-		} else if (Array.isArray(payload)) {
-			payload.forEach((item: unknown) => this.traverseNodeParameters(item, collectedArgs));
-		} else if (typeof payload === 'object' && payload !== null) {
-			Object.values(payload).forEach((value) => this.traverseNodeParameters(value, collectedArgs));
-		}
-	}
-
-	/**
-	 * Extracts all $fromAI calls from a given string
-	 * @param str The string to search for $fromAI calls.
-	 * @returns An array of FromAIArgument objects.
-	 *
-	 * This method uses a regular expression to find the start of each $fromAI function call
-	 * in the input string. It then employs a character-by-character parsing approach to
-	 * accurately extract the arguments of each call, handling nested parentheses and quoted strings.
-	 *
-	 * The parsing process:
-	 * 1. Finds the starting position of a $fromAI call using regex.
-	 * 2. Iterates through characters, keeping track of parentheses depth and quote status.
-	 * 3. Handles escaped characters within quotes to avoid premature quote closing.
-	 * 4. Builds the argument string until the matching closing parenthesis is found.
-	 * 5. Parses the extracted argument string into a FromAIArgument object.
-	 * 6. Repeats the process for all $fromAI calls in the input string.
-	 *
-	 */
-	private extractFromAICalls(str: string): FromAIArgument[] {
-		const args: FromAIArgument[] = [];
-		// Regular expression to match the start of a $fromAI function call
-		const pattern = /\$fromAI\s*\(\s*/gi;
-		let match: RegExpExecArray | null;
-
-		while ((match = pattern.exec(str)) !== null) {
-			const startIndex = match.index + match[0].length;
-			let current = startIndex;
-			let inQuotes = false;
-			let quoteChar = '';
-			let parenthesesCount = 1;
-			let argsString = '';
-
-			// Parse the arguments string, handling nested parentheses and quotes
-			while (current < str.length && parenthesesCount > 0) {
-				const char = str[current];
-
-				if (inQuotes) {
-					// Handle characters inside quotes, including escaped characters
-					if (char === '\\' && current + 1 < str.length) {
-						argsString += char + str[current + 1];
-						current += 2;
-						continue;
-					}
-
-					if (char === quoteChar) {
-						inQuotes = false;
-						quoteChar = '';
-					}
-					argsString += char;
-				} else {
-					// Handle characters outside quotes
-					if (['"', "'", '`'].includes(char)) {
-						inQuotes = true;
-						quoteChar = char;
-					} else if (char === '(') {
-						parenthesesCount++;
-					} else if (char === ')') {
-						parenthesesCount--;
-					}
-
-					// Only add characters if we're still inside the main parentheses
-					if (parenthesesCount > 0 || char !== ')') {
-						argsString += char;
-					}
-				}
-
-				current++;
-			}
-
-			// If parentheses are balanced, parse the arguments
-			if (parenthesesCount === 0) {
-				try {
-					const parsedArgs = this.parseArguments(argsString);
-					args.push(parsedArgs);
-				} catch (error) {
-					// If parsing fails, throw an ApplicationError with details
-					throw new NodeOperationError(
-						this.options.node,
-						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
-					);
-				}
-			} else {
-				// Log an error if parentheses are unbalanced
-				throw new NodeOperationError(
-					this.options.node,
-					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
-				);
-			}
-		}
-
-		return args;
-	}
-
-	/**
-	 * Parses the arguments of a single $fromAI function call.
-	 * @param argsString The string containing the function arguments.
-	 * @returns A FromAIArgument object.
-	 */
-	private parseArguments(argsString: string): FromAIArgument {
-		// Split arguments by commas not inside quotes
-		const args: string[] = [];
-		let currentArg = '';
-		let inQuotes = false;
-		let quoteChar = '';
-		let escapeNext = false;
-
-		for (let i = 0; i < argsString.length; i++) {
-			const char = argsString[i];
-
-			if (escapeNext) {
-				currentArg += char;
-				escapeNext = false;
-				continue;
-			}
-
-			if (char === '\\') {
-				escapeNext = true;
-				continue;
-			}
-
-			if (['"', "'", '`'].includes(char)) {
-				if (!inQuotes) {
-					inQuotes = true;
-					quoteChar = char;
-					currentArg += char;
-				} else if (char === quoteChar) {
-					inQuotes = false;
-					quoteChar = '';
-					currentArg += char;
-				} else {
-					currentArg += char;
-				}
-				continue;
-			}
-
-			if (char === ',' && !inQuotes) {
-				args.push(currentArg.trim());
-				currentArg = '';
-				continue;
-			}
-
-			currentArg += char;
-		}
-
-		if (currentArg) {
-			args.push(currentArg.trim());
-		}
-
-		// Remove surrounding quotes if present
-		const cleanArgs = args.map((arg) => {
-			const trimmed = arg.trim();
-			if (
-				(trimmed.startsWith("'") && trimmed.endsWith("'")) ||
-				(trimmed.startsWith('`') && trimmed.endsWith('`')) ||
-				(trimmed.startsWith('"') && trimmed.endsWith('"'))
-			) {
-				return trimmed
-					.slice(1, -1)
-					.replace(/\\'/g, "'")
-					.replace(/\\`/g, '`')
-					.replace(/\\"/g, '"')
-					.replace(/\\\\/g, '\\');
-			}
-			return trimmed;
-		});
-
-		const type = cleanArgs?.[2] || 'string';
-
-		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
-			throw new NodeOperationError(this.options.node, `Invalid type: ${type}`);
-		}
-
-		return {
-			key: cleanArgs[0] || '',
-			description: cleanArgs[1],
-			type: (cleanArgs?.[2] ?? 'string') as AllowedTypes,
-			defaultValue: this.parseDefaultValue(cleanArgs[3]),
-		};
-	}
-
-	/**
-	 * Parses the default value, preserving its original type.
-	 * @param value The default value as a string.
-	 * @returns The parsed default value in its appropriate type.
-	 */
-	private parseDefaultValue(
-		value: string | undefined,
-	): string | number | boolean | Record<string, unknown> | undefined {
-		if (value === undefined || value === '') return undefined;
-		const lowerValue = value.toLowerCase();
-		if (lowerValue === 'true') return true;
-		if (lowerValue === 'false') return false;
-		if (!isNaN(Number(value))) return Number(value);
-		try {
-			return jsonParse(value);
-		} catch {
-			return value;
-		}
-	}
-
-	/**
-	 * Retrieves and validates the Zod schema for the tool.
-	 *
-	 * This method:
-	 * 1. Collects all $fromAI arguments from node parameters
-	 * 2. Validates parameter keys against naming rules
-	 * 3. Checks for duplicate keys and ensures consistency
-	 * 4. Generates a Zod schema from the validated arguments
-	 *
-	 * @throws {NodeOperationError} When parameter keys are invalid or when duplicate keys have inconsistent definitions
-	 * @returns {z.ZodObject} A Zod schema object representing the structure and validation rules for the node parameters
-	 */
-	private getSchema() {
-		const { node } = this.options;
-		const collectedArguments: FromAIArgument[] = [];
-		this.traverseNodeParameters(node.parameters, collectedArguments);
-
-		// Validate each collected argument
-		const nameValidationRegex = /^[a-zA-Z0-9_-]{1,64}$/;
-		const keyMap = new Map<string, FromAIArgument>();
-		for (const argument of collectedArguments) {
-			if (argument.key.length === 0 || !nameValidationRegex.test(argument.key)) {
-				const isEmptyError = 'You must specify a key when using $fromAI()';
-				const isInvalidError = `Parameter key \`${argument.key}\` is invalid`;
-				const error = new Error(argument.key.length === 0 ? isEmptyError : isInvalidError);
-				throw new NodeOperationError(node, error, {
-					description:
-						'Invalid parameter key, must be between 1 and 64 characters long and only contain letters, numbers, underscores, and hyphens',
-				});
-			}
-
-			if (keyMap.has(argument.key)) {
-				// If the key already exists in the Map
-				const existingArg = keyMap.get(argument.key)!;
-
-				// Check if the existing argument has the same description and type
-				if (
-					existingArg.description !== argument.description ||
-					existingArg.type !== argument.type
-				) {
-					// If not, throw an error for inconsistent duplicate keys
-					throw new NodeOperationError(
-						node,
-						`Duplicate key '${argument.key}' found with different description or type`,
-						{
-							description:
-								'Ensure all $fromAI() calls with the same key have consistent descriptions and types',
-						},
-					);
-				}
-				// If the duplicate key has consistent description and type, it's allowed (no action needed)
-			} else {
-				// If the key doesn't exist in the Map, add it
-				keyMap.set(argument.key, argument);
-			}
-		}
-
-		// Remove duplicate keys, latest occurrence takes precedence
-		const uniqueArgsMap = collectedArguments.reduce((map, arg) => {
-			map.set(arg.key, arg);
-			return map;
-		}, new Map<string, FromAIArgument>());
-
-		const uniqueArguments = Array.from(uniqueArgsMap.values());
-
-		// Generate Zod schema from unique arguments
-		const schemaObj = uniqueArguments.reduce((acc: Record<string, z.ZodTypeAny>, placeholder) => {
-			acc[placeholder.key] = this.generateZodSchema(placeholder);
-			return acc;
-		}, {});
-
-		return z.object(schemaObj).required();
-	}
-
-	/**
-	 * Generates a description for a node based on the provided parameters.
-	 * @param node The node type.
-	 * @param nodeParameters The parameters of the node.
-	 * @returns A string description for the node.
-	 */
-	private getDescription(): string {
-		const { node, nodeType } = this.options;
-		const manualDescription = node.parameters.toolDescription as string;
-
-		if (node.parameters.descriptionType === 'auto') {
-			const resource = node.parameters.resource as string;
-			const operation = node.parameters.operation as string;
-			let description = nodeType.description.description;
-			if (resource) {
-				description += `\n Resource: ${resource}`;
-			}
-			if (operation) {
-				description += `\n Operation: ${operation}`;
-			}
-			return description.trim();
-		}
-		if (node.parameters.descriptionType === 'manual') {
-			return manualDescription ?? nodeType.description.description;
-		}
-
-		return nodeType.description.description;
-	}
-
-	/**
-	 * Creates a DynamicStructuredTool from a node.
-	 * @returns A DynamicStructuredTool instance.
-	 */
-	createTool(): DynamicStructuredTool {
-		const { node, nodeType } = this.options;
-		const schema = this.getSchema();
-		const description = this.getDescription();
-		const nodeName = node.name.replace(/ /g, '_');
-		const name = nodeName || nodeType.description.name;
-
-		return new DynamicStructuredTool({
-			name,
-			description,
-			schema,
-			func: async (toolArgs: z.infer<typeof schema>) =>
-				await this.options.handleToolInvocation(toolArgs),
-		});
-	}
-}
-
-/**
- * Converts node into LangChain tool by analyzing node parameters,
- * identifying placeholders using the $fromAI function, and generating a Zod schema. It then creates
- * a DynamicStructuredTool that can be used in LangChain workflows.
- */
-export function createNodeAsTool(options: ParserOptions) {
-	const parser = new AIParametersParser(options);
-	return { response: parser.createTool() };
-}
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts b/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
deleted file mode 100644
index 959ab78845..0000000000
--- a/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import type { IRunData } from 'n8n-workflow';
-
-import { createNodeData, toITaskData } from './helpers';
-import { cleanRunData } from '../cleanRunData';
-import { DirectedGraph } from '../DirectedGraph';
-
-describe('cleanRunData', () => {
-	// ┌─────┐    ┌─────┐   ┌─────┐
-	// │node1├───►│node2├──►│node3│
-	// └─────┘    └─────┘   └─────┘
-	test('deletes all run data of all children and the node being passed in', () => {
-		// ARRANGE
-		const node1 = createNodeData({ name: 'Node1' });
-		const node2 = createNodeData({ name: 'Node2' });
-		const node3 = createNodeData({ name: 'Node3' });
-		const graph = new DirectedGraph()
-			.addNodes(node1, node2, node3)
-			.addConnections({ from: node1, to: node2 }, { from: node2, to: node3 });
-		const runData: IRunData = {
-			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
-			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
-			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
-		};
-
-		// ACT
-		const newRunData = cleanRunData(runData, graph, new Set([node1]));
-
-		// ASSERT
-		expect(newRunData).toEqual({});
-	});
-
-	// ┌─────┐    ┌─────┐   ┌─────┐
-	// │node1├───►│node2├──►│node3│
-	// └─────┘    └─────┘   └─────┘
-	test('retains the run data of parent nodes of the node being passed in', () => {
-		// ARRANGE
-		const node1 = createNodeData({ name: 'Node1' });
-		const node2 = createNodeData({ name: 'Node2' });
-		const node3 = createNodeData({ name: 'Node3' });
-		const graph = new DirectedGraph()
-			.addNodes(node1, node2, node3)
-			.addConnections({ from: node1, to: node2 }, { from: node2, to: node3 });
-		const runData: IRunData = {
-			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
-			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
-			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
-		};
-
-		// ACT
-		const newRunData = cleanRunData(runData, graph, new Set([node2]));
-
-		// ASSERT
-		expect(newRunData).toEqual({ [node1.name]: runData[node1.name] });
-	});
-
-	//     ┌─────┐    ┌─────┐   ┌─────┐
-	//  ┌─►│node1├───►│node2├──►│node3├─┐
-	//  │  └─────┘    └─────┘   └─────┘ │
-	//  │                               │
-	//  └───────────────────────────────┘
-	test('terminates when finding a cycle', () => {
-		// ARRANGE
-		const node1 = createNodeData({ name: 'Node1' });
-		const node2 = createNodeData({ name: 'Node2' });
-		const node3 = createNodeData({ name: 'Node3' });
-		const graph = new DirectedGraph()
-			.addNodes(node1, node2, node3)
-			.addConnections(
-				{ from: node1, to: node2 },
-				{ from: node2, to: node3 },
-				{ from: node3, to: node1 },
-			);
-
-		const runData: IRunData = {
-			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
-			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
-			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
-		};
-
-		// ACT
-		const newRunData = cleanRunData(runData, graph, new Set([node2]));
-
-		// ASSERT
-		// TODO: Find out if this is a desirable result in milestone 2
-		expect(newRunData).toEqual({});
-	});
-
-	// ┌─────┐    ┌─────┐
-	// │node1├───►│node2│
-	// └─────┘    └─────┘
-	test('removes run data of nodes that are not in the subgraph', () => {
-		// ARRANGE
-		const node1 = createNodeData({ name: 'Node1' });
-		const node2 = createNodeData({ name: 'Node2' });
-		const graph = new DirectedGraph()
-			.addNodes(node1, node2)
-			.addConnections({ from: node1, to: node2 });
-		// not part of the graph
-		const node3 = createNodeData({ name: 'Node3' });
-		const runData: IRunData = {
-			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
-			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
-			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
-		};
-
-		// ACT
-		const newRunData = cleanRunData(runData, graph, new Set([node2]));
-
-		// ASSERT
-		expect(newRunData).toEqual({
-			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
-		});
-	});
-});
diff --git a/packages/core/src/PartialExecutionUtils/index.ts b/packages/core/src/PartialExecutionUtils/index.ts
deleted file mode 100644
index f85202cfa1..0000000000
--- a/packages/core/src/PartialExecutionUtils/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export { DirectedGraph } from './DirectedGraph';
-export { findTriggerForPartialExecution } from './findTriggerForPartialExecution';
-export { findStartNodes } from './findStartNodes';
-export { findSubgraph } from './findSubgraph';
-export { recreateNodeExecutionStack } from './recreateNodeExecutionStack';
-export { cleanRunData } from './cleanRunData';
-export { handleCycles } from './handleCycles';
-export { filterDisabledNodes } from './filterDisabledNodes';
diff --git a/packages/core/src/__tests__/credentials.test.ts b/packages/core/src/__tests__/credentials.test.ts
new file mode 100644
index 0000000000..09b7586daf
--- /dev/null
+++ b/packages/core/src/__tests__/credentials.test.ts
@@ -0,0 +1,121 @@
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import type { CredentialInformation } from 'n8n-workflow';
+import { AssertionError } from 'node:assert';
+
+import { CREDENTIAL_ERRORS } from '@/constants';
+import { Cipher } from '@/encryption/cipher';
+import type { InstanceSettings } from '@/instance-settings';
+
+import { Credentials } from '../credentials';
+
+describe('Credentials', () => {
+	const nodeCredentials = { id: '123', name: 'Test Credential' };
+	const credentialType = 'testApi';
+
+	const cipher = new Cipher(mock<InstanceSettings>({ encryptionKey: 'password' }));
+	Container.set(Cipher, cipher);
+
+	const setDataKey = (credentials: Credentials, key: string, data: CredentialInformation) => {
+		let fullData;
+		try {
+			fullData = credentials.getData();
+		} catch (e) {
+			fullData = {};
+		}
+		fullData[key] = data;
+		return credentials.setData(fullData);
+	};
+
+	describe('without nodeType set', () => {
+		test('should be able to set and read key data without initial data set', () => {
+			const credentials = new Credentials(nodeCredentials, credentialType);
+
+			const key = 'key1';
+			const newData = 1234;
+
+			setDataKey(credentials, key, newData);
+
+			expect(credentials.getData()[key]).toEqual(newData);
+		});
+
+		test('should be able to set and read key data with initial data set', () => {
+			const key = 'key2';
+
+			// Saved under "key1"
+			const initialData = 4321;
+			const initialDataEncoded = 'U2FsdGVkX1+0baznXt+Ag/ub8A2kHLyoLxn/rR9h4XQ=';
+
+			const credentials = new Credentials(nodeCredentials, credentialType, initialDataEncoded);
+
+			const newData = 1234;
+
+			// Set and read new data
+			setDataKey(credentials, key, newData);
+			expect(credentials.getData()[key]).toEqual(newData);
+
+			// Read the data which got provided encrypted on init
+			expect(credentials.getData().key1).toEqual(initialData);
+		});
+	});
+
+	describe('getData', () => {
+		test('should throw an error when data is missing', () => {
+			const credentials = new Credentials(nodeCredentials, credentialType);
+			credentials.data = undefined;
+
+			expect(() => credentials.getData()).toThrow(CREDENTIAL_ERRORS.NO_DATA);
+		});
+
+		test('should throw an error when decryption fails', () => {
+			const credentials = new Credentials(nodeCredentials, credentialType);
+			credentials.data = '{"key": "already-decrypted-credentials-data" }';
+
+			expect(() => credentials.getData()).toThrow(CREDENTIAL_ERRORS.DECRYPTION_FAILED);
+
+			try {
+				credentials.getData();
+			} catch (error) {
+				expect(error.constructor.name).toBe('CredentialDataError');
+				expect(error.extra).toEqual({ ...nodeCredentials, type: credentialType });
+				expect((error.cause.code as string).startsWith('ERR_OSSL_')).toBe(true);
+			}
+		});
+
+		test('should throw an error when JSON parsing fails', () => {
+			const credentials = new Credentials(nodeCredentials, credentialType);
+			credentials.data = cipher.encrypt('invalid-json-string');
+
+			expect(() => credentials.getData()).toThrow(CREDENTIAL_ERRORS.INVALID_JSON);
+
+			try {
+				credentials.getData();
+			} catch (error) {
+				expect(error.constructor.name).toBe('CredentialDataError');
+				expect(error.extra).toEqual({ ...nodeCredentials, type: credentialType });
+				expect(error.cause).toBeInstanceOf(SyntaxError);
+				expect(error.cause.message).toMatch('Unexpected token ');
+			}
+		});
+
+		test('should successfully decrypt and parse valid JSON credentials', () => {
+			const credentials = new Credentials(nodeCredentials, credentialType);
+			credentials.setData({ username: 'testuser', password: 'testpass' });
+
+			const decryptedData = credentials.getData();
+			expect(decryptedData.username).toBe('testuser');
+			expect(decryptedData.password).toBe('testpass');
+		});
+	});
+
+	describe('setData', () => {
+		test.each<{}>([[123], [null], [undefined]])(
+			'should throw an AssertionError when data is %s',
+			(data) => {
+				const credentials = new Credentials<{}>(nodeCredentials, credentialType);
+
+				expect(() => credentials.setData(data)).toThrow(AssertionError);
+			},
+		);
+	});
+});
diff --git a/packages/core/src/__tests__/node-execute-functions.test.ts b/packages/core/src/__tests__/node-execute-functions.test.ts
new file mode 100644
index 0000000000..96306ac90b
--- /dev/null
+++ b/packages/core/src/__tests__/node-execute-functions.test.ts
@@ -0,0 +1,314 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	INode,
+	IRequestOptions,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+} from 'n8n-workflow';
+import nock from 'nock';
+
+import type { ExecutionLifecycleHooks } from '@/execution-engine/execution-lifecycle-hooks';
+import {
+	copyInputItems,
+	invokeAxios,
+	proxyRequestToAxios,
+	removeEmptyBody,
+} from '@/node-execute-functions';
+
+describe('NodeExecuteFunctions', () => {
+	describe('proxyRequestToAxios', () => {
+		const baseUrl = 'http://example.de';
+		const workflow = mock<Workflow>();
+		const hooks = mock<ExecutionLifecycleHooks>();
+		const additionalData = mock<IWorkflowExecuteAdditionalData>({ hooks });
+		const node = mock<INode>();
+
+		beforeEach(() => {
+			hooks.runHook.mockClear();
+		});
+
+		test('should rethrow an error with `status` property', async () => {
+			nock(baseUrl).get('/test').reply(400);
+
+			try {
+				await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
+			} catch (error) {
+				expect(error.status).toEqual(400);
+			}
+		});
+
+		test('should not throw if the response status is 200', async () => {
+			nock(baseUrl).get('/test').reply(200);
+			await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
+			expect(hooks.runHook).toHaveBeenCalledWith('nodeFetchedData', [workflow.id, node]);
+		});
+
+		test('should throw if the response status is 403', async () => {
+			const headers = { 'content-type': 'text/plain' };
+			nock(baseUrl).get('/test').reply(403, 'Forbidden', headers);
+			try {
+				await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
+			} catch (error) {
+				expect(error.statusCode).toEqual(403);
+				expect(error.request).toBeUndefined();
+				expect(error.response).toMatchObject({ headers, status: 403 });
+				expect(error.options).toMatchObject({
+					headers: { Accept: '*/*' },
+					method: 'get',
+					url: 'http://example.de/test',
+				});
+				expect(error.config).toBeUndefined();
+				expect(error.message).toEqual('403 - "Forbidden"');
+			}
+			expect(hooks.runHook).not.toHaveBeenCalled();
+		});
+
+		test('should not throw if the response status is 404, but `simple` option is set to `false`', async () => {
+			nock(baseUrl).get('/test').reply(404, 'Not Found');
+			const response = await proxyRequestToAxios(workflow, additionalData, node, {
+				url: `${baseUrl}/test`,
+				simple: false,
+			});
+
+			expect(response).toEqual('Not Found');
+			expect(hooks.runHook).toHaveBeenCalledWith('nodeFetchedData', [workflow.id, node]);
+		});
+
+		test('should return full response when `resolveWithFullResponse` is set to true', async () => {
+			nock(baseUrl).get('/test').reply(404, 'Not Found');
+			const response = await proxyRequestToAxios(workflow, additionalData, node, {
+				url: `${baseUrl}/test`,
+				resolveWithFullResponse: true,
+				simple: false,
+			});
+
+			expect(response).toMatchObject({
+				body: 'Not Found',
+				headers: {},
+				statusCode: 404,
+				statusMessage: 'Not Found',
+			});
+			expect(hooks.runHook).toHaveBeenCalledWith('nodeFetchedData', [workflow.id, node]);
+		});
+
+		describe('redirects', () => {
+			test('should forward authorization header', async () => {
+				nock(baseUrl).get('/redirect').reply(301, '', { Location: 'https://otherdomain.com/test' });
+				nock('https://otherdomain.com')
+					.get('/test')
+					.reply(200, function () {
+						return this.req.headers;
+					});
+
+				const response = await proxyRequestToAxios(workflow, additionalData, node, {
+					url: `${baseUrl}/redirect`,
+					auth: {
+						username: 'testuser',
+						password: 'testpassword',
+					},
+					headers: {
+						'X-Other-Header': 'otherHeaderContent',
+					},
+					resolveWithFullResponse: true,
+				});
+
+				expect(response.statusCode).toBe(200);
+				const forwardedHeaders = JSON.parse(response.body);
+				expect(forwardedHeaders.authorization).toBe('Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk');
+				expect(forwardedHeaders['x-other-header']).toBe('otherHeaderContent');
+			});
+
+			test('should follow redirects by default', async () => {
+				nock(baseUrl)
+					.get('/redirect')
+					.reply(301, '', { Location: `${baseUrl}/test` });
+				nock(baseUrl).get('/test').reply(200, 'Redirected');
+
+				const response = await proxyRequestToAxios(workflow, additionalData, node, {
+					url: `${baseUrl}/redirect`,
+					resolveWithFullResponse: true,
+				});
+
+				expect(response).toMatchObject({
+					body: 'Redirected',
+					headers: {},
+					statusCode: 200,
+				});
+			});
+
+			test('should not follow redirects when configured', async () => {
+				nock(baseUrl)
+					.get('/redirect')
+					.reply(301, '', { Location: `${baseUrl}/test` });
+				nock(baseUrl).get('/test').reply(200, 'Redirected');
+
+				await expect(
+					proxyRequestToAxios(workflow, additionalData, node, {
+						url: `${baseUrl}/redirect`,
+						resolveWithFullResponse: true,
+						followRedirect: false,
+					}),
+				).rejects.toThrowError(expect.objectContaining({ statusCode: 301 }));
+			});
+		});
+	});
+
+	describe('invokeAxios', () => {
+		const baseUrl = 'http://example.de';
+
+		beforeEach(() => {
+			nock.cleanAll();
+			jest.clearAllMocks();
+		});
+
+		it('should throw error for non-401 status codes', async () => {
+			nock(baseUrl).get('/test').reply(500, {});
+
+			await expect(invokeAxios({ url: `${baseUrl}/test` })).rejects.toThrow(
+				'Request failed with status code 500',
+			);
+		});
+
+		it('should throw error on 401 without digest auth challenge', async () => {
+			nock(baseUrl).get('/test').reply(401, {});
+
+			await expect(
+				invokeAxios(
+					{
+						url: `${baseUrl}/test`,
+					},
+					{ sendImmediately: false },
+				),
+			).rejects.toThrow('Request failed with status code 401');
+		});
+
+		it('should make successful requests', async () => {
+			nock(baseUrl).get('/test').reply(200, { success: true });
+
+			const response = await invokeAxios({
+				url: `${baseUrl}/test`,
+			});
+
+			expect(response.status).toBe(200);
+			expect(response.data).toEqual({ success: true });
+		});
+
+		it('should handle digest auth when receiving 401 with nonce', async () => {
+			nock(baseUrl)
+				.get('/test')
+				.matchHeader('authorization', 'Basic dXNlcjpwYXNz')
+				.once()
+				.reply(401, {}, { 'www-authenticate': 'Digest realm="test", nonce="abc123", qop="auth"' });
+
+			nock(baseUrl)
+				.get('/test')
+				.matchHeader(
+					'authorization',
+					/^Digest username="user",realm="test",nonce="abc123",uri="\/test",qop="auth",algorithm="MD5",response="[0-9a-f]{32}"/,
+				)
+				.reply(200, { success: true });
+
+			const response = await invokeAxios(
+				{
+					url: `${baseUrl}/test`,
+					auth: {
+						username: 'user',
+						password: 'pass',
+					},
+				},
+				{ sendImmediately: false },
+			);
+
+			expect(response.status).toBe(200);
+			expect(response.data).toEqual({ success: true });
+		});
+	});
+
+	describe('copyInputItems', () => {
+		it('should pick only selected properties', () => {
+			const output = copyInputItems(
+				[
+					{
+						json: {
+							a: 1,
+							b: true,
+							c: {},
+						},
+					},
+				],
+				['a'],
+			);
+			expect(output).toEqual([{ a: 1 }]);
+		});
+
+		it('should convert undefined to null', () => {
+			const output = copyInputItems(
+				[
+					{
+						json: {
+							a: undefined,
+						},
+					},
+				],
+				['a'],
+			);
+			expect(output).toEqual([{ a: null }]);
+		});
+
+		it('should clone objects', () => {
+			const input = {
+				a: { b: 5 },
+			};
+			const output = copyInputItems(
+				[
+					{
+						json: input,
+					},
+				],
+				['a'],
+			);
+			expect(output[0].a).toEqual(input.a);
+			expect(output[0].a === input.a).toEqual(false);
+		});
+	});
+
+	describe('removeEmptyBody', () => {
+		test.each(['GET', 'HEAD', 'OPTIONS'] as IHttpRequestMethods[])(
+			'Should remove empty body for %s',
+			async (method) => {
+				const requestOptions = {
+					method,
+					body: {},
+				} as IHttpRequestOptions | IRequestOptions;
+				removeEmptyBody(requestOptions);
+				expect(requestOptions.body).toEqual(undefined);
+			},
+		);
+
+		test.each(['GET', 'HEAD', 'OPTIONS'] as IHttpRequestMethods[])(
+			'Should not remove non-empty body for %s',
+			async (method) => {
+				const requestOptions = {
+					method,
+					body: { test: true },
+				} as IHttpRequestOptions | IRequestOptions;
+				removeEmptyBody(requestOptions);
+				expect(requestOptions.body).toEqual({ test: true });
+			},
+		);
+
+		test.each(['POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
+			'Should not remove empty body for %s',
+			async (method) => {
+				const requestOptions = {
+					method,
+					body: {},
+				} as IHttpRequestOptions | IRequestOptions;
+				removeEmptyBody(requestOptions);
+				expect(requestOptions.body).toEqual({});
+			},
+		);
+	});
+});
diff --git a/packages/core/test/FileSystem.manager.test.ts b/packages/core/src/binary-data/__tests__/file-system.manager.test.ts
similarity index 96%
rename from packages/core/test/FileSystem.manager.test.ts
rename to packages/core/src/binary-data/__tests__/file-system.manager.test.ts
index edb6bd5e77..fae24801f5 100644
--- a/packages/core/test/FileSystem.manager.test.ts
+++ b/packages/core/src/binary-data/__tests__/file-system.manager.test.ts
@@ -3,10 +3,9 @@ import fsp from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 
-import { FileSystemManager } from '@/BinaryData/FileSystem.manager';
-import { isStream } from '@/ObjectStore/utils';
-
-import { toFileId, toStream } from './utils';
+import { FileSystemManager } from '@/binary-data/file-system.manager';
+import { isStream } from '@/binary-data/object-store/utils';
+import { toFileId, toStream } from '@test/utils';
 
 jest.mock('fs');
 jest.mock('fs/promises');
diff --git a/packages/core/test/ObjectStore.manager.test.ts b/packages/core/src/binary-data/__tests__/object-store.manager.test.ts
similarity index 91%
rename from packages/core/test/ObjectStore.manager.test.ts
rename to packages/core/src/binary-data/__tests__/object-store.manager.test.ts
index f01e170213..9ca99e8d7b 100644
--- a/packages/core/test/ObjectStore.manager.test.ts
+++ b/packages/core/src/binary-data/__tests__/object-store.manager.test.ts
@@ -1,12 +1,11 @@
 import { mock } from 'jest-mock-extended';
 import fs from 'node:fs/promises';
 
-import { ObjectStoreManager } from '@/BinaryData/ObjectStore.manager';
-import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
-import type { MetadataResponseHeaders } from '@/ObjectStore/types';
-import { isStream } from '@/ObjectStore/utils';
-
-import { mockInstance, toFileId, toStream } from './utils';
+import { ObjectStoreService } from '@/binary-data/object-store/object-store.service.ee';
+import type { MetadataResponseHeaders } from '@/binary-data/object-store/types';
+import { isStream } from '@/binary-data/object-store/utils';
+import { ObjectStoreManager } from '@/binary-data/object-store.manager';
+import { mockInstance, toFileId, toStream } from '@test/utils';
 
 jest.mock('fs/promises');
 
diff --git a/packages/core/test/BinaryData/utils.test.ts b/packages/core/src/binary-data/__tests__/utils.test.ts
similarity index 95%
rename from packages/core/test/BinaryData/utils.test.ts
rename to packages/core/src/binary-data/__tests__/utils.test.ts
index 50a7f165df..329345262f 100644
--- a/packages/core/test/BinaryData/utils.test.ts
+++ b/packages/core/src/binary-data/__tests__/utils.test.ts
@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { createGunzip } from 'node:zlib';
 
-import { binaryToBuffer } from '@/BinaryData/utils';
+import { binaryToBuffer } from '@/binary-data/utils';
 
 describe('BinaryData/utils', () => {
 	describe('binaryToBuffer', () => {
diff --git a/packages/core/src/BinaryData/BinaryData.service.ts b/packages/core/src/binary-data/binary-data.service.ts
similarity index 96%
rename from packages/core/src/BinaryData/BinaryData.service.ts
rename to packages/core/src/binary-data/binary-data.service.ts
index 5876ae075e..742ceb500f 100644
--- a/packages/core/src/BinaryData/BinaryData.service.ts
+++ b/packages/core/src/binary-data/binary-data.service.ts
@@ -22,7 +22,7 @@ export class BinaryDataService {
 		this.mode = config.mode === 'filesystem' ? 'filesystem-v2' : config.mode;
 
 		if (config.availableModes.includes('filesystem')) {
-			const { FileSystemManager } = await import('./FileSystem.manager');
+			const { FileSystemManager } = await import('./file-system.manager');
 
 			this.managers.filesystem = new FileSystemManager(config.localStoragePath);
 			this.managers['filesystem-v2'] = this.managers.filesystem;
@@ -31,8 +31,8 @@ export class BinaryDataService {
 		}
 
 		if (config.availableModes.includes('s3')) {
-			const { ObjectStoreManager } = await import('./ObjectStore.manager');
-			const { ObjectStoreService } = await import('../ObjectStore/ObjectStore.service.ee');
+			const { ObjectStoreManager } = await import('./object-store.manager');
+			const { ObjectStoreService } = await import('./object-store/object-store.service.ee');
 
 			this.managers.s3 = new ObjectStoreManager(Container.get(ObjectStoreService));
 
diff --git a/packages/core/src/BinaryData/FileSystem.manager.ts b/packages/core/src/binary-data/file-system.manager.ts
similarity index 100%
rename from packages/core/src/BinaryData/FileSystem.manager.ts
rename to packages/core/src/binary-data/file-system.manager.ts
diff --git a/packages/core/src/binary-data/index.ts b/packages/core/src/binary-data/index.ts
new file mode 100644
index 0000000000..ef82dee30f
--- /dev/null
+++ b/packages/core/src/binary-data/index.ts
@@ -0,0 +1,4 @@
+export * from './binary-data.service';
+export * from './types';
+export { ObjectStoreService } from './object-store/object-store.service.ee';
+export { isStoredMode as isValidNonDefaultMode } from './utils';
diff --git a/packages/core/src/BinaryData/ObjectStore.manager.ts b/packages/core/src/binary-data/object-store.manager.ts
similarity index 97%
rename from packages/core/src/BinaryData/ObjectStore.manager.ts
rename to packages/core/src/binary-data/object-store.manager.ts
index 5a2ab8ef55..cc0fa564ce 100644
--- a/packages/core/src/BinaryData/ObjectStore.manager.ts
+++ b/packages/core/src/binary-data/object-store.manager.ts
@@ -3,9 +3,9 @@ import fs from 'node:fs/promises';
 import type { Readable } from 'node:stream';
 import { v4 as uuid } from 'uuid';
 
+import { ObjectStoreService } from './object-store/object-store.service.ee';
 import type { BinaryData } from './types';
 import { binaryToBuffer } from './utils';
-import { ObjectStoreService } from '../ObjectStore/ObjectStore.service.ee';
 
 @Service()
 export class ObjectStoreManager implements BinaryData.Manager {
diff --git a/packages/core/test/ObjectStore.service.test.ts b/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
similarity index 59%
rename from packages/core/test/ObjectStore.service.test.ts
rename to packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
index 9899ad17fc..ca8f4c0c94 100644
--- a/packages/core/test/ObjectStore.service.test.ts
+++ b/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
@@ -1,9 +1,10 @@
+import type { S3Config } from '@n8n/config';
 import axios from 'axios';
 import { mock } from 'jest-mock-extended';
 import { Readable } from 'stream';
 
-import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
-import { writeBlockedMessage } from '@/ObjectStore/utils';
+import { ObjectStoreService } from '@/binary-data/object-store/object-store.service.ee';
+import { writeBlockedMessage } from '@/binary-data/object-store/utils';
 
 jest.mock('axios');
 
@@ -18,6 +19,12 @@ const mockError = new Error('Something went wrong!');
 const fileId =
 	'workflows/ObogjVbqpNOQpiyV/executions/999/binary_data/71f6209b-5d48-41a2-a224-80d529d8bb32';
 const mockBuffer = Buffer.from('Test data');
+const s3Config = mock<S3Config>({
+	host: mockHost,
+	bucket: mockBucket,
+	credentials: mockCredentials,
+	protocol: 'https',
+});
 
 const toDeletionXml = (filename: string) => `<Delete>
 <Object><Key>${filename}</Key></Object>
@@ -25,10 +32,13 @@ const toDeletionXml = (filename: string) => `<Delete>
 
 let objectStoreService: ObjectStoreService;
 
+const now = new Date('2024-02-01T01:23:45.678Z');
+jest.useFakeTimers({ now });
+
 beforeEach(async () => {
-	objectStoreService = new ObjectStoreService(mock());
+	objectStoreService = new ObjectStoreService(mock(), s3Config);
 	mockAxios.request.mockResolvedValueOnce({ status: 200 }); // for checkConnection
-	await objectStoreService.init(mockHost, mockBucket, mockCredentials);
+	await objectStoreService.init();
 	jest.restoreAllMocks();
 });
 
@@ -40,17 +50,17 @@ describe('checkConnection()', () => {
 
 		await objectStoreService.checkConnection();
 
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'HEAD',
-				url: `https://${mockHost}/${mockBucket.name}`,
-				headers: expect.objectContaining({
-					'X-Amz-Content-Sha256': expect.any(String),
-					'X-Amz-Date': expect.any(String),
-					Authorization: expect.any(String),
-				}),
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'HEAD',
+			url: 'https://s3.us-east-1.amazonaws.com/test-bucket',
+			headers: {
+				Host: 's3.us-east-1.amazonaws.com',
+				'X-Amz-Content-Sha256': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
+				'X-Amz-Date': '20240201T012345Z',
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=a5240c11a706e9e6c60e7033a848fc934911b12330e5a4609b0b943f97d9781b',
+			},
+		});
 	});
 
 	it('should throw an error on request failure', async () => {
@@ -70,18 +80,17 @@ describe('getMetadata()', () => {
 
 		await objectStoreService.getMetadata(fileId);
 
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'HEAD',
-				url: `${mockUrl}/${fileId}`,
-				headers: expect.objectContaining({
-					Host: mockHost,
-					'X-Amz-Content-Sha256': expect.any(String),
-					'X-Amz-Date': expect.any(String),
-					Authorization: expect.any(String),
-				}),
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'HEAD',
+			url: `${mockUrl}/${fileId}`,
+			headers: {
+				Host: mockHost,
+				'X-Amz-Content-Sha256': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
+				'X-Amz-Date': '20240201T012345Z',
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=60e11c39580ad7dd3a3d549523e7115cdff018540f24c6412ed40053e52a21d0',
+			},
+		});
 	});
 
 	it('should throw an error on request failure', async () => {
@@ -101,19 +110,22 @@ describe('put()', () => {
 
 		await objectStoreService.put(fileId, mockBuffer, metadata);
 
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'PUT',
-				url: `${mockUrl}/${fileId}`,
-				headers: expect.objectContaining({
-					'Content-Length': mockBuffer.length,
-					'Content-MD5': expect.any(String),
-					'x-amz-meta-filename': metadata.fileName,
-					'Content-Type': metadata.mimeType,
-				}),
-				data: mockBuffer,
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'PUT',
+			url: 'https://s3.us-east-1.amazonaws.com/test-bucket/workflows/ObogjVbqpNOQpiyV/executions/999/binary_data/71f6209b-5d48-41a2-a224-80d529d8bb32',
+			headers: {
+				'Content-Length': 9,
+				'Content-MD5': 'yh6gLBC3w39CW5t92G1eEQ==',
+				'x-amz-meta-filename': 'file.txt',
+				'Content-Type': 'text/plain',
+				Host: 's3.us-east-1.amazonaws.com',
+				'X-Amz-Content-Sha256': 'e27c8214be8b7cf5bccc7c08247e3cb0c1514a48ee1f63197fe4ef3ef51d7e6f',
+				'X-Amz-Date': '20240201T012345Z',
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=content-length;content-md5;content-type;host;x-amz-content-sha256;x-amz-date;x-amz-meta-filename, Signature=6b0fbb51a35dbfa73ac79a964ffc7203b40517a062efc5b01f5f9b7ad553fa7a',
+			},
+			data: mockBuffer,
+		});
 	});
 
 	it('should block if read-only', async () => {
@@ -152,13 +164,18 @@ describe('get()', () => {
 
 		const result = await objectStoreService.get(fileId, { mode: 'buffer' });
 
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'GET',
-				url: `${mockUrl}/${fileId}`,
-				responseType: 'arraybuffer',
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'GET',
+			url: `${mockUrl}/${fileId}`,
+			responseType: 'arraybuffer',
+			headers: {
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=5f69680786e0ad9f0a0324eb5e4b8fe8c78562afc924489ea423632a2ad2187d',
+				Host: 's3.us-east-1.amazonaws.com',
+				'X-Amz-Content-Sha256': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
+				'X-Amz-Date': '20240201T012345Z',
+			},
+		});
 
 		expect(Buffer.isBuffer(result)).toBe(true);
 	});
@@ -168,13 +185,18 @@ describe('get()', () => {
 
 		const result = await objectStoreService.get(fileId, { mode: 'stream' });
 
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'GET',
-				url: `${mockUrl}/${fileId}`,
-				responseType: 'stream',
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'GET',
+			url: `${mockUrl}/${fileId}`,
+			responseType: 'stream',
+			headers: {
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=3ef579ebe2ae89303a89c0faf3ce8ef8e907295dc538d59e95bcf35481c0d03e',
+				Host: 's3.us-east-1.amazonaws.com',
+				'X-Amz-Content-Sha256': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
+				'X-Amz-Date': '20240201T012345Z',
+			},
+		});
 
 		expect(result instanceof Readable).toBe(true);
 	});
@@ -194,12 +216,17 @@ describe('deleteOne()', () => {
 
 		await objectStoreService.deleteOne(fileId);
 
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'DELETE',
-				url: `${mockUrl}/${fileId}`,
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'DELETE',
+			url: `${mockUrl}/${fileId}`,
+			headers: {
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=host;x-amz-content-sha256;x-amz-date, Signature=4ad61b1b4da335c6c49772d28e54a301f787d199c9403055b217f890f7aec7fc',
+				Host: 's3.us-east-1.amazonaws.com',
+				'X-Amz-Content-Sha256': 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855',
+				'X-Amz-Date': '20240201T012345Z',
+			},
+		});
 	});
 
 	it('should throw an error on request failure', async () => {
@@ -232,19 +259,21 @@ describe('deleteMany()', () => {
 
 		await objectStoreService.deleteMany(prefix);
 
-		expect(objectStoreService.list).toHaveBeenCalledWith(prefix);
-		expect(mockAxios.request).toHaveBeenCalledWith(
-			expect.objectContaining({
-				method: 'POST',
-				url: `${mockUrl}/?delete`,
-				headers: expect.objectContaining({
-					'Content-Type': 'application/xml',
-					'Content-Length': expect.any(Number),
-					'Content-MD5': expect.any(String),
-				}),
-				data: toDeletionXml(fileName),
-			}),
-		);
+		expect(mockAxios.request).toHaveBeenCalledWith({
+			method: 'POST',
+			url: `${mockUrl}?delete=`,
+			headers: {
+				'Content-Type': 'application/xml',
+				'Content-Length': 55,
+				'Content-MD5': 'ybYDrpQxwYvNIGBQs7PJNA==',
+				Host: 's3.us-east-1.amazonaws.com',
+				'X-Amz-Content-Sha256': '5708e5c935cb75eb528e41ef1548e08b26c5b3b7504b67dc911abc1ff1881f76',
+				'X-Amz-Date': '20240201T012345Z',
+				Authorization:
+					'AWS4-HMAC-SHA256 Credential=mock-access-key/20240201/us-east-1/s3/aws4_request, SignedHeaders=content-length;content-md5;content-type;host;x-amz-content-sha256;x-amz-date, Signature=039168f10927b31624f3a5edae8eb4c89405f7c594eb2d6e00257c1462363f99',
+			},
+			data: toDeletionXml(fileName),
+		});
 	});
 
 	it('should not send a deletion request if no prefix match', async () => {
diff --git a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts b/packages/core/src/binary-data/object-store/object-store.service.ee.ts
similarity index 74%
rename from packages/core/src/ObjectStore/ObjectStore.service.ee.ts
rename to packages/core/src/binary-data/object-store/object-store.service.ee.ts
index e1b98c6f50..5561bd61db 100644
--- a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
+++ b/packages/core/src/binary-data/object-store/object-store.service.ee.ts
@@ -1,6 +1,7 @@
+import { S3Config } from '@n8n/config';
 import { Service } from '@n8n/di';
 import { sign } from 'aws4';
-import type { Request as Aws4Options, Credentials as Aws4Credentials } from 'aws4';
+import type { Request as Aws4Options } from 'aws4';
 import axios from 'axios';
 import type { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig, Method } from 'axios';
 import { ApplicationError } from 'n8n-workflow';
@@ -9,43 +10,41 @@ import type { Readable } from 'stream';
 
 import { Logger } from '@/logging/logger';
 
-import type {
-	Bucket,
-	ConfigSchemaCredentials,
-	ListPage,
-	MetadataResponseHeaders,
-	RawListPage,
-	RequestOptions,
-} from './types';
+import type { ListPage, MetadataResponseHeaders, RawListPage, RequestOptions } from './types';
 import { isStream, parseXml, writeBlockedMessage } from './utils';
-import type { BinaryData } from '../BinaryData/types';
+import type { BinaryData } from '../types';
 
 @Service()
 export class ObjectStoreService {
-	private host = '';
-
-	private bucket: Bucket = { region: '', name: '' };
-
-	private credentials: Aws4Credentials = { accessKeyId: '', secretAccessKey: '' };
+	private baseUrl: URL;
 
 	private isReady = false;
 
 	private isReadOnly = false;
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly s3Config: S3Config,
+	) {
+		const { host, bucket, protocol } = s3Config;
 
-	async init(host: string, bucket: Bucket, credentials: ConfigSchemaCredentials) {
-		this.host = host;
-		this.bucket.name = bucket.name;
-		this.bucket.region = bucket.region;
+		if (host === '') {
+			throw new ApplicationError(
+				'External storage host not configured. Please set `N8N_EXTERNAL_STORAGE_S3_HOST`.',
+			);
+		}
 
-		this.credentials = {
-			accessKeyId: credentials.accessKey,
-			secretAccessKey: credentials.accessSecret,
-		};
+		if (bucket.name === '') {
+			throw new ApplicationError(
+				'External storage bucket name not configured. Please set `N8N_EXTERNAL_STORAGE_S3_BUCKET_NAME`.',
+			);
+		}
 
+		this.baseUrl = new URL(`${protocol}://${host}/${bucket.name}`);
+	}
+
+	async init() {
 		await this.checkConnection();
-
 		this.setReady(true);
 	}
 
@@ -65,7 +64,7 @@ export class ObjectStoreService {
 	async checkConnection() {
 		if (this.isReady) return;
 
-		return await this.request('HEAD', this.host, this.bucket.name);
+		return await this.request('HEAD', '');
 	}
 
 	/**
@@ -84,9 +83,7 @@ export class ObjectStoreService {
 		if (metadata.fileName) headers['x-amz-meta-filename'] = metadata.fileName;
 		if (metadata.mimeType) headers['Content-Type'] = metadata.mimeType;
 
-		const path = `/${this.bucket.name}/${filename}`;
-
-		return await this.request('PUT', this.host, path, { headers, body: buffer });
+		return await this.request('PUT', filename, { headers, body: buffer });
 	}
 
 	/**
@@ -97,9 +94,7 @@ export class ObjectStoreService {
 	async get(fileId: string, { mode }: { mode: 'buffer' }): Promise<Buffer>;
 	async get(fileId: string, { mode }: { mode: 'stream' }): Promise<Readable>;
 	async get(fileId: string, { mode }: { mode: 'stream' | 'buffer' }) {
-		const path = `${this.bucket.name}/${fileId}`;
-
-		const { data } = await this.request('GET', this.host, path, {
+		const { data } = await this.request('GET', fileId, {
 			responseType: mode === 'buffer' ? 'arraybuffer' : 'stream',
 		});
 
@@ -116,9 +111,7 @@ export class ObjectStoreService {
 	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingMetadata.html
 	 */
 	async getMetadata(fileId: string) {
-		const path = `${this.bucket.name}/${fileId}`;
-
-		const response = await this.request('HEAD', this.host, path);
+		const response = await this.request('HEAD', fileId);
 
 		return response.headers as MetadataResponseHeaders;
 	}
@@ -129,9 +122,7 @@ export class ObjectStoreService {
 	 * @doc https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
 	 */
 	async deleteOne(fileId: string) {
-		const path = `${this.bucket.name}/${fileId}`;
-
-		return await this.request('DELETE', this.host, path);
+		return await this.request('DELETE', fileId);
 	}
 
 	/**
@@ -154,9 +145,7 @@ export class ObjectStoreService {
 			'Content-MD5': createHash('md5').update(body).digest('base64'),
 		};
 
-		const path = `${this.bucket.name}/?delete`;
-
-		return await this.request('POST', this.host, path, { headers, body });
+		return await this.request('POST', '', { headers, body, qs: { delete: '' } });
 	}
 
 	/**
@@ -192,7 +181,7 @@ export class ObjectStoreService {
 
 		if (nextPageToken) qs['continuation-token'] = nextPageToken;
 
-		const { data } = await this.request('GET', this.host, this.bucket.name, { qs });
+		const { data } = await this.request('GET', '', { qs });
 
 		if (typeof data !== 'string') {
 			throw new TypeError(`Expected XML string but received ${typeof data}`);
@@ -215,18 +204,6 @@ export class ObjectStoreService {
 		return page as ListPage;
 	}
 
-	private toPath(rawPath: string, qs?: Record<string, string | number>) {
-		const path = rawPath.startsWith('/') ? rawPath : `/${rawPath}`;
-
-		if (!qs) return path;
-
-		const qsParams = Object.entries(qs)
-			.map(([key, value]) => `${key}=${value}`)
-			.join('&');
-
-		return path.concat(`?${qsParams}`);
-	}
-
 	private async blockWrite(filename: string): Promise<AxiosResponse> {
 		const logMessage = writeBlockedMessage(filename);
 
@@ -243,28 +220,37 @@ export class ObjectStoreService {
 
 	private async request<T>(
 		method: Method,
-		host: string,
 		rawPath = '',
 		{ qs, headers, body, responseType }: RequestOptions = {},
 	) {
-		const path = this.toPath(rawPath, qs);
+		const url = new URL(this.baseUrl);
+		if (rawPath && rawPath !== '/') {
+			url.pathname = `${url.pathname}/${rawPath}`;
+		}
+		Object.entries(qs ?? {}).forEach(([key, value]) => {
+			url.searchParams.set(key, String(value));
+		});
 
 		const optionsToSign: Aws4Options = {
 			method,
 			service: 's3',
-			region: this.bucket.region,
-			host,
-			path,
+			region: this.s3Config.bucket.region,
+			host: this.s3Config.host,
+			path: `${url.pathname}${url.search}`,
 		};
 
 		if (headers) optionsToSign.headers = headers;
 		if (body) optionsToSign.body = body;
 
-		const signedOptions = sign(optionsToSign, this.credentials);
+		const { accessKey, accessSecret } = this.s3Config.credentials;
+		const signedOptions = sign(optionsToSign, {
+			accessKeyId: accessKey,
+			secretAccessKey: accessSecret,
+		});
 
 		const config: AxiosRequestConfig = {
 			method,
-			url: `https://${host}${path}`,
+			url: url.toString(),
 			headers: signedOptions.headers,
 		};
 
diff --git a/packages/core/src/ObjectStore/types.ts b/packages/core/src/binary-data/object-store/types.ts
similarity index 81%
rename from packages/core/src/ObjectStore/types.ts
rename to packages/core/src/binary-data/object-store/types.ts
index d0b7ab0713..20390cf243 100644
--- a/packages/core/src/ObjectStore/types.ts
+++ b/packages/core/src/binary-data/object-store/types.ts
@@ -1,6 +1,6 @@
 import type { AxiosResponseHeaders, ResponseType } from 'axios';
 
-import type { BinaryData } from '../BinaryData/types';
+import type { BinaryData } from '../types';
 
 export type RawListPage = {
 	listBucketResult: {
@@ -24,8 +24,6 @@ type Item = {
 
 export type ListPage = Omit<RawListPage['listBucketResult'], 'contents'> & { contents: Item[] };
 
-export type Bucket = { region: string; name: string };
-
 export type RequestOptions = {
 	qs?: Record<string, string | number>;
 	headers?: Record<string, string | number>;
@@ -38,5 +36,3 @@ export type MetadataResponseHeaders = AxiosResponseHeaders & {
 	'content-type'?: string;
 	'x-amz-meta-filename'?: string;
 } & BinaryData.PreWriteMetadata;
-
-export type ConfigSchemaCredentials = { accessKey: string; accessSecret: string };
diff --git a/packages/core/src/ObjectStore/utils.ts b/packages/core/src/binary-data/object-store/utils.ts
similarity index 100%
rename from packages/core/src/ObjectStore/utils.ts
rename to packages/core/src/binary-data/object-store/utils.ts
diff --git a/packages/core/src/BinaryData/types.ts b/packages/core/src/binary-data/types.ts
similarity index 100%
rename from packages/core/src/BinaryData/types.ts
rename to packages/core/src/binary-data/types.ts
diff --git a/packages/core/src/BinaryData/utils.ts b/packages/core/src/binary-data/utils.ts
similarity index 100%
rename from packages/core/src/BinaryData/utils.ts
rename to packages/core/src/binary-data/utils.ts
diff --git a/packages/core/src/Constants.ts b/packages/core/src/constants.ts
similarity index 51%
rename from packages/core/src/Constants.ts
rename to packages/core/src/constants.ts
index 82a39b07cd..bd44e25d10 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/constants.ts
@@ -1,6 +1,3 @@
-import type { INodeProperties } from 'n8n-workflow';
-import { cronNodeOptions } from 'n8n-workflow';
-
 const { NODE_ENV } = process.env;
 export const inProduction = NODE_ENV === 'production';
 export const inDevelopment = !NODE_ENV || NODE_ENV === 'development';
@@ -11,8 +8,6 @@ export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
 export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
 export const HTTP_REQUEST_TOOL_NODE_TYPE = '@n8n/n8n-nodes-langchain.toolHttpRequest';
 
-export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
-
 export const RESTRICT_FILE_ACCESS_TO = 'N8N_RESTRICT_FILE_ACCESS_TO';
 export const BLOCK_FILE_ACCESS_TO_N8N_FILES = 'N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES';
 export const CONFIG_FILES = 'N8N_CONFIG_FILES';
@@ -20,29 +15,10 @@ export const BINARY_DATA_STORAGE_PATH = 'N8N_BINARY_DATA_STORAGE_PATH';
 export const UM_EMAIL_TEMPLATES_INVITE = 'N8N_UM_EMAIL_TEMPLATES_INVITE';
 export const UM_EMAIL_TEMPLATES_PWRESET = 'N8N_UM_EMAIL_TEMPLATES_PWRESET';
 
-export const commonPollingParameters: INodeProperties[] = [
-	{
-		displayName: 'Poll Times',
-		name: 'pollTimes',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-			multipleValueButtonText: 'Add Poll Time',
-		},
-		default: { item: [{ mode: 'everyMinute' }] },
-		description: 'Time at which polling should occur',
-		placeholder: 'Add Poll Time',
-		options: cronNodeOptions,
-	},
-];
-
-export const commonCORSParameters: INodeProperties[] = [
-	{
-		displayName: 'Allowed Origins (CORS)',
-		name: 'allowedOrigins',
-		type: 'string',
-		default: '*',
-		description:
-			'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
-	},
-];
+export const CREDENTIAL_ERRORS = {
+	NO_DATA: 'No data is set on this credentials.',
+	DECRYPTION_FAILED:
+		'Credentials could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
+	INVALID_JSON: 'Decrypted credentials data is not valid JSON.',
+	INVALID_DATA: 'Credentials data is not in a valid format.',
+};
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/credentials.ts
similarity index 54%
rename from packages/core/src/Credentials.ts
rename to packages/core/src/credentials.ts
index f5f8eb834f..f2d10df156 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/credentials.ts
@@ -1,8 +1,20 @@
 import { Container } from '@n8n/di';
 import type { ICredentialDataDecryptedObject, ICredentialsEncrypted } from 'n8n-workflow';
 import { ApplicationError, ICredentials, jsonParse } from 'n8n-workflow';
+import * as a from 'node:assert';
 
-import { Cipher } from './Cipher';
+import { CREDENTIAL_ERRORS } from '@/constants';
+import { Cipher } from '@/encryption/cipher';
+import { isObjectLiteral } from '@/utils';
+
+export class CredentialDataError extends ApplicationError {
+	constructor({ name, type, id }: Credentials<object>, message: string, cause?: unknown) {
+		super(message, {
+			extra: { name, type, id },
+			cause,
+		});
+	}
+}
 
 export class Credentials<
 	T extends object = ICredentialDataDecryptedObject,
@@ -13,6 +25,8 @@ export class Credentials<
 	 * Sets new credential object
 	 */
 	setData(data: T): void {
+		a.ok(isObjectLiteral(data));
+
 		this.data = this.cipher.encrypt(data);
 	}
 
@@ -21,17 +35,20 @@ export class Credentials<
 	 */
 	getData(): T {
 		if (this.data === undefined) {
-			throw new ApplicationError('No data is set so nothing can be returned.');
+			throw new CredentialDataError(this, CREDENTIAL_ERRORS.NO_DATA);
+		}
+
+		let decryptedData: string;
+		try {
+			decryptedData = this.cipher.decrypt(this.data);
+		} catch (cause) {
+			throw new CredentialDataError(this, CREDENTIAL_ERRORS.DECRYPTION_FAILED, cause);
 		}
 
 		try {
-			const decryptedData = this.cipher.decrypt(this.data);
-
 			return jsonParse(decryptedData);
-		} catch (e) {
-			throw new ApplicationError(
-				'Credentials could not be decrypted. The likely reason is that a different "encryptionKey" was used to encrypt the data.',
-			);
+		} catch (cause) {
+			throw new CredentialDataError(this, CREDENTIAL_ERRORS.INVALID_JSON, cause);
 		}
 	}
 
diff --git a/packages/core/test/Cipher.test.ts b/packages/core/src/encryption/__tests__/cipher.test.ts
similarity index 87%
rename from packages/core/test/Cipher.test.ts
rename to packages/core/src/encryption/__tests__/cipher.test.ts
index 7f6bcdedf3..c1e14a9be0 100644
--- a/packages/core/test/Cipher.test.ts
+++ b/packages/core/src/encryption/__tests__/cipher.test.ts
@@ -1,9 +1,9 @@
 import { Container } from '@n8n/di';
 
-import { Cipher } from '@/Cipher';
-import { InstanceSettings } from '@/InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
+import { mockInstance } from '@test/utils';
 
-import { mockInstance } from './utils';
+import { Cipher } from '../cipher';
 
 describe('Cipher', () => {
 	mockInstance(InstanceSettings, { encryptionKey: 'test_key' });
diff --git a/packages/core/src/Cipher.ts b/packages/core/src/encryption/cipher.ts
similarity index 96%
rename from packages/core/src/Cipher.ts
rename to packages/core/src/encryption/cipher.ts
index 812c8f452a..248ca0317b 100644
--- a/packages/core/src/Cipher.ts
+++ b/packages/core/src/encryption/cipher.ts
@@ -1,7 +1,7 @@
 import { Service } from '@n8n/di';
 import { createHash, createCipheriv, createDecipheriv, randomBytes } from 'crypto';
 
-import { InstanceSettings } from './InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
 
 // Data encrypted by CryptoJS always starts with these bytes
 const RANDOM_BYTES = Buffer.from('53616c7465645f5f', 'hex');
diff --git a/packages/core/src/encryption/index.ts b/packages/core/src/encryption/index.ts
new file mode 100644
index 0000000000..b2ab9e782e
--- /dev/null
+++ b/packages/core/src/encryption/index.ts
@@ -0,0 +1 @@
+export { Cipher } from './cipher';
diff --git a/packages/core/test/error-reporter.test.ts b/packages/core/src/errors/__tests__/error-reporter.test.ts
similarity index 76%
rename from packages/core/test/error-reporter.test.ts
rename to packages/core/src/errors/__tests__/error-reporter.test.ts
index 9edc27f15c..ff260ea1f7 100644
--- a/packages/core/test/error-reporter.test.ts
+++ b/packages/core/src/errors/__tests__/error-reporter.test.ts
@@ -4,9 +4,10 @@ import { AxiosError } from 'axios';
 import { mock } from 'jest-mock-extended';
 import { ApplicationError } from 'n8n-workflow';
 
-import { ErrorReporter } from '@/error-reporter';
 import type { Logger } from '@/logging/logger';
 
+import { ErrorReporter } from '../error-reporter';
+
 jest.mock('@sentry/node', () => ({
 	init: jest.fn(),
 	setTag: jest.fn(),
@@ -101,6 +102,37 @@ describe('ErrorReporter', () => {
 			const result = await errorReporter.beforeSend(event, { originalException });
 			expect(result).toBeNull();
 		});
+
+		describe('beforeSendFilter', () => {
+			const newErrorReportedWithBeforeSendFilter = (beforeSendFilter: jest.Mock) => {
+				const errorReporter = new ErrorReporter(mock());
+				// @ts-expect-error - beforeSendFilter is private
+				errorReporter.beforeSendFilter = beforeSendFilter;
+				return errorReporter;
+			};
+
+			it('should filter out based on the beforeSendFilter', async () => {
+				const beforeSendFilter = jest.fn().mockReturnValue(true);
+				const errorReporter = newErrorReportedWithBeforeSendFilter(beforeSendFilter);
+				const hint = { originalException: new Error() };
+
+				const result = await errorReporter.beforeSend(event, hint);
+
+				expect(result).toBeNull();
+				expect(beforeSendFilter).toHaveBeenCalledWith(event, hint);
+			});
+
+			it('should not filter out when beforeSendFilter returns false', async () => {
+				const beforeSendFilter = jest.fn().mockReturnValue(false);
+				const errorReporter = newErrorReportedWithBeforeSendFilter(beforeSendFilter);
+				const hint = { originalException: new Error() };
+
+				const result = await errorReporter.beforeSend(event, hint);
+
+				expect(result).toEqual(event);
+				expect(beforeSendFilter).toHaveBeenCalledWith(event, hint);
+			});
+		});
 	});
 
 	describe('error', () => {
diff --git a/packages/core/src/error-reporter.ts b/packages/core/src/errors/error-reporter.ts
similarity index 66%
rename from packages/core/src/error-reporter.ts
rename to packages/core/src/errors/error-reporter.ts
index 0bc0f6058e..3c0bffcd4b 100644
--- a/packages/core/src/error-reporter.ts
+++ b/packages/core/src/errors/error-reporter.ts
@@ -6,8 +6,21 @@ import { AxiosError } from 'axios';
 import { ApplicationError, ExecutionCancelledError, type ReportingOptions } from 'n8n-workflow';
 import { createHash } from 'node:crypto';
 
-import type { InstanceType } from './InstanceSettings';
-import { Logger } from './logging/logger';
+import type { InstanceType } from '@/instance-settings';
+import { Logger } from '@/logging/logger';
+
+type ErrorReporterInitOptions = {
+	serverType: InstanceType | 'task_runner';
+	dsn: string;
+	release: string;
+	environment: string;
+	serverName: string;
+	/**
+	 * Function to allow filtering out errors before they are sent to Sentry.
+	 * Return true if the error should be filtered out.
+	 */
+	beforeSendFilter?: (event: ErrorEvent, hint: EventHint) => boolean;
+};
 
 @Service()
 export class ErrorReporter {
@@ -16,6 +29,8 @@ export class ErrorReporter {
 
 	private report: (error: Error | string, options?: ReportingOptions) => void;
 
+	private beforeSendFilter?: (event: ErrorEvent, hint: EventHint) => boolean;
+
 	constructor(private readonly logger: Logger) {
 		// eslint-disable-next-line @typescript-eslint/unbound-method
 		this.report = this.defaultReport;
@@ -44,7 +59,14 @@ export class ErrorReporter {
 		await close(timeoutInMs);
 	}
 
-	async init(instanceType: InstanceType | 'task_runner', dsn: string) {
+	async init({
+		beforeSendFilter,
+		dsn,
+		serverType,
+		release,
+		environment,
+		serverName,
+	}: ErrorReporterInitOptions) {
 		process.on('uncaughtException', (error) => {
 			this.error(error);
 		});
@@ -54,12 +76,6 @@ export class ErrorReporter {
 		// Collect longer stacktraces
 		Error.stackTraceLimit = 50;
 
-		const {
-			N8N_VERSION: release,
-			ENVIRONMENT: environment,
-			DEPLOYMENT_NAME: serverName,
-		} = process.env;
-
 		const { init, captureException, setTag } = await import('@sentry/node');
 		const { requestDataIntegration, rewriteFramesIntegration } = await import('@sentry/node');
 
@@ -95,34 +111,37 @@ export class ErrorReporter {
 			],
 		});
 
-		setTag('server_type', instanceType);
+		setTag('server_type', serverType);
 
 		this.report = (error, options) => captureException(error, options);
+		this.beforeSendFilter = beforeSendFilter;
 	}
 
-	async beforeSend(event: ErrorEvent, { originalException }: EventHint) {
+	async beforeSend(event: ErrorEvent, hint: EventHint) {
+		let { originalException } = hint;
+
 		if (!originalException) return null;
 
 		if (originalException instanceof Promise) {
 			originalException = await originalException.catch((error) => error as Error);
 		}
 
-		if (originalException instanceof AxiosError) return null;
-
 		if (
-			originalException instanceof Error &&
-			originalException.name === 'QueryFailedError' &&
-			['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => originalException.message.includes(errMsg))
+			this.beforeSendFilter?.(event, {
+				...hint,
+				originalException,
+			})
 		) {
 			return null;
 		}
 
-		if (originalException instanceof ApplicationError) {
-			const { level, extra, tags } = originalException;
-			if (level === 'warning') return null;
-			event.level = level;
-			if (extra) event.extra = { ...event.extra, ...extra };
-			if (tags) event.tags = { ...event.tags, ...tags };
+		if (originalException instanceof AxiosError) return null;
+
+		if (this.isIgnoredSqliteError(originalException)) return null;
+		if (this.isApplicationError(originalException)) {
+			if (this.isIgnoredApplicationError(originalException)) return null;
+
+			this.extractEventDetailsFromApplicationError(event, originalException);
 		}
 
 		if (
@@ -164,4 +183,31 @@ export class ErrorReporter {
 		if (typeof e === 'string') return new ApplicationError(e);
 		return;
 	}
+
+	/** @returns true if the error should be filtered out */
+	private isIgnoredSqliteError(error: unknown) {
+		return (
+			error instanceof Error &&
+			error.name === 'QueryFailedError' &&
+			['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => error.message.includes(errMsg))
+		);
+	}
+
+	private isApplicationError(error: unknown): error is ApplicationError {
+		return error instanceof ApplicationError;
+	}
+
+	private isIgnoredApplicationError(error: ApplicationError) {
+		return error.level === 'warning';
+	}
+
+	private extractEventDetailsFromApplicationError(
+		event: ErrorEvent,
+		originalException: ApplicationError,
+	) {
+		const { level, extra, tags } = originalException;
+		event.level = level;
+		if (extra) event.extra = { ...event.extra, ...extra };
+		if (tags) event.tags = { ...event.tags, ...tags };
+	}
 }
diff --git a/packages/core/src/errors/index.ts b/packages/core/src/errors/index.ts
index 38cd481c25..b6571dd336 100644
--- a/packages/core/src/errors/index.ts
+++ b/packages/core/src/errors/index.ts
@@ -5,3 +5,5 @@ export { InvalidManagerError } from './invalid-manager.error';
 export { InvalidExecutionMetadataError } from './invalid-execution-metadata.error';
 export { UnrecognizedCredentialTypeError } from './unrecognized-credential-type.error';
 export { UnrecognizedNodeTypeError } from './unrecognized-node-type.error';
+
+export { ErrorReporter } from './error-reporter';
diff --git a/packages/core/src/errors/invalid-mode.error.ts b/packages/core/src/errors/invalid-mode.error.ts
index 179582911a..1e3a4f3594 100644
--- a/packages/core/src/errors/invalid-mode.error.ts
+++ b/packages/core/src/errors/invalid-mode.error.ts
@@ -1,6 +1,6 @@
 import { ApplicationError } from 'n8n-workflow';
 
-import { CONFIG_MODES } from '../BinaryData/utils';
+import { CONFIG_MODES } from '../binary-data/utils';
 
 export class InvalidModeError extends ApplicationError {
 	constructor() {
diff --git a/packages/core/src/errors/workflow-has-issues.error.ts b/packages/core/src/errors/workflow-has-issues.error.ts
new file mode 100644
index 0000000000..77f73131c2
--- /dev/null
+++ b/packages/core/src/errors/workflow-has-issues.error.ts
@@ -0,0 +1,7 @@
+import { WorkflowOperationError } from 'n8n-workflow';
+
+export class WorkflowHasIssuesError extends WorkflowOperationError {
+	constructor() {
+		super('The workflow has issues and cannot be executed for that reason. Please fix them first.');
+	}
+}
diff --git a/packages/core/src/__tests__/ActiveWorkflows.test.ts b/packages/core/src/execution-engine/__tests__/active-workflows.test.ts
similarity index 96%
rename from packages/core/src/__tests__/ActiveWorkflows.test.ts
rename to packages/core/src/execution-engine/__tests__/active-workflows.test.ts
index 410b4779ba..022ef022cf 100644
--- a/packages/core/src/__tests__/ActiveWorkflows.test.ts
+++ b/packages/core/src/execution-engine/__tests__/active-workflows.test.ts
@@ -1,6 +1,5 @@
 import { mock } from 'jest-mock-extended';
 import type {
-	IGetExecuteTriggerFunctions,
 	INode,
 	ITriggerResponse,
 	IWorkflowExecuteAdditionalData,
@@ -12,11 +11,13 @@ import type {
 } from 'n8n-workflow';
 import { LoggerProxy, TriggerCloseError, WorkflowActivationError } from 'n8n-workflow';
 
-import { ActiveWorkflows } from '@/ActiveWorkflows';
-import type { ErrorReporter } from '@/error-reporter';
-import type { PollContext } from '@/node-execution-context';
-import type { ScheduledTaskManager } from '@/ScheduledTaskManager';
-import type { TriggersAndPollers } from '@/TriggersAndPollers';
+import type { ErrorReporter } from '@/errors/error-reporter';
+
+import { ActiveWorkflows } from '../active-workflows';
+import type { IGetExecuteTriggerFunctions } from '../interfaces';
+import type { PollContext } from '../node-execution-context';
+import type { ScheduledTaskManager } from '../scheduled-task-manager';
+import type { TriggersAndPollers } from '../triggers-and-pollers';
 
 describe('ActiveWorkflows', () => {
 	const workflowId = 'test-workflow-id';
diff --git a/packages/core/src/execution-engine/__tests__/execution-lifecycle-hooks.test.ts b/packages/core/src/execution-engine/__tests__/execution-lifecycle-hooks.test.ts
new file mode 100644
index 0000000000..fb85216b25
--- /dev/null
+++ b/packages/core/src/execution-engine/__tests__/execution-lifecycle-hooks.test.ts
@@ -0,0 +1,113 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	IDataObject,
+	IExecuteResponsePromiseData,
+	INode,
+	IRun,
+	IRunExecutionData,
+	ITaskData,
+	IWorkflowBase,
+	Workflow,
+} from 'n8n-workflow';
+
+import type {
+	ExecutionLifecycleHookName,
+	ExecutionLifecyleHookHandlers,
+} from '../execution-lifecycle-hooks';
+import { ExecutionLifecycleHooks } from '../execution-lifecycle-hooks';
+
+describe('ExecutionLifecycleHooks', () => {
+	const executionId = '123';
+	const workflowData = mock<IWorkflowBase>();
+
+	let hooks: ExecutionLifecycleHooks;
+	beforeEach(() => {
+		jest.clearAllMocks();
+		hooks = new ExecutionLifecycleHooks('internal', executionId, workflowData);
+	});
+
+	describe('constructor()', () => {
+		it('should initialize with correct properties', () => {
+			expect(hooks.mode).toBe('internal');
+			expect(hooks.executionId).toBe(executionId);
+			expect(hooks.workflowData).toBe(workflowData);
+			expect(hooks.handlers).toEqual({
+				nodeExecuteAfter: [],
+				nodeExecuteBefore: [],
+				nodeFetchedData: [],
+				sendResponse: [],
+				workflowExecuteAfter: [],
+				workflowExecuteBefore: [],
+			});
+		});
+	});
+
+	describe('addHandler()', () => {
+		const hooksHandlers =
+			mock<{
+				[K in keyof ExecutionLifecyleHookHandlers]: ExecutionLifecyleHookHandlers[K][number];
+			}>();
+
+		const testCases: Array<{
+			hook: ExecutionLifecycleHookName;
+			args: Parameters<ExecutionLifecyleHookHandlers[keyof ExecutionLifecyleHookHandlers][number]>;
+		}> = [
+			{ hook: 'nodeExecuteBefore', args: ['testNode'] },
+			{
+				hook: 'nodeExecuteAfter',
+				args: ['testNode', mock<ITaskData>(), mock<IRunExecutionData>()],
+			},
+			{ hook: 'workflowExecuteBefore', args: [mock<Workflow>(), mock<IRunExecutionData>()] },
+			{ hook: 'workflowExecuteAfter', args: [mock<IRun>(), mock<IDataObject>()] },
+			{ hook: 'sendResponse', args: [mock<IExecuteResponsePromiseData>()] },
+			{ hook: 'nodeFetchedData', args: ['workflow123', mock<INode>()] },
+		];
+
+		test.each(testCases)(
+			'should add handlers to $hook hook and call them',
+			async ({ hook, args }) => {
+				hooks.addHandler(hook, hooksHandlers[hook]);
+				await hooks.runHook(hook, args);
+				expect(hooksHandlers[hook]).toHaveBeenCalledWith(...args);
+			},
+		);
+	});
+
+	describe('runHook()', () => {
+		it('should execute multiple hooks in order', async () => {
+			const executionOrder: string[] = [];
+			const hook1 = jest.fn().mockImplementation(async () => {
+				executionOrder.push('hook1');
+			});
+			const hook2 = jest.fn().mockImplementation(async () => {
+				executionOrder.push('hook2');
+			});
+
+			hooks.addHandler('nodeExecuteBefore', hook1, hook2);
+			await hooks.runHook('nodeExecuteBefore', ['testNode']);
+
+			expect(executionOrder).toEqual(['hook1', 'hook2']);
+			expect(hook1).toHaveBeenCalled();
+			expect(hook2).toHaveBeenCalled();
+		});
+
+		it('should maintain correct "this" context', async () => {
+			const hook = jest.fn().mockImplementation(async function (this: ExecutionLifecycleHooks) {
+				expect(this.executionId).toBe(executionId);
+				expect(this.mode).toBe('internal');
+			});
+
+			hooks.addHandler('nodeExecuteBefore', hook);
+			await hooks.runHook('nodeExecuteBefore', ['testNode']);
+
+			expect(hook).toHaveBeenCalled();
+		});
+
+		it('should handle errors in hooks', async () => {
+			const errorHook = jest.fn().mockRejectedValue(new Error('Hook failed'));
+			hooks.addHandler('nodeExecuteBefore', errorHook);
+
+			await expect(hooks.runHook('nodeExecuteBefore', ['testNode'])).rejects.toThrow('Hook failed');
+		});
+	});
+});
diff --git a/packages/core/test/RoutingNode.test.ts b/packages/core/src/execution-engine/__tests__/routing-node.test.ts
similarity index 98%
rename from packages/core/test/RoutingNode.test.ts
rename to packages/core/src/execution-engine/__tests__/routing-node.test.ts
index 45ef937803..a35ad24a8a 100644
--- a/packages/core/test/RoutingNode.test.ts
+++ b/packages/core/src/execution-engine/__tests__/routing-node.test.ts
@@ -21,10 +21,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeHelpers, Workflow } from 'n8n-workflow';
 
-import * as executionContexts from '@/node-execution-context';
-import { RoutingNode } from '@/RoutingNode';
+import * as executionContexts from '@/execution-engine/node-execution-context';
+import { NodeTypes } from '@test/helpers';
 
-import { NodeTypes } from './helpers';
+import { RoutingNode } from '../routing-node';
 
 const postReceiveFunction1 = async function (
 	this: IExecuteSingleFunctions,
@@ -744,14 +744,17 @@ describe('RoutingNode', () => {
 					nodeTypes,
 				});
 
-				const routingNode = new RoutingNode(
+				const executeFunctions = mock<executionContexts.ExecuteContext>();
+				Object.assign(executeFunctions, {
+					runIndex,
+					additionalData,
 					workflow,
 					node,
-					connectionInputData,
-					runExecutionData ?? null,
-					additionalData,
 					mode,
-				);
+					connectionInputData,
+					runExecutionData,
+				});
+				const routingNode = new RoutingNode(executeFunctions, nodeType);
 
 				const executeSingleFunctions = getExecuteSingleFunctions(
 					workflow,
@@ -1947,15 +1950,6 @@ describe('RoutingNode', () => {
 					nodeTypes,
 				});
 
-				const routingNode = new RoutingNode(
-					workflow,
-					node,
-					connectionInputData,
-					runExecutionData ?? null,
-					additionalData,
-					mode,
-				);
-
 				const executeData = {
 					data: {},
 					node,
@@ -1963,6 +1957,18 @@ describe('RoutingNode', () => {
 				} as IExecuteData;
 
 				const executeFunctions = mock<executionContexts.ExecuteContext>();
+				Object.assign(executeFunctions, {
+					executeData,
+					inputData,
+					runIndex,
+					additionalData,
+					workflow,
+					node,
+					mode,
+					connectionInputData,
+					runExecutionData,
+				});
+
 				const executeSingleFunctions = getExecuteSingleFunctions(
 					workflow,
 					runExecutionData,
@@ -1971,7 +1977,6 @@ describe('RoutingNode', () => {
 					itemIndex,
 				);
 
-				jest.spyOn(executionContexts, 'ExecuteContext').mockReturnValue(executeFunctions);
 				jest
 					.spyOn(executionContexts, 'ExecuteSingleContext')
 					.mockReturnValue(executeSingleFunctions);
@@ -2004,7 +2009,8 @@ describe('RoutingNode', () => {
 						? testData.input.node.parameters[parameterName]
 						: (getNodeParameter(parameterName) ?? {});
 
-				const result = await routingNode.runNode(inputData, runIndex, nodeType, executeData);
+				const routingNode = new RoutingNode(executeFunctions, nodeType);
+				const result = await routingNode.runNode();
 
 				if (testData.input.specialTestOptions?.sleepCalls) {
 					expect(spy.mock.calls).toEqual(testData.input.specialTestOptions?.sleepCalls);
diff --git a/packages/core/test/ScheduledTaskManager.test.ts b/packages/core/src/execution-engine/__tests__/scheduled-task-manager.test.ts
similarity index 94%
rename from packages/core/test/ScheduledTaskManager.test.ts
rename to packages/core/src/execution-engine/__tests__/scheduled-task-manager.test.ts
index 5166240856..4c39d3afbc 100644
--- a/packages/core/test/ScheduledTaskManager.test.ts
+++ b/packages/core/src/execution-engine/__tests__/scheduled-task-manager.test.ts
@@ -1,8 +1,9 @@
 import { mock } from 'jest-mock-extended';
 import type { Workflow } from 'n8n-workflow';
 
-import type { InstanceSettings } from '@/InstanceSettings';
-import { ScheduledTaskManager } from '@/ScheduledTaskManager';
+import type { InstanceSettings } from '@/instance-settings';
+
+import { ScheduledTaskManager } from '../scheduled-task-manager';
 
 describe('ScheduledTaskManager', () => {
 	const instanceSettings = mock<InstanceSettings>({ isLeader: true });
diff --git a/packages/core/test/SSHClientsManager.test.ts b/packages/core/src/execution-engine/__tests__/ssh-clients-manager.test.ts
similarity index 97%
rename from packages/core/test/SSHClientsManager.test.ts
rename to packages/core/src/execution-engine/__tests__/ssh-clients-manager.test.ts
index 132a54baef..d58fe22802 100644
--- a/packages/core/test/SSHClientsManager.test.ts
+++ b/packages/core/src/execution-engine/__tests__/ssh-clients-manager.test.ts
@@ -1,7 +1,7 @@
 import type { SSHCredentials } from 'n8n-workflow';
 import { Client } from 'ssh2';
 
-import { SSHClientsManager } from '@/SSHClientsManager';
+import { SSHClientsManager } from '../ssh-clients-manager';
 
 describe('SSHClientsManager', () => {
 	const credentials: SSHCredentials = {
diff --git a/packages/core/test/TriggersAndPollers.test.ts b/packages/core/src/execution-engine/__tests__/triggers-and-pollers.test.ts
similarity index 89%
rename from packages/core/test/TriggersAndPollers.test.ts
rename to packages/core/src/execution-engine/__tests__/triggers-and-pollers.test.ts
index 27cc8b47d9..25b1fddb26 100644
--- a/packages/core/test/TriggersAndPollers.test.ts
+++ b/packages/core/src/execution-engine/__tests__/triggers-and-pollers.test.ts
@@ -9,11 +9,11 @@ import type {
 	INodeType,
 	INodeTypes,
 	ITriggerFunctions,
-	WorkflowHooks,
 	IRun,
 } from 'n8n-workflow';
 
-import { TriggersAndPollers } from '@/TriggersAndPollers';
+import { ExecutionLifecycleHooks } from '../execution-lifecycle-hooks';
+import { TriggersAndPollers } from '../triggers-and-pollers';
 
 describe('TriggersAndPollers', () => {
 	const node = mock<INode>();
@@ -23,15 +23,8 @@ describe('TriggersAndPollers', () => {
 	});
 	const nodeTypes = mock<INodeTypes>();
 	const workflow = mock<Workflow>({ nodeTypes });
-	const hookFunctions = mock<WorkflowHooks['hookFunctions']>({
-		sendResponse: [],
-		workflowExecuteAfter: [],
-	});
-	const additionalData = mock<IWorkflowExecuteAdditionalData>({
-		hooks: {
-			hookFunctions,
-		},
-	});
+	const hooks = new ExecutionLifecycleHooks('internal', '123', mock());
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ hooks });
 	const triggersAndPollers = new TriggersAndPollers();
 
 	beforeEach(() => {
@@ -98,8 +91,7 @@ describe('TriggersAndPollers', () => {
 
 				getMockTriggerFunctions()?.emit?.(mockEmitData, responsePromise);
 
-				expect(hookFunctions.sendResponse?.length).toBe(1);
-				await hookFunctions.sendResponse![0]?.({ testResponse: true });
+				await hooks.runHook('sendResponse', [{ testResponse: true }]);
 				expect(responsePromise.resolve).toHaveBeenCalledWith({ testResponse: true });
 			});
 
@@ -111,10 +103,10 @@ describe('TriggersAndPollers', () => {
 				await runTriggerHelper('manual');
 				getMockTriggerFunctions()?.emit?.(mockEmitData, responsePromise, donePromise);
 
-				await hookFunctions.sendResponse![0]?.({ testResponse: true });
+				await hooks.runHook('sendResponse', [{ testResponse: true }]);
 				expect(responsePromise.resolve).toHaveBeenCalledWith({ testResponse: true });
 
-				await hookFunctions.workflowExecuteAfter?.[0]?.(mockRunData, {});
+				await hooks.runHook('workflowExecuteAfter', [mockRunData, {}]);
 				expect(donePromise.resolve).toHaveBeenCalledWith(mockRunData);
 			});
 		});
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
similarity index 97%
rename from packages/core/test/WorkflowExecute.test.ts
rename to packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
index 6ab3afdaeb..10af4a1e7b 100644
--- a/packages/core/test/WorkflowExecute.test.ts
+++ b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
@@ -1,3 +1,7 @@
+// Disable task runners until we have fixed the "run test workflows" test
+// to mock the Code Node execution
+process.env.N8N_RUNNERS_ENABLED = 'false';
+
 // NOTE: Diagrams in this file have been created with https://asciiflow.com/#/
 // If you update the tests, please update the diagrams as well.
 // If you add a test, please create a new diagram.
@@ -37,13 +41,14 @@ import {
 	Workflow,
 } from 'n8n-workflow';
 
-import { DirectedGraph } from '@/PartialExecutionUtils';
-import * as partialExecutionUtils from '@/PartialExecutionUtils';
-import { createNodeData, toITaskData } from '@/PartialExecutionUtils/__tests__/helpers';
-import { WorkflowExecute } from '@/WorkflowExecute';
+import * as Helpers from '@test/helpers';
+import { legacyWorkflowExecuteTests, v1WorkflowExecuteTests } from '@test/helpers/constants';
 
-import * as Helpers from './helpers';
-import { legacyWorkflowExecuteTests, v1WorkflowExecuteTests } from './helpers/constants';
+import type { ExecutionLifecycleHooks } from '../execution-lifecycle-hooks';
+import { DirectedGraph } from '../partial-execution-utils';
+import * as partialExecutionUtils from '../partial-execution-utils';
+import { createNodeData, toITaskData } from '../partial-execution-utils/__tests__/helpers';
+import { WorkflowExecute } from '../workflow-execute';
 
 const nodeTypes = Helpers.NodeTypes();
 
@@ -1207,6 +1212,7 @@ describe('WorkflowExecute', () => {
 
 		let runExecutionData: IRunExecutionData;
 		let workflowExecute: WorkflowExecute;
+		let additionalData: IWorkflowExecuteAdditionalData;
 
 		beforeEach(() => {
 			runExecutionData = {
@@ -1220,9 +1226,12 @@ describe('WorkflowExecute', () => {
 					waitingExecutionSource: null,
 				},
 			};
-			workflowExecute = new WorkflowExecute(mock(), 'manual', runExecutionData);
+			additionalData = mock();
+			additionalData.hooks = mock<ExecutionLifecycleHooks>();
 
-			jest.spyOn(workflowExecute, 'executeHook').mockResolvedValue(undefined);
+			workflowExecute = new WorkflowExecute(additionalData, 'manual', runExecutionData);
+
+			jest.spyOn(additionalData.hooks, 'runHook').mockResolvedValue(undefined);
 			jest.spyOn(workflowExecute, 'moveNodeMetadata').mockImplementation();
 		});
 
@@ -1290,7 +1299,7 @@ describe('WorkflowExecute', () => {
 			// Verify static data handling
 			expect(result).toBeDefined();
 			expect(workflowExecute.moveNodeMetadata).toHaveBeenCalled();
-			expect(workflowExecute.executeHook).toHaveBeenCalledWith('workflowExecuteAfter', [
+			expect(additionalData.hooks?.runHook).toHaveBeenCalledWith('workflowExecuteAfter', [
 				result,
 				workflow.staticData,
 			]);
diff --git a/packages/core/test/workflows/error_outputs.json b/packages/core/src/execution-engine/__tests__/workflows/error_outputs.json
similarity index 100%
rename from packages/core/test/workflows/error_outputs.json
rename to packages/core/src/execution-engine/__tests__/workflows/error_outputs.json
diff --git a/packages/core/test/workflows/paired_items_fix.json b/packages/core/src/execution-engine/__tests__/workflows/paired_items_fix.json
similarity index 100%
rename from packages/core/test/workflows/paired_items_fix.json
rename to packages/core/src/execution-engine/__tests__/workflows/paired_items_fix.json
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/execution-engine/active-workflows.ts
similarity index 94%
rename from packages/core/src/ActiveWorkflows.ts
rename to packages/core/src/execution-engine/active-workflows.ts
index abd544956a..1c1b5e2d14 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/execution-engine/active-workflows.ts
@@ -1,7 +1,5 @@
 import { Service } from '@n8n/di';
 import type {
-	IGetExecutePollFunctions,
-	IGetExecuteTriggerFunctions,
 	INode,
 	ITriggerResponse,
 	IWorkflowExecuteAdditionalData,
@@ -18,11 +16,13 @@ import {
 	WorkflowDeactivationError,
 } from 'n8n-workflow';
 
-import { ErrorReporter } from './error-reporter';
-import type { IWorkflowData } from './Interfaces';
-import { Logger } from './logging/logger';
-import { ScheduledTaskManager } from './ScheduledTaskManager';
-import { TriggersAndPollers } from './TriggersAndPollers';
+import { ErrorReporter } from '@/errors/error-reporter';
+import type { IWorkflowData } from '@/interfaces';
+import { Logger } from '@/logging/logger';
+
+import type { IGetExecutePollFunctions, IGetExecuteTriggerFunctions } from './interfaces';
+import { ScheduledTaskManager } from './scheduled-task-manager';
+import { TriggersAndPollers } from './triggers-and-pollers';
 
 @Service()
 export class ActiveWorkflows {
diff --git a/packages/core/src/execution-engine/execution-lifecycle-hooks.ts b/packages/core/src/execution-engine/execution-lifecycle-hooks.ts
new file mode 100644
index 0000000000..047d5a2075
--- /dev/null
+++ b/packages/core/src/execution-engine/execution-lifecycle-hooks.ts
@@ -0,0 +1,119 @@
+import type {
+	IDataObject,
+	IExecuteResponsePromiseData,
+	INode,
+	IRun,
+	IRunExecutionData,
+	ITaskData,
+	IWorkflowBase,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+export type ExecutionLifecyleHookHandlers = {
+	nodeExecuteBefore: Array<
+		(this: ExecutionLifecycleHooks, nodeName: string) => Promise<void> | void
+	>;
+
+	nodeExecuteAfter: Array<
+		(
+			this: ExecutionLifecycleHooks,
+			nodeName: string,
+			data: ITaskData,
+			executionData: IRunExecutionData,
+		) => Promise<void> | void
+	>;
+
+	workflowExecuteBefore: Array<
+		(
+			this: ExecutionLifecycleHooks,
+			workflow: Workflow,
+			data?: IRunExecutionData,
+		) => Promise<void> | void
+	>;
+
+	workflowExecuteAfter: Array<
+		(this: ExecutionLifecycleHooks, data: IRun, newStaticData: IDataObject) => Promise<void> | void
+	>;
+
+	/** Used by trigger and webhook nodes to respond back to the request */
+	sendResponse: Array<
+		(this: ExecutionLifecycleHooks, response: IExecuteResponsePromiseData) => Promise<void> | void
+	>;
+
+	/**
+	 * Executed after a node fetches data
+	 * - For a webhook node, after the node had been run.
+   * - For a http-request node, or any other node that makes http requests that still use the deprecated request* methods, after every successful http request
+s	 */
+	nodeFetchedData: Array<
+		(this: ExecutionLifecycleHooks, workflowId: string, node: INode) => Promise<void> | void
+	>;
+};
+
+export type ExecutionLifecycleHookName = keyof ExecutionLifecyleHookHandlers;
+
+/**
+ * Contains hooks that trigger at specific events in an execution's lifecycle. Every hook has an array of callbacks to run.
+ *
+ * Common use cases include:
+ * - Saving execution progress to database
+ * - Pushing execution status updates to the frontend
+ * - Recording workflow statistics
+ * - Running external hooks for execution events
+ * - Error and Cancellation handling and cleanup
+ *
+ * @example
+ * ```typescript
+ * const hooks = new ExecutionLifecycleHooks(mode, executionId, workflowData);
+ * hooks.add('workflowExecuteAfter, async function(fullRunData) {
+ *  await saveToDatabase(executionId, fullRunData);
+ *});
+ * ```
+ */
+export class ExecutionLifecycleHooks {
+	readonly handlers: ExecutionLifecyleHookHandlers = {
+		nodeExecuteAfter: [],
+		nodeExecuteBefore: [],
+		nodeFetchedData: [],
+		sendResponse: [],
+		workflowExecuteAfter: [],
+		workflowExecuteBefore: [],
+	};
+
+	constructor(
+		readonly mode: WorkflowExecuteMode,
+		readonly executionId: string,
+		readonly workflowData: IWorkflowBase,
+	) {}
+
+	addHandler<Hook extends keyof ExecutionLifecyleHookHandlers>(
+		hookName: Hook,
+		...handlers: Array<ExecutionLifecyleHookHandlers[Hook][number]>
+	): void {
+		// @ts-expect-error FIX THIS
+		this.handlers[hookName].push(...handlers);
+	}
+
+	async runHook<
+		Hook extends keyof ExecutionLifecyleHookHandlers,
+		Params extends unknown[] = Parameters<
+			Exclude<ExecutionLifecyleHookHandlers[Hook], undefined>[number]
+		>,
+	>(hookName: Hook, parameters: Params) {
+		const hooks = this.handlers[hookName];
+		for (const hookFunction of hooks) {
+			const typedHookFunction = hookFunction as unknown as (
+				this: ExecutionLifecycleHooks,
+				...args: Params
+			) => Promise<void>;
+			await typedHookFunction.apply(this, parameters);
+		}
+	}
+}
+
+declare module 'n8n-workflow' {
+	interface IWorkflowExecuteAdditionalData {
+		hooks?: ExecutionLifecycleHooks;
+	}
+}
diff --git a/packages/core/src/execution-engine/index.ts b/packages/core/src/execution-engine/index.ts
new file mode 100644
index 0000000000..bb8adfb34c
--- /dev/null
+++ b/packages/core/src/execution-engine/index.ts
@@ -0,0 +1,8 @@
+export * from './active-workflows';
+export * from './interfaces';
+export * from './routing-node';
+export * from './node-execution-context';
+export * from './partial-execution-utils';
+export * from './node-execution-context/utils/execution-metadata';
+export * from './workflow-execute';
+export { ExecutionLifecycleHooks } from './execution-lifecycle-hooks';
diff --git a/packages/core/src/execution-engine/interfaces.ts b/packages/core/src/execution-engine/interfaces.ts
new file mode 100644
index 0000000000..809c032b4f
--- /dev/null
+++ b/packages/core/src/execution-engine/interfaces.ts
@@ -0,0 +1,29 @@
+import type {
+	INode,
+	IPollFunctions,
+	ITriggerFunctions,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+export interface IGetExecutePollFunctions {
+	(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): IPollFunctions;
+}
+
+export interface IGetExecuteTriggerFunctions {
+	(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): ITriggerFunctions;
+}
diff --git a/packages/core/src/node-execution-context/__tests__/execute-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/execute-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/execute-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/execute-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/execute-single-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/execute-single-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/execute-single-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/hook-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/hook-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/hook-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/hook-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/load-options-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/load-options-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/load-options-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/load-options-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/node-execution-context.test.ts
similarity index 99%
rename from packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/node-execution-context.test.ts
index a0a368df4c..6a10c2bba5 100644
--- a/packages/core/src/node-execution-context/__tests__/node-execution-context.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/node-execution-context.test.ts
@@ -12,7 +12,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { InstanceSettings } from '@/InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
 
 import { NodeExecutionContext } from '../node-execution-context';
 
diff --git a/packages/core/src/node-execution-context/__tests__/poll-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/poll-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/poll-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/poll-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/shared-tests.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
similarity index 98%
rename from packages/core/src/node-execution-context/__tests__/shared-tests.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
index 8b1d23930b..de5edaad96 100644
--- a/packages/core/src/node-execution-context/__tests__/shared-tests.ts
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
@@ -17,7 +17,7 @@ import type {
 } from 'n8n-workflow';
 import { ApplicationError, NodeHelpers, WAIT_INDEFINITELY } from 'n8n-workflow';
 
-import { BinaryDataService } from '@/BinaryData/BinaryData.service';
+import { BinaryDataService } from '@/binary-data/binary-data.service';
 
 import type { BaseExecuteContext } from '../base-execute-context';
 
@@ -40,7 +40,6 @@ export const describeCommonTests = (
 		executeData: IExecuteData;
 	},
 ) => {
-	// @ts-expect-error `additionalData` is private
 	const additionalData = context.additionalData as MockProxy<IWorkflowExecuteAdditionalData>;
 
 	describe('getExecutionCancelSignal', () => {
diff --git a/packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/supply-data-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/trigger-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/trigger-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/trigger-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/trigger-context.test.ts
diff --git a/packages/core/src/node-execution-context/__tests__/webhook-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/webhook-context.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/__tests__/webhook-context.test.ts
rename to packages/core/src/execution-engine/node-execution-context/__tests__/webhook-context.test.ts
diff --git a/packages/core/src/node-execution-context/base-execute-context.ts b/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
similarity index 94%
rename from packages/core/src/node-execution-context/base-execute-context.ts
rename to packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
index 0416870344..f2d0aa8653 100644
--- a/packages/core/src/node-execution-context/base-execute-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
@@ -29,7 +29,7 @@ import {
 	WorkflowDataProxy,
 } from 'n8n-workflow';
 
-import { BinaryDataService } from '@/BinaryData/BinaryData.service';
+import { BinaryDataService } from '@/binary-data/binary-data.service';
 
 import { NodeExecutionContext } from './node-execution-context';
 
@@ -41,12 +41,12 @@ export class BaseExecuteContext extends NodeExecutionContext {
 		node: INode,
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
-		protected readonly runExecutionData: IRunExecutionData,
+		readonly runExecutionData: IRunExecutionData,
 		runIndex: number,
-		protected readonly connectionInputData: INodeExecutionData[],
-		protected readonly inputData: ITaskDataConnections,
-		protected readonly executeData: IExecuteData,
-		protected readonly abortSignal?: AbortSignal,
+		readonly connectionInputData: INodeExecutionData[],
+		readonly inputData: ITaskDataConnections,
+		readonly executeData: IExecuteData,
+		readonly abortSignal?: AbortSignal,
 	) {
 		super(workflow, node, additionalData, mode, runExecutionData, runIndex);
 	}
diff --git a/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts b/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts
new file mode 100644
index 0000000000..9aa99683da
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts
@@ -0,0 +1,26 @@
+import { Container } from '@n8n/di';
+import type { ICredentialTestFunctions } from 'n8n-workflow';
+
+import { Memoized } from '@/decorators';
+import { Logger } from '@/logging';
+// eslint-disable-next-line import/no-cycle
+import { getSSHTunnelFunctions, proxyRequestToAxios } from '@/node-execute-functions';
+
+export class CredentialTestContext implements ICredentialTestFunctions {
+	readonly helpers: ICredentialTestFunctions['helpers'];
+
+	constructor() {
+		this.helpers = {
+			...getSSHTunnelFunctions(),
+			request: async (uriOrObject: string | object, options?: object) => {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+				return await proxyRequestToAxios(undefined, undefined, undefined, uriOrObject, options);
+			},
+		};
+	}
+
+	@Memoized
+	get logger() {
+		return Container.get(Logger);
+	}
+}
diff --git a/packages/core/src/node-execution-context/execute-context.ts b/packages/core/src/execution-engine/node-execution-context/execute-context.ts
similarity index 91%
rename from packages/core/src/node-execution-context/execute-context.ts
rename to packages/core/src/execution-engine/node-execution-context/execute-context.ts
index 089c3f500a..bf2e89f8ec 100644
--- a/packages/core/src/node-execution-context/execute-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/execute-context.ts
@@ -28,19 +28,21 @@ import {
 	copyInputItems,
 	normalizeItems,
 	constructExecutionMetaData,
+	getRequestHelperFunctions,
+	getSSHTunnelFunctions,
+} from '@/node-execute-functions';
+
+import { BaseExecuteContext } from './base-execute-context';
+import {
 	assertBinaryData,
 	getBinaryDataBuffer,
 	copyBinaryFile,
-	getRequestHelperFunctions,
 	getBinaryHelperFunctions,
-	getSSHTunnelFunctions,
-	getFileSystemHelperFunctions,
-	getCheckProcessedHelperFunctions,
 	detectBinaryEncoding,
-} from '@/NodeExecuteFunctions';
-
-import { BaseExecuteContext } from './base-execute-context';
-import { getInputConnectionData } from './utils/getInputConnectionData';
+} from './utils/binary-helper-functions';
+import { getDeduplicationHelperFunctions } from './utils/deduplication-helper-functions';
+import { getFileSystemHelperFunctions } from './utils/file-system-helper-functions';
+import { getInputConnectionData } from './utils/get-input-connection-data';
 
 export class ExecuteContext extends BaseExecuteContext implements IExecuteFunctions {
 	readonly helpers: IExecuteFunctions['helpers'];
@@ -91,7 +93,7 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 			...getBinaryHelperFunctions(additionalData, workflow.id),
 			...getSSHTunnelFunctions(),
 			...getFileSystemHelperFunctions(node),
-			...getCheckProcessedHelperFunctions(workflow, node),
+			...getDeduplicationHelperFunctions(workflow, node),
 
 			assertBinaryData: (itemIndex, propertyName) =>
 				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
@@ -192,7 +194,7 @@ export class ExecuteContext extends BaseExecuteContext implements IExecuteFuncti
 	}
 
 	async sendResponse(response: IExecuteResponsePromiseData): Promise<void> {
-		await this.additionalData.hooks?.executeHookFunctions('sendResponse', [response]);
+		await this.additionalData.hooks?.runHook('sendResponse', [response]);
 	}
 
 	/** @deprecated use ISupplyDataFunctions.addInputData */
diff --git a/packages/core/src/node-execution-context/execute-single-context.ts b/packages/core/src/execution-engine/node-execution-context/execute-single-context.ts
similarity index 96%
rename from packages/core/src/node-execution-context/execute-single-context.ts
rename to packages/core/src/execution-engine/node-execution-context/execute-single-context.ts
index af837a12c5..acf342e0ac 100644
--- a/packages/core/src/node-execution-context/execute-single-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/execute-single-context.ts
@@ -14,16 +14,15 @@ import type {
 import { ApplicationError, createDeferredPromise, NodeConnectionType } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
+import { getRequestHelperFunctions, returnJsonArray } from '@/node-execute-functions';
+
+import { BaseExecuteContext } from './base-execute-context';
 import {
 	assertBinaryData,
 	detectBinaryEncoding,
 	getBinaryDataBuffer,
 	getBinaryHelperFunctions,
-	getRequestHelperFunctions,
-	returnJsonArray,
-} from '@/NodeExecuteFunctions';
-
-import { BaseExecuteContext } from './base-execute-context';
+} from './utils/binary-helper-functions';
 
 export class ExecuteSingleContext extends BaseExecuteContext implements IExecuteSingleFunctions {
 	readonly helpers: IExecuteSingleFunctions['helpers'];
diff --git a/packages/core/src/node-execution-context/hook-context.ts b/packages/core/src/execution-engine/node-execution-context/hook-context.ts
similarity index 97%
rename from packages/core/src/node-execution-context/hook-context.ts
rename to packages/core/src/execution-engine/node-execution-context/hook-context.ts
index 102be563a1..28dbac802c 100644
--- a/packages/core/src/node-execution-context/hook-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/hook-context.ts
@@ -16,7 +16,7 @@ import {
 	getNodeWebhookUrl,
 	getRequestHelperFunctions,
 	getWebhookDescription,
-} from '@/NodeExecuteFunctions';
+} from '@/node-execute-functions';
 
 import { NodeExecutionContext } from './node-execution-context';
 
diff --git a/packages/core/src/node-execution-context/index.ts b/packages/core/src/execution-engine/node-execution-context/index.ts
similarity index 62%
rename from packages/core/src/node-execution-context/index.ts
rename to packages/core/src/execution-engine/node-execution-context/index.ts
index c3bcebbd44..0c6843d525 100644
--- a/packages/core/src/node-execution-context/index.ts
+++ b/packages/core/src/execution-engine/node-execution-context/index.ts
@@ -1,4 +1,6 @@
 // eslint-disable-next-line import/no-cycle
+export { CredentialTestContext } from './credentials-test-context';
+// eslint-disable-next-line import/no-cycle
 export { ExecuteContext } from './execute-context';
 export { ExecuteSingleContext } from './execute-single-context';
 export { HookContext } from './hook-context';
@@ -10,4 +12,7 @@ export { SupplyDataContext } from './supply-data-context';
 export { TriggerContext } from './trigger-context';
 export { WebhookContext } from './webhook-context';
 
-export { getAdditionalKeys } from './utils/getAdditionalKeys';
+export { getAdditionalKeys } from './utils/get-additional-keys';
+export { parseIncomingMessage } from './utils/parse-incoming-message';
+export { parseRequestObject } from './utils/parse-request-object';
+export * from './utils/binary-helper-functions';
diff --git a/packages/core/src/node-execution-context/load-options-context.ts b/packages/core/src/execution-engine/node-execution-context/load-options-context.ts
similarity index 95%
rename from packages/core/src/node-execution-context/load-options-context.ts
rename to packages/core/src/execution-engine/node-execution-context/load-options-context.ts
index c961b56c06..30c31eacce 100644
--- a/packages/core/src/node-execution-context/load-options-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/load-options-context.ts
@@ -9,11 +9,11 @@ import type {
 	Workflow,
 } from 'n8n-workflow';
 
-import { extractValue } from '@/ExtractValue';
 // eslint-disable-next-line import/no-cycle
-import { getRequestHelperFunctions, getSSHTunnelFunctions } from '@/NodeExecuteFunctions';
+import { getRequestHelperFunctions, getSSHTunnelFunctions } from '@/node-execute-functions';
 
 import { NodeExecutionContext } from './node-execution-context';
+import { extractValue } from './utils/extract-value';
 
 export class LoadOptionsContext extends NodeExecutionContext implements ILoadOptionsFunctions {
 	readonly helpers: ILoadOptionsFunctions['helpers'];
diff --git a/packages/core/src/node-execution-context/local-load-options-context.ts b/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
similarity index 97%
rename from packages/core/src/node-execution-context/local-load-options-context.ts
rename to packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
index 39456ff966..dd96ab5f74 100644
--- a/packages/core/src/node-execution-context/local-load-options-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
@@ -35,6 +35,8 @@ export class LocalLoadOptionsContext implements ILocalLoadOptionsFunctions {
 
 		if (selectedWorkflowNode) {
 			const selectedSingleNodeWorkflow = new Workflow({
+				id: dbWorkflow.id,
+				name: dbWorkflow.name,
 				nodes: [selectedWorkflowNode],
 				connections: {},
 				active: false,
diff --git a/packages/core/src/node-execution-context/node-execution-context.ts b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts
similarity index 92%
rename from packages/core/src/node-execution-context/node-execution-context.ts
rename to packages/core/src/execution-engine/node-execution-context/node-execution-context.ts
index 45a205637c..662e24d6b6 100644
--- a/packages/core/src/node-execution-context/node-execution-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts
@@ -28,29 +28,29 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE } from '@/Constants';
+import { HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE } from '@/constants';
 import { Memoized } from '@/decorators';
-import { extractValue } from '@/ExtractValue';
-import { InstanceSettings } from '@/InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
 import { Logger } from '@/logging/logger';
 
-import { cleanupParameterData } from './utils/cleanupParameterData';
-import { ensureType } from './utils/ensureType';
-import { getAdditionalKeys } from './utils/getAdditionalKeys';
-import { validateValueAgainstSchema } from './utils/validateValueAgainstSchema';
+import { cleanupParameterData } from './utils/cleanup-parameter-data';
+import { ensureType } from './utils/ensure-type';
+import { extractValue } from './utils/extract-value';
+import { getAdditionalKeys } from './utils/get-additional-keys';
+import { validateValueAgainstSchema } from './utils/validate-value-against-schema';
 
 export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCredentials'> {
 	protected readonly instanceSettings = Container.get(InstanceSettings);
 
 	constructor(
-		protected readonly workflow: Workflow,
-		protected readonly node: INode,
-		protected readonly additionalData: IWorkflowExecuteAdditionalData,
-		protected readonly mode: WorkflowExecuteMode,
-		protected readonly runExecutionData: IRunExecutionData | null = null,
-		protected readonly runIndex = 0,
-		protected readonly connectionInputData: INodeExecutionData[] = [],
-		protected readonly executeData?: IExecuteData,
+		readonly workflow: Workflow,
+		readonly node: INode,
+		readonly additionalData: IWorkflowExecuteAdditionalData,
+		readonly mode: WorkflowExecuteMode,
+		readonly runExecutionData: IRunExecutionData | null = null,
+		readonly runIndex = 0,
+		readonly connectionInputData: INodeExecutionData[] = [],
+		readonly executeData?: IExecuteData,
 	) {}
 
 	@Memoized
@@ -79,18 +79,24 @@ export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCr
 		return this.workflow.getStaticData(type, this.node);
 	}
 
-	getChildNodes(nodeName: string) {
+	getChildNodes(nodeName: string, options?: { includeNodeParameters?: boolean }) {
 		const output: NodeTypeAndVersion[] = [];
 		const nodeNames = this.workflow.getChildNodes(nodeName);
 
 		for (const n of nodeNames) {
 			const node = this.workflow.nodes[n];
-			output.push({
+			const entry: NodeTypeAndVersion = {
 				name: node.name,
 				type: node.type,
 				typeVersion: node.typeVersion,
 				disabled: node.disabled ?? false,
-			});
+			};
+
+			if (options?.includeNodeParameters) {
+				entry.parameters = node.parameters;
+			}
+
+			output.push(entry);
 		}
 		return output;
 	}
diff --git a/packages/core/src/node-execution-context/poll-context.ts b/packages/core/src/execution-engine/node-execution-context/poll-context.ts
similarity index 93%
rename from packages/core/src/node-execution-context/poll-context.ts
rename to packages/core/src/execution-engine/node-execution-context/poll-context.ts
index ca90a243f4..793cd8c671 100644
--- a/packages/core/src/node-execution-context/poll-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/poll-context.ts
@@ -11,13 +11,13 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	getBinaryHelperFunctions,
 	getRequestHelperFunctions,
 	getSchedulingFunctions,
 	returnJsonArray,
-} from '@/NodeExecuteFunctions';
+} from '@/node-execute-functions';
 
 import { NodeExecutionContext } from './node-execution-context';
+import { getBinaryHelperFunctions } from './utils/binary-helper-functions';
 
 const throwOnEmit = () => {
 	throw new ApplicationError('Overwrite PollContext.__emit function');
diff --git a/packages/core/src/node-execution-context/supply-data-context.ts b/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
similarity index 93%
rename from packages/core/src/node-execution-context/supply-data-context.ts
rename to packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
index be1f63b56c..33e2723a20 100644
--- a/packages/core/src/node-execution-context/supply-data-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
@@ -21,22 +21,24 @@ import { createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	assertBinaryData,
 	constructExecutionMetaData,
 	copyInputItems,
-	detectBinaryEncoding,
-	getBinaryDataBuffer,
-	getBinaryHelperFunctions,
-	getCheckProcessedHelperFunctions,
-	getFileSystemHelperFunctions,
 	getRequestHelperFunctions,
 	getSSHTunnelFunctions,
 	normalizeItems,
 	returnJsonArray,
-} from '@/NodeExecuteFunctions';
+} from '@/node-execute-functions';
 
 import { BaseExecuteContext } from './base-execute-context';
-import { getInputConnectionData } from './utils/getInputConnectionData';
+import {
+	assertBinaryData,
+	detectBinaryEncoding,
+	getBinaryDataBuffer,
+	getBinaryHelperFunctions,
+} from './utils/binary-helper-functions';
+import { getDeduplicationHelperFunctions } from './utils/deduplication-helper-functions';
+import { getFileSystemHelperFunctions } from './utils/file-system-helper-functions';
+import { getInputConnectionData } from './utils/get-input-connection-data';
 
 export class SupplyDataContext extends BaseExecuteContext implements ISupplyDataFunctions {
 	readonly helpers: ISupplyDataFunctions['helpers'];
@@ -83,7 +85,7 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			...getSSHTunnelFunctions(),
 			...getFileSystemHelperFunctions(node),
 			...getBinaryHelperFunctions(additionalData, workflow.id),
-			...getCheckProcessedHelperFunctions(workflow, node),
+			...getDeduplicationHelperFunctions(workflow, node),
 			assertBinaryData: (itemIndex, propertyName) =>
 				assertBinaryData(inputData, node, itemIndex, propertyName, 0),
 			getBinaryDataBuffer: async (itemIndex, propertyName) =>
@@ -256,12 +258,12 @@ export class SupplyDataContext extends BaseExecuteContext implements ISupplyData
 			}
 
 			runExecutionData.resultData.runData[nodeName][currentNodeRunIndex] = taskData;
-			await additionalData.hooks?.executeHookFunctions('nodeExecuteBefore', [nodeName]);
+			await additionalData.hooks?.runHook('nodeExecuteBefore', [nodeName]);
 		} else {
 			// Outputs
 			taskData.executionTime = new Date().getTime() - taskData.startTime;
 
-			await additionalData.hooks?.executeHookFunctions('nodeExecuteAfter', [
+			await additionalData.hooks?.runHook('nodeExecuteAfter', [
 				nodeName,
 				taskData,
 				this.runExecutionData,
diff --git a/packages/core/src/node-execution-context/trigger-context.ts b/packages/core/src/execution-engine/node-execution-context/trigger-context.ts
similarity index 93%
rename from packages/core/src/node-execution-context/trigger-context.ts
rename to packages/core/src/execution-engine/node-execution-context/trigger-context.ts
index 88c8d91432..01bdaf6b03 100644
--- a/packages/core/src/node-execution-context/trigger-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/trigger-context.ts
@@ -11,14 +11,14 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	getBinaryHelperFunctions,
 	getRequestHelperFunctions,
 	getSchedulingFunctions,
 	getSSHTunnelFunctions,
 	returnJsonArray,
-} from '@/NodeExecuteFunctions';
+} from '@/node-execute-functions';
 
 import { NodeExecutionContext } from './node-execution-context';
+import { getBinaryHelperFunctions } from './utils/binary-helper-functions';
 
 const throwOnEmit = () => {
 	throw new ApplicationError('Overwrite TriggerContext.emit function');
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/binary-helper-functions.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/binary-helper-functions.test.ts
new file mode 100644
index 0000000000..a250421cdf
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/binary-helper-functions.test.ts
@@ -0,0 +1,480 @@
+import { Container } from '@n8n/di';
+import { mkdtempSync, readFileSync } from 'fs';
+import { IncomingMessage } from 'http';
+import { mock } from 'jest-mock-extended';
+import type {
+	IBinaryData,
+	INode,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+} from 'n8n-workflow';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { Readable } from 'stream';
+
+import { BinaryDataService } from '@/binary-data/binary-data.service';
+
+import {
+	assertBinaryData,
+	binaryToString,
+	copyBinaryFile,
+	detectBinaryEncoding,
+	getBinaryDataBuffer,
+	getBinaryHelperFunctions,
+	prepareBinaryData,
+	setBinaryDataBuffer,
+} from '../binary-helper-functions';
+
+const workflowId = 'workflow123';
+const executionId = 'execution456';
+
+const bufferToIncomingMessage = (buffer: Buffer, encoding = 'utf-8') => {
+	const incomingMessage = Readable.from(buffer) as IncomingMessage;
+	incomingMessage.headers = { 'content-type': `application/json;charset=${encoding}` };
+	// @ts-expect-error need this hack to fake `instanceof IncomingMessage` checks
+	incomingMessage.__proto__ = IncomingMessage.prototype;
+	return incomingMessage;
+};
+
+describe('test binary data helper methods', () => {
+	let binaryDataService: BinaryDataService;
+	const temporaryDir = mkdtempSync(join(tmpdir(), 'n8n'));
+
+	beforeEach(() => {
+		binaryDataService = new BinaryDataService();
+		Container.set(BinaryDataService, binaryDataService);
+	});
+
+	test("test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'default' mode", async () => {
+		// Setup a 'default' binary data manager instance
+		await binaryDataService.init({
+			mode: 'default',
+			availableModes: ['default'],
+			localStoragePath: temporaryDir,
+		});
+
+		// Set our binary data buffer
+		const inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
+		const setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
+			{
+				mimeType: 'txt',
+				data: 'This should be overwritten by the actual payload in the response',
+			},
+			inputData,
+			'workflowId',
+			'executionId',
+		);
+
+		// Expect our return object to contain the base64 encoding of the input data, as it should be stored in memory.
+		expect(setBinaryDataBufferResponse.data).toEqual(inputData.toString('base64'));
+
+		// Now, re-fetch our data.
+		// An ITaskDataConnections object is used to share data between nodes. The top level property, 'main', represents the successful output object from a previous node.
+		const taskDataConnectionsInput: ITaskDataConnections = {
+			main: [],
+		};
+
+		// We add an input set, with one item at index 0, to this input. It contains an empty json payload and our binary data.
+		taskDataConnectionsInput.main.push([
+			{
+				json: {},
+				binary: {
+					data: setBinaryDataBufferResponse,
+				},
+			},
+		]);
+
+		// Now, lets fetch our data! The item will be item index 0.
+		const getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
+			taskDataConnectionsInput,
+			0,
+			'data',
+			0,
+		);
+
+		expect(getBinaryDataBufferResponse).toEqual(inputData);
+	});
+
+	test("test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'filesystem' mode", async () => {
+		// Setup a 'filesystem' binary data manager instance
+		await binaryDataService.init({
+			mode: 'filesystem',
+			availableModes: ['filesystem'],
+			localStoragePath: temporaryDir,
+		});
+
+		// Set our binary data buffer
+		const inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
+		const setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
+			{
+				mimeType: 'txt',
+				data: 'This should be overwritten with the name of the configured data manager',
+			},
+			inputData,
+			'workflowId',
+			'executionId',
+		);
+
+		// Expect our return object to contain the name of the configured data manager.
+		expect(setBinaryDataBufferResponse.data).toEqual('filesystem-v2');
+
+		// Ensure that the input data was successfully persisted to disk.
+		expect(
+			readFileSync(
+				`${temporaryDir}/${setBinaryDataBufferResponse.id?.replace('filesystem-v2:', '')}`,
+			),
+		).toEqual(inputData);
+
+		// Now, re-fetch our data.
+		// An ITaskDataConnections object is used to share data between nodes. The top level property, 'main', represents the successful output object from a previous node.
+		const taskDataConnectionsInput: ITaskDataConnections = {
+			main: [],
+		};
+
+		// We add an input set, with one item at index 0, to this input. It contains an empty json payload and our binary data.
+		taskDataConnectionsInput.main.push([
+			{
+				json: {},
+				binary: {
+					data: setBinaryDataBufferResponse,
+				},
+			},
+		]);
+
+		// Now, lets fetch our data! The item will be item index 0.
+		const getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
+			taskDataConnectionsInput,
+			0,
+			'data',
+			0,
+		);
+
+		expect(getBinaryDataBufferResponse).toEqual(inputData);
+	});
+});
+
+describe('binaryToString', () => {
+	const ENCODING_SAMPLES = {
+		utf8: {
+			text: 'Hello, 世界! τεστ мир ⚡️ é à ü ñ',
+			buffer: Buffer.from([
+				0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0xe4, 0xb8, 0x96, 0xe7, 0x95, 0x8c, 0x21, 0x20,
+				0xcf, 0x84, 0xce, 0xb5, 0xcf, 0x83, 0xcf, 0x84, 0x20, 0xd0, 0xbc, 0xd0, 0xb8, 0xd1, 0x80,
+				0x20, 0xe2, 0x9a, 0xa1, 0xef, 0xb8, 0x8f, 0x20, 0xc3, 0xa9, 0x20, 0xc3, 0xa0, 0x20, 0xc3,
+				0xbc, 0x20, 0xc3, 0xb1,
+			]),
+		},
+
+		'iso-8859-15': {
+			text: 'Café € personnalité',
+			buffer: Buffer.from([
+				0x43, 0x61, 0x66, 0xe9, 0x20, 0xa4, 0x20, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x6e, 0x61,
+				0x6c, 0x69, 0x74, 0xe9,
+			]),
+		},
+
+		latin1: {
+			text: 'señor année déjà',
+			buffer: Buffer.from([
+				0x73, 0x65, 0xf1, 0x6f, 0x72, 0x20, 0x61, 0x6e, 0x6e, 0xe9, 0x65, 0x20, 0x64, 0xe9, 0x6a,
+				0xe0,
+			]),
+		},
+
+		ascii: {
+			text: 'Hello, World! 123',
+			buffer: Buffer.from([
+				0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x20, 0x31,
+				0x32, 0x33,
+			]),
+		},
+
+		'windows-1252': {
+			text: '€ Smart "quotes" • bullet',
+			buffer: Buffer.from([
+				0x80, 0x20, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x20, 0x22, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x73,
+				0x22, 0x20, 0x95, 0x20, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74,
+			]),
+		},
+
+		'shift-jis': {
+			text: 'こんにちは世界',
+			buffer: Buffer.from([
+				0x82, 0xb1, 0x82, 0xf1, 0x82, 0xc9, 0x82, 0xbf, 0x82, 0xcd, 0x90, 0xa2, 0x8a, 0x45,
+			]),
+		},
+
+		big5: {
+			text: '哈囉世界',
+			buffer: Buffer.from([0xab, 0xa2, 0xc5, 0x6f, 0xa5, 0x40, 0xac, 0xc9]),
+		},
+
+		'koi8-r': {
+			text: 'Привет мир',
+			buffer: Buffer.from([0xf0, 0xd2, 0xc9, 0xd7, 0xc5, 0xd4, 0x20, 0xcd, 0xc9, 0xd2]),
+		},
+	};
+
+	describe('should handle Buffer', () => {
+		for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
+			test(`with ${encoding}`, async () => {
+				const data = await binaryToString(buffer, encoding);
+				expect(data).toBe(text);
+			});
+		}
+	});
+
+	describe('should handle streams', () => {
+		for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
+			test(`with ${encoding}`, async () => {
+				const stream = Readable.from(buffer);
+				const data = await binaryToString(stream, encoding);
+				expect(data).toBe(text);
+			});
+		}
+	});
+
+	describe('should handle IncomingMessage', () => {
+		for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
+			test(`with ${encoding}`, async () => {
+				const incomingMessage = bufferToIncomingMessage(buffer, encoding);
+				const data = await binaryToString(incomingMessage);
+				expect(data).toBe(text);
+			});
+		}
+	});
+
+	it('should handle undefined encoding', async () => {
+		const buffer = Buffer.from('Test');
+		const result = await binaryToString(buffer);
+		expect(result).toBe('Test');
+	});
+
+	it('should handle stream with no explicit encoding', async () => {
+		const stream = Readable.from(Buffer.from('Test'));
+		const result = await binaryToString(stream);
+		expect(result).toBe('Test');
+	});
+});
+
+describe('detectBinaryEncoding', () => {
+	it('should detect encoding for utf-8 buffers', () => {
+		const utf8Buffer = Buffer.from('Hello, 世界');
+		expect(detectBinaryEncoding(utf8Buffer)).toBe('UTF-8');
+	});
+
+	it('should detect encoding for latin1 buffers', () => {
+		const latinBuffer = Buffer.from('señor', 'latin1');
+		expect(detectBinaryEncoding(latinBuffer)).toBe('ISO-8859-1');
+	});
+
+	it('should handle empty buffer', () => {
+		const emptyBuffer = Buffer.from('');
+		expect(detectBinaryEncoding(emptyBuffer)).toBeDefined();
+	});
+});
+
+describe('assertBinaryData', () => {
+	const mockNode = mock<INode>({ name: 'Test Node' });
+
+	it('should throw error when no binary data exists', () => {
+		const inputData = { main: [[{ json: {} }]] };
+
+		expect(() => assertBinaryData(inputData, mockNode, 0, 'testFile', 0)).toThrow(
+			"expects the node's input data to contain a binary file",
+		);
+	});
+
+	it('should throw error when specific binary property does not exist', () => {
+		const inputData = {
+			main: [
+				[
+					{
+						json: {},
+						binary: {
+							otherFile: mock<IBinaryData>(),
+						},
+					},
+				],
+			],
+		};
+
+		expect(() => assertBinaryData(inputData, mockNode, 0, 'testFile', 0)).toThrow(
+			'The item has no binary field',
+		);
+	});
+
+	it('should return binary data when it exists', () => {
+		const binaryData = mock<IBinaryData>({ fileName: 'test.txt' });
+		const inputData = {
+			main: [
+				[
+					{
+						json: {},
+						binary: {
+							testFile: binaryData,
+						},
+					},
+				],
+			],
+		};
+
+		const result = assertBinaryData(inputData, mockNode, 0, 'testFile', 0);
+		expect(result).toBe(binaryData);
+	});
+});
+
+describe('copyBinaryFile', () => {
+	const fileName = 'test.txt';
+	const filePath = `/path/to/${fileName}`;
+	const binaryData: IBinaryData = {
+		data: '',
+		mimeType: 'text/plain',
+		fileName,
+	};
+
+	const binaryDataService = mock<BinaryDataService>();
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+		Container.set(BinaryDataService, binaryDataService);
+		binaryDataService.copyBinaryFile.mockResolvedValueOnce(binaryData);
+	});
+
+	it('should handle files without explicit mime type', async () => {
+		const result = await copyBinaryFile(workflowId, executionId, filePath, fileName);
+
+		expect(result.fileName).toBe(fileName);
+		expect(binaryDataService.copyBinaryFile).toHaveBeenCalledWith(
+			workflowId,
+			executionId,
+			{
+				...binaryData,
+				fileExtension: 'txt',
+				fileType: 'text',
+			},
+			filePath,
+		);
+	});
+
+	it('should use provided mime type', async () => {
+		const result = await copyBinaryFile(
+			workflowId,
+			executionId,
+			filePath,
+			fileName,
+			'application/octet-stream',
+		);
+
+		expect(result.fileName).toBe(fileName);
+		expect(binaryDataService.copyBinaryFile).toHaveBeenCalledWith(
+			workflowId,
+			executionId,
+			{
+				...binaryData,
+				fileExtension: 'bin',
+				fileType: undefined,
+				mimeType: 'application/octet-stream',
+			},
+			filePath,
+		);
+	});
+});
+
+describe('prepareBinaryData', () => {
+	const buffer: Buffer = Buffer.from('test', 'utf8');
+	const binaryDataService = mock<BinaryDataService>();
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+		Container.set(BinaryDataService, binaryDataService);
+
+		binaryDataService.store.mockImplementation(async (_w, _e, _b, binaryData) => binaryData);
+	});
+
+	it('parses filenames correctly', async () => {
+		const fileName = 'test-file';
+
+		const result = await prepareBinaryData(buffer, executionId, workflowId, fileName);
+
+		expect(result.fileName).toEqual(fileName);
+		expect(binaryDataService.store).toHaveBeenCalledWith(workflowId, executionId, buffer, {
+			data: '',
+			fileExtension: undefined,
+			fileName,
+			fileType: 'text',
+			mimeType: 'text/plain',
+		});
+	});
+
+	it('handles IncomingMessage with responseUrl', async () => {
+		const incomingMessage = bufferToIncomingMessage(buffer);
+		incomingMessage.responseUrl = 'http://example.com/file.txt';
+
+		const result = await prepareBinaryData(incomingMessage, executionId, workflowId);
+
+		expect(result.fileName).toBe('file.txt');
+		expect(result.mimeType).toBe('text/plain');
+	});
+
+	it('handles buffer with no detectable mime type', async () => {
+		const buffer = Buffer.from([0x00, 0x01, 0x02, 0x03]);
+
+		const result = await prepareBinaryData(buffer, executionId, workflowId);
+
+		expect(result.mimeType).toBe('text/plain');
+	});
+
+	it('handles IncomingMessage with no content type or filename', async () => {
+		const incomingMessage = bufferToIncomingMessage(Buffer.from('test'));
+		delete incomingMessage.headers['content-type'];
+		delete incomingMessage.contentDisposition;
+
+		const result = await prepareBinaryData(incomingMessage, executionId, workflowId);
+
+		expect(result.mimeType).toBe('text/plain');
+	});
+});
+
+describe('setBinaryDataBuffer', () => {
+	it('should handle empty buffer', async () => {
+		const emptyBuffer = Buffer.from('');
+		const binaryData: IBinaryData = {
+			mimeType: 'text/plain',
+			data: '',
+		};
+
+		const result = await setBinaryDataBuffer(binaryData, emptyBuffer, workflowId, executionId);
+
+		expect(result).toBeDefined();
+		expect(result.data).toBe('');
+	});
+});
+
+describe('getBinaryHelperFunctions', () => {
+	it('should return helper functions with correct context', async () => {
+		const additionalData = { executionId } as IWorkflowExecuteAdditionalData;
+
+		const helperFunctions = getBinaryHelperFunctions(additionalData, workflowId);
+
+		const expectedMethods = [
+			'getBinaryPath',
+			'getBinaryStream',
+			'getBinaryMetadata',
+			'binaryToBuffer',
+			'binaryToString',
+			'prepareBinaryData',
+			'setBinaryDataBuffer',
+			'copyBinaryFile',
+		] as const;
+
+		expectedMethods.forEach((method) => {
+			expect(helperFunctions).toHaveProperty(method);
+			expect(typeof helperFunctions[method]).toBe('function');
+		});
+
+		await expect(async () => await helperFunctions.copyBinaryFile()).rejects.toThrow(
+			'`copyBinaryFile` has been removed',
+		);
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/cleanupParameterData.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/cleanup-parameter-data.test.ts
similarity index 94%
rename from packages/core/src/node-execution-context/utils/__tests__/cleanupParameterData.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/cleanup-parameter-data.test.ts
index 47913669b6..a3b22fcdd2 100644
--- a/packages/core/src/node-execution-context/utils/__tests__/cleanupParameterData.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/cleanup-parameter-data.test.ts
@@ -2,7 +2,7 @@ import toPlainObject from 'lodash/toPlainObject';
 import { DateTime } from 'luxon';
 import type { NodeParameterValue } from 'n8n-workflow';
 
-import { cleanupParameterData } from '../cleanupParameterData';
+import { cleanupParameterData } from '../cleanup-parameter-data';
 
 describe('cleanupParameterData', () => {
 	it('should stringify Luxon dates in-place', () => {
diff --git a/packages/core/test/CreateNodeAsTool.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/create-node-as-tool.test.ts
similarity index 99%
rename from packages/core/test/CreateNodeAsTool.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/create-node-as-tool.test.ts
index fdc14269e1..98827bce61 100644
--- a/packages/core/test/CreateNodeAsTool.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/create-node-as-tool.test.ts
@@ -2,7 +2,7 @@ import { mock } from 'jest-mock-extended';
 import type { INodeType, ISupplyDataFunctions, INode } from 'n8n-workflow';
 import { z } from 'zod';
 
-import { createNodeAsTool } from '@/CreateNodeAsTool';
+import { createNodeAsTool } from '../create-node-as-tool';
 
 jest.mock('@langchain/core/tools', () => ({
 	DynamicStructuredTool: jest.fn().mockImplementation((config) => ({
@@ -319,7 +319,7 @@ describe('createNodeAsTool', () => {
 
 			const tool = createNodeAsTool(options).response;
 
-			expect(tool.schema.shape.complexJson._def.innerType).toBeInstanceOf(z.ZodRecord);
+			expect(tool.schema.shape.complexJson._def.innerType).toBeInstanceOf(z.ZodEffects);
 			expect(tool.schema.shape.complexJson.description).toBe('Param with complex JSON default');
 			expect(tool.schema.shape.complexJson._def.defaultValue()).toEqual({
 				nested: { key: 'value' },
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/deduplication-helper-functions.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/deduplication-helper-functions.test.ts
new file mode 100644
index 0000000000..a9bfe54b90
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/deduplication-helper-functions.test.ts
@@ -0,0 +1,25 @@
+import { mock } from 'jest-mock-extended';
+import type { Workflow, INode } from 'n8n-workflow';
+
+import { getDeduplicationHelperFunctions } from '../deduplication-helper-functions';
+
+describe('getDeduplicationHelperFunctions', () => {
+	const workflow = mock<Workflow>();
+	const node = mock<INode>();
+	const helperFunctions = getDeduplicationHelperFunctions(workflow, node);
+
+	it('should create helper functions with correct context', () => {
+		const expectedMethods = [
+			'checkProcessedAndRecord',
+			'checkProcessedItemsAndRecord',
+			'removeProcessed',
+			'clearAllProcessedItems',
+			'getProcessedDataCount',
+		] as const;
+
+		expectedMethods.forEach((method) => {
+			expect(helperFunctions).toHaveProperty(method);
+			expect(typeof helperFunctions[method]).toBe('function');
+		});
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/ensureType.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/ensure-type.test.ts
similarity index 98%
rename from packages/core/src/node-execution-context/utils/__tests__/ensureType.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/ensure-type.test.ts
index 1637d988c9..374b3d43bc 100644
--- a/packages/core/src/node-execution-context/utils/__tests__/ensureType.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/ensure-type.test.ts
@@ -1,6 +1,6 @@
 import { ExpressionError } from 'n8n-workflow';
 
-import { ensureType } from '../ensureType';
+import { ensureType } from '../ensure-type';
 
 describe('ensureType', () => {
 	it('throws error for null value', () => {
diff --git a/packages/core/test/WorkflowExecutionMetadata.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/execution-metadata.test.ts
similarity index 88%
rename from packages/core/test/WorkflowExecutionMetadata.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/execution-metadata.test.ts
index 63d0892e6a..b08e38da5b 100644
--- a/packages/core/test/WorkflowExecutionMetadata.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/execution-metadata.test.ts
@@ -1,13 +1,14 @@
 import type { IRunExecutionData } from 'n8n-workflow';
 
 import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
+
 import {
 	setWorkflowExecutionMetadata,
 	setAllWorkflowExecutionMetadata,
 	KV_LIMIT,
 	getWorkflowExecutionMetadata,
 	getAllWorkflowExecutionMetadata,
-} from '@/ExecutionMetadata';
+} from '../execution-metadata';
 
 describe('Execution Metadata functions', () => {
 	test('setWorkflowExecutionMetadata will set a value', () => {
@@ -204,15 +205,12 @@ describe('Execution Metadata functions', () => {
 			},
 		} as IRunExecutionData;
 
-		setWorkflowExecutionMetadata(
-			executionData,
-			'test1',
-			'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab',
-		);
+		const longValue = 'a'.repeat(513);
+
+		setWorkflowExecutionMetadata(executionData, 'test1', longValue);
 
 		expect(metadata).toEqual({
-			test1:
-				'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+			test1: longValue.slice(0, 512),
 		});
 	});
 });
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
new file mode 100644
index 0000000000..d031fb4993
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
@@ -0,0 +1,186 @@
+import { Container } from '@n8n/di';
+import type { INode } from 'n8n-workflow';
+import { createReadStream } from 'node:fs';
+import { access as fsAccess } from 'node:fs/promises';
+import { join } from 'node:path';
+
+import {
+	BINARY_DATA_STORAGE_PATH,
+	BLOCK_FILE_ACCESS_TO_N8N_FILES,
+	CONFIG_FILES,
+	CUSTOM_EXTENSION_ENV,
+	RESTRICT_FILE_ACCESS_TO,
+	UM_EMAIL_TEMPLATES_INVITE,
+	UM_EMAIL_TEMPLATES_PWRESET,
+} from '@/constants';
+import { InstanceSettings } from '@/instance-settings';
+
+import { getFileSystemHelperFunctions, isFilePathBlocked } from '../file-system-helper-functions';
+
+jest.mock('node:fs');
+jest.mock('node:fs/promises');
+
+const originalProcessEnv = { ...process.env };
+
+let instanceSettings: InstanceSettings;
+beforeEach(() => {
+	process.env = { ...originalProcessEnv };
+
+	const error = new Error('ENOENT');
+	// @ts-expect-error undefined property
+	error.code = 'ENOENT';
+	(fsAccess as jest.Mock).mockRejectedValue(error);
+
+	instanceSettings = Container.get(InstanceSettings);
+});
+
+describe('isFilePathBlocked', () => {
+	beforeEach(() => {
+		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
+	});
+
+	it('should return true for static cache dir', () => {
+		const filePath = instanceSettings.staticCacheDir;
+		expect(isFilePathBlocked(filePath)).toBe(true);
+	});
+
+	it('should return true for restricted paths', () => {
+		const restrictedPath = instanceSettings.n8nFolder;
+		expect(isFilePathBlocked(restrictedPath)).toBe(true);
+	});
+
+	it('should handle empty allowed paths', () => {
+		delete process.env[RESTRICT_FILE_ACCESS_TO];
+		const result = isFilePathBlocked('/some/random/path');
+		expect(result).toBe(false);
+	});
+
+	it('should handle multiple allowed paths', () => {
+		process.env[RESTRICT_FILE_ACCESS_TO] = '/path1;/path2;/path3';
+		const allowedPath = '/path2/somefile';
+		expect(isFilePathBlocked(allowedPath)).toBe(false);
+	});
+
+	it('should handle empty strings in allowed paths', () => {
+		process.env[RESTRICT_FILE_ACCESS_TO] = '/path1;;/path2';
+		const allowedPath = '/path2/somefile';
+		expect(isFilePathBlocked(allowedPath)).toBe(false);
+	});
+
+	it('should trim whitespace in allowed paths', () => {
+		process.env[RESTRICT_FILE_ACCESS_TO] = ' /path1 ; /path2 ; /path3 ';
+		const allowedPath = '/path2/somefile';
+		expect(isFilePathBlocked(allowedPath)).toBe(false);
+	});
+
+	it('should return false when BLOCK_FILE_ACCESS_TO_N8N_FILES is false', () => {
+		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'false';
+		const restrictedPath = instanceSettings.n8nFolder;
+		expect(isFilePathBlocked(restrictedPath)).toBe(false);
+	});
+
+	it('should return true when path is in allowed paths but still restricted', () => {
+		process.env[RESTRICT_FILE_ACCESS_TO] = '/some/allowed/path';
+		const restrictedPath = instanceSettings.n8nFolder;
+		expect(isFilePathBlocked(restrictedPath)).toBe(true);
+	});
+
+	it('should return false when path is in allowed paths', () => {
+		const allowedPath = '/some/allowed/path';
+		process.env[RESTRICT_FILE_ACCESS_TO] = allowedPath;
+		expect(isFilePathBlocked(allowedPath)).toBe(false);
+	});
+
+	it('should return true when file paths in CONFIG_FILES', () => {
+		process.env[CONFIG_FILES] = '/path/to/config1,/path/to/config2';
+		const configPath = '/path/to/config1/somefile';
+		expect(isFilePathBlocked(configPath)).toBe(true);
+	});
+
+	it('should return true when file paths in CUSTOM_EXTENSION_ENV', () => {
+		process.env[CUSTOM_EXTENSION_ENV] = '/path/to/extensions1;/path/to/extensions2';
+		const extensionPath = '/path/to/extensions1/somefile';
+		expect(isFilePathBlocked(extensionPath)).toBe(true);
+	});
+
+	it('should return true when file paths in BINARY_DATA_STORAGE_PATH', () => {
+		process.env[BINARY_DATA_STORAGE_PATH] = '/path/to/binary/storage';
+		const binaryPath = '/path/to/binary/storage/somefile';
+		expect(isFilePathBlocked(binaryPath)).toBe(true);
+	});
+
+	it('should block file paths in email template paths', () => {
+		process.env[UM_EMAIL_TEMPLATES_INVITE] = '/path/to/invite/templates';
+		process.env[UM_EMAIL_TEMPLATES_PWRESET] = '/path/to/pwreset/templates';
+
+		const invitePath = '/path/to/invite/templates/invite.html';
+		const pwResetPath = '/path/to/pwreset/templates/reset.html';
+
+		expect(isFilePathBlocked(invitePath)).toBe(true);
+		expect(isFilePathBlocked(pwResetPath)).toBe(true);
+	});
+});
+
+describe('getFileSystemHelperFunctions', () => {
+	const node = { type: 'TestNode' } as INode;
+	const helperFunctions = getFileSystemHelperFunctions(node);
+
+	it('should create helper functions with correct context', () => {
+		const expectedMethods = ['createReadStream', 'getStoragePath', 'writeContentToFile'] as const;
+
+		expectedMethods.forEach((method) => {
+			expect(helperFunctions).toHaveProperty(method);
+			expect(typeof helperFunctions[method]).toBe('function');
+		});
+	});
+
+	describe('getStoragePath', () => {
+		it('returns correct path', () => {
+			const expectedPath = join(instanceSettings.n8nFolder, `storage/${node.type}`);
+			expect(helperFunctions.getStoragePath()).toBe(expectedPath);
+		});
+	});
+
+	describe('createReadStream', () => {
+		it('should throw error for non-existent file', async () => {
+			const filePath = '/non/existent/file';
+			const error = new Error('ENOENT');
+			// @ts-expect-error undefined property
+			error.code = 'ENOENT';
+			(fsAccess as jest.Mock).mockRejectedValueOnce(error);
+
+			await expect(helperFunctions.createReadStream(filePath)).rejects.toThrow(
+				`The file "${filePath}" could not be accessed.`,
+			);
+		});
+
+		it('should throw when file access is blocked', async () => {
+			process.env[RESTRICT_FILE_ACCESS_TO] = '/allowed/path';
+			(fsAccess as jest.Mock).mockResolvedValueOnce({});
+			await expect(helperFunctions.createReadStream('/blocked/path')).rejects.toThrow(
+				'Access to the file is not allowed',
+			);
+		});
+
+		it('should create a read stream if file access is permitted', async () => {
+			const filePath = '/allowed/path';
+			(fsAccess as jest.Mock).mockResolvedValueOnce({});
+			await helperFunctions.createReadStream(filePath);
+			expect(createReadStream).toHaveBeenCalledWith(filePath);
+		});
+	});
+
+	describe('writeContentToFile', () => {
+		it('should throw error for blocked file path', async () => {
+			process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
+
+			await expect(
+				helperFunctions.writeContentToFile(
+					instanceSettings.n8nFolder + '/test.txt',
+					'content',
+					'w',
+				),
+			).rejects.toThrow('not writable');
+		});
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/getAdditionalKeys.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-additional-keys.test.ts
similarity index 97%
rename from packages/core/src/node-execution-context/utils/__tests__/getAdditionalKeys.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-additional-keys.test.ts
index 6ac1fbdc07..b78de39a6d 100644
--- a/packages/core/src/node-execution-context/utils/__tests__/getAdditionalKeys.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-additional-keys.test.ts
@@ -7,9 +7,9 @@ import type {
 	SecretsHelpersBase,
 } from 'n8n-workflow';
 
-import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/Constants';
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/constants';
 
-import { getAdditionalKeys } from '../getAdditionalKeys';
+import { getAdditionalKeys } from '../get-additional-keys';
 
 describe('getAdditionalKeys', () => {
 	const secretsHelpers = mock<SecretsHelpersBase>();
diff --git a/packages/core/src/node-execution-context/utils/__tests__/getInputConnectionData.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-input-connection-data.test.ts
similarity index 100%
rename from packages/core/src/node-execution-context/utils/__tests__/getInputConnectionData.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-input-connection-data.test.ts
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/parse-incoming-message.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/parse-incoming-message.test.ts
new file mode 100644
index 0000000000..0c2ca3113e
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/parse-incoming-message.test.ts
@@ -0,0 +1,252 @@
+import type { IncomingMessage } from 'http';
+import { mock } from 'jest-mock-extended';
+
+import {
+	parseContentDisposition,
+	parseContentType,
+	parseIncomingMessage,
+} from '../parse-incoming-message';
+
+describe('parseContentType', () => {
+	const testCases = [
+		{
+			input: 'text/plain',
+			expected: {
+				type: 'text/plain',
+				parameters: {
+					charset: 'utf-8',
+				},
+			},
+			description: 'should parse basic content type',
+		},
+		{
+			input: 'TEXT/PLAIN',
+			expected: {
+				type: 'text/plain',
+				parameters: {
+					charset: 'utf-8',
+				},
+			},
+			description: 'should convert type to lowercase',
+		},
+		{
+			input: 'text/html; charset=iso-8859-1',
+			expected: {
+				type: 'text/html',
+				parameters: {
+					charset: 'iso-8859-1',
+				},
+			},
+			description: 'should parse content type with charset',
+		},
+		{
+			input: 'application/json; charset=utf-8; boundary=---123',
+			expected: {
+				type: 'application/json',
+				parameters: {
+					charset: 'utf-8',
+					boundary: '---123',
+				},
+			},
+			description: 'should parse content type with multiple parameters',
+		},
+		{
+			input: 'text/plain; charset="utf-8"; filename="test.txt"',
+			expected: {
+				type: 'text/plain',
+				parameters: {
+					charset: 'utf-8',
+					filename: 'test.txt',
+				},
+			},
+			description: 'should handle quoted parameter values',
+		},
+		{
+			input: 'text/plain; filename=%22test%20file.txt%22',
+			expected: {
+				type: 'text/plain',
+				parameters: {
+					charset: 'utf-8',
+					filename: 'test file.txt',
+				},
+			},
+			description: 'should handle encoded parameter values',
+		},
+		{
+			input: undefined,
+			expected: null,
+			description: 'should return null for undefined input',
+		},
+		{
+			input: '',
+			expected: null,
+			description: 'should return null for empty string',
+		},
+	];
+
+	test.each(testCases)('$description', ({ input, expected }) => {
+		expect(parseContentType(input)).toEqual(expected);
+	});
+});
+
+describe('parseContentDisposition', () => {
+	const testCases = [
+		{
+			input: 'attachment; filename="file.txt"',
+			expected: { type: 'attachment', filename: 'file.txt' },
+			description: 'should parse basic content disposition',
+		},
+		{
+			input: 'attachment; filename=file.txt',
+			expected: { type: 'attachment', filename: 'file.txt' },
+			description: 'should parse filename without quotes',
+		},
+		{
+			input: 'inline; filename="image.jpg"',
+			expected: { type: 'inline', filename: 'image.jpg' },
+			description: 'should parse inline disposition',
+		},
+		{
+			input: 'attachment; filename="my file.pdf"',
+			expected: { type: 'attachment', filename: 'my file.pdf' },
+			description: 'should parse filename with spaces',
+		},
+		{
+			input: "attachment; filename*=UTF-8''my%20file.txt",
+			expected: { type: 'attachment', filename: 'my file.txt' },
+			description: 'should parse filename* parameter (RFC 5987)',
+		},
+		{
+			input: 'filename="test.txt"',
+			expected: { type: 'attachment', filename: 'test.txt' },
+			description: 'should handle invalid syntax but with filename',
+		},
+		{
+			input: 'filename=test.txt',
+			expected: { type: 'attachment', filename: 'test.txt' },
+			description: 'should handle invalid syntax with only filename parameter',
+		},
+		{
+			input: undefined,
+			expected: null,
+			description: 'should return null for undefined input',
+		},
+		{
+			input: '',
+			expected: null,
+			description: 'should return null for empty string',
+		},
+		{
+			input: 'attachment; filename="%F0%9F%98%80.txt"',
+			expected: { type: 'attachment', filename: '😀.txt' },
+			description: 'should handle encoded filenames',
+		},
+		{
+			input: 'attachment; size=123; filename="test.txt"; creation-date="Thu, 1 Jan 2020"',
+			expected: { type: 'attachment', filename: 'test.txt' },
+			description: 'should handle multiple parameters',
+		},
+	];
+
+	test.each(testCases)('$description', ({ input, expected }) => {
+		expect(parseContentDisposition(input)).toEqual(expected);
+	});
+});
+
+describe('parseIncomingMessage', () => {
+	it('parses valid content-type header', () => {
+		const message = mock<IncomingMessage>({
+			headers: { 'content-type': 'application/json', 'content-disposition': undefined },
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentType).toEqual('application/json');
+	});
+
+	it('parses valid content-type header with parameters', () => {
+		const message = mock<IncomingMessage>({
+			headers: {
+				'content-type': 'application/json; charset=utf-8',
+				'content-disposition': undefined,
+			},
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentType).toEqual('application/json');
+		expect(message.encoding).toEqual('utf-8');
+	});
+
+	it('parses valid content-type header with encoding wrapped in quotes', () => {
+		const message = mock<IncomingMessage>({
+			headers: {
+				'content-type': 'application/json; charset="utf-8"',
+				'content-disposition': undefined,
+			},
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentType).toEqual('application/json');
+		expect(message.encoding).toEqual('utf-8');
+	});
+
+	it('parses valid content-disposition header with filename*', () => {
+		const message = mock<IncomingMessage>({
+			headers: {
+				'content-type': undefined,
+				'content-disposition':
+					'attachment; filename="screenshot%20(1).png"; filename*=UTF-8\'\'screenshot%20(1).png',
+			},
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentDisposition).toEqual({
+			filename: 'screenshot (1).png',
+			type: 'attachment',
+		});
+	});
+
+	it('parses valid content-disposition header with filename* (quoted)', () => {
+		const message = mock<IncomingMessage>({
+			headers: {
+				'content-type': undefined,
+				'content-disposition': ' attachment;filename*="utf-8\' \'test-unsplash.jpg"',
+			},
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentDisposition).toEqual({
+			filename: 'test-unsplash.jpg',
+			type: 'attachment',
+		});
+	});
+
+	it('parses valid content-disposition header with filename and trailing ";"', () => {
+		const message = mock<IncomingMessage>({
+			headers: {
+				'content-type': undefined,
+				'content-disposition': 'inline; filename="screenshot%20(1).png";',
+			},
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentDisposition).toEqual({
+			filename: 'screenshot (1).png',
+			type: 'inline',
+		});
+	});
+
+	it('parses non standard content-disposition with missing type', () => {
+		const message = mock<IncomingMessage>({
+			headers: {
+				'content-type': undefined,
+				'content-disposition': 'filename="screenshot%20(1).png";',
+			},
+		});
+		parseIncomingMessage(message);
+
+		expect(message.contentDisposition).toEqual({
+			filename: 'screenshot (1).png',
+			type: 'attachment',
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/parse-request-object.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/parse-request-object.test.ts
new file mode 100644
index 0000000000..9812057a4b
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/parse-request-object.test.ts
@@ -0,0 +1,133 @@
+import FormData from 'form-data';
+import type { Agent } from 'https';
+import { mock } from 'jest-mock-extended';
+import type { IHttpRequestMethods, IRequestOptions } from 'n8n-workflow';
+import type { SecureContextOptions } from 'tls';
+
+import { parseRequestObject } from '../parse-request-object';
+
+describe('parseRequestObject', () => {
+	test('should handle basic request options', async () => {
+		const axiosOptions = await parseRequestObject({
+			url: 'https://example.com',
+			method: 'POST',
+			headers: { 'content-type': 'application/json' },
+			body: { key: 'value' },
+		});
+
+		expect(axiosOptions).toEqual(
+			expect.objectContaining({
+				url: 'https://example.com',
+				method: 'POST',
+				headers: { accept: '*/*', 'content-type': 'application/json' },
+				data: { key: 'value' },
+				maxRedirects: 0,
+			}),
+		);
+	});
+
+	test('should set correct headers for FormData', async () => {
+		const formData = new FormData();
+		formData.append('key', 'value');
+
+		const axiosOptions = await parseRequestObject({
+			url: 'https://example.com',
+			formData,
+			headers: {
+				'content-type': 'multipart/form-data',
+			},
+		});
+
+		expect(axiosOptions.headers).toMatchObject({
+			accept: '*/*',
+			'content-length': 163,
+			'content-type': expect.stringMatching(/^multipart\/form-data; boundary=/),
+		});
+
+		expect(axiosOptions.data).toBeInstanceOf(FormData);
+	});
+
+	test('should not use Host header for SNI', async () => {
+		const axiosOptions = await parseRequestObject({
+			url: 'https://example.de/foo/bar',
+			headers: { Host: 'other.host.com' },
+		});
+		expect((axiosOptions.httpsAgent as Agent).options.servername).toEqual('example.de');
+	});
+
+	describe('should set SSL certificates', () => {
+		const agentOptions: SecureContextOptions = {
+			ca: '-----BEGIN CERTIFICATE-----\nTEST\n-----END CERTIFICATE-----',
+		};
+		const requestObject: IRequestOptions = {
+			method: 'GET',
+			uri: 'https://example.de',
+			agentOptions,
+		};
+
+		test('on regular requests', async () => {
+			const axiosOptions = await parseRequestObject(requestObject);
+			expect((axiosOptions.httpsAgent as Agent).options).toEqual({
+				servername: 'example.de',
+				...agentOptions,
+				noDelay: true,
+				path: null,
+			});
+		});
+
+		test('on redirected requests', async () => {
+			const axiosOptions = await parseRequestObject(requestObject);
+			expect(axiosOptions.beforeRedirect).toBeDefined;
+			// eslint-disable-next-line @typescript-eslint/no-explicit-any
+			const redirectOptions: Record<string, any> = { agents: {}, hostname: 'example.de' };
+			axiosOptions.beforeRedirect!(redirectOptions, mock());
+			expect(redirectOptions.agent).toEqual(redirectOptions.agents.https);
+			expect((redirectOptions.agent as Agent).options).toEqual({
+				servername: 'example.de',
+				...agentOptions,
+				noDelay: true,
+				path: null,
+			});
+		});
+	});
+
+	describe('when followRedirect is true', () => {
+		test.each(['GET', 'HEAD'] as IHttpRequestMethods[])(
+			'should set maxRedirects on %s ',
+			async (method) => {
+				const axiosOptions = await parseRequestObject({
+					method,
+					followRedirect: true,
+					maxRedirects: 1234,
+				});
+				expect(axiosOptions.maxRedirects).toEqual(1234);
+			},
+		);
+
+		test.each(['POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
+			'should not set maxRedirects on %s ',
+			async (method) => {
+				const axiosOptions = await parseRequestObject({
+					method,
+					followRedirect: true,
+					maxRedirects: 1234,
+				});
+				expect(axiosOptions.maxRedirects).toEqual(0);
+			},
+		);
+	});
+
+	describe('when followAllRedirects is true', () => {
+		test.each(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
+			'should set maxRedirects on %s ',
+			async (method) => {
+				const axiosOptions = await parseRequestObject({
+					method,
+					followAllRedirects: true,
+					maxRedirects: 1234,
+				});
+				expect(axiosOptions.maxRedirects).toEqual(1234);
+			},
+		);
+	});
+});
diff --git a/packages/core/src/node-execution-context/utils/__tests__/validateValueAgainstSchema.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/validate-value-against-schema.test.ts
similarity index 53%
rename from packages/core/src/node-execution-context/utils/__tests__/validateValueAgainstSchema.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/validate-value-against-schema.test.ts
index e09299a457..60d4ca5367 100644
--- a/packages/core/src/node-execution-context/utils/__tests__/validateValueAgainstSchema.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/validate-value-against-schema.test.ts
@@ -1,6 +1,6 @@
-import type { IDataObject, INode, INodeType } from 'n8n-workflow';
+import { ExpressionError, type IDataObject, type INode, type INodeType } from 'n8n-workflow';
 
-import { validateValueAgainstSchema } from '../validateValueAgainstSchema';
+import { validateValueAgainstSchema } from '../validate-value-against-schema';
 
 describe('validateValueAgainstSchema', () => {
 	test('should validate fixedCollection values parameter', () => {
@@ -246,4 +246,220 @@ describe('validateValueAgainstSchema', () => {
 		// value should be type number
 		expect(typeof result).toEqual('number');
 	});
+
+	describe('when validating a resource mapper value', () => {
+		describe('when attemptToConvertTypes === true', () => {
+			const nodeType = {
+				description: {
+					properties: [
+						{
+							name: 'operation',
+							type: 'resourceMapper',
+							typeOptions: {
+								resourceMapper: {
+									mode: 'add',
+								},
+							},
+						},
+					],
+				},
+			} as unknown as INodeType;
+
+			const node = {
+				parameters: {
+					operation: {
+						schema: [
+							{ id: 'num', type: 'number', required: true },
+							{ id: 'str', type: 'string', required: true },
+							{ id: 'obj', type: 'object', required: true },
+							{ id: 'arr', type: 'array', required: true },
+						],
+						attemptToConvertTypes: true,
+						mappingMode: '',
+						value: '',
+					},
+				},
+			} as unknown as INode;
+
+			const parameterName = 'operation.value';
+
+			describe('should correctly validate values for', () => {
+				test.each([
+					{ num: 0 },
+					{ num: 23 },
+					{ num: -0 },
+					{ num: -Infinity },
+					{ num: Infinity },
+					{ str: '' },
+					{ str: ' ' },
+					{ str: 'hello' },
+					{ arr: [] },
+					{ obj: {} },
+				])('%s', (value) => {
+					expect(() =>
+						validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0),
+					).not.toThrow();
+				});
+			});
+
+			describe('should throw an error for', () => {
+				test.each([{ num: NaN }, { num: undefined }, { num: null }])('%s', (value) => {
+					expect(() =>
+						validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0),
+					).toThrow();
+				});
+			});
+		});
+
+		describe('when showTypeConversionOptions is not set (=default)', () => {
+			test('should correctly convert types', () => {
+				const nodeType = {
+					description: {
+						properties: [
+							{
+								displayName: 'Columns',
+								name: 'columns',
+								type: 'resourceMapper',
+								required: true,
+								typeOptions: {
+									loadOptionsDependsOn: ['table.value', 'operation'],
+									resourceMapper: {
+										mode: 'upsert',
+									},
+								},
+							},
+						],
+					},
+				} as unknown as INodeType;
+
+				const node: INode = {
+					parameters: {
+						columns: {
+							mappingMode: 'defineBelow',
+							value: {
+								id: 2,
+								count: '={{ $json.count }}',
+							},
+							matchingColumns: ['id'],
+							attemptToConvertTypes: false,
+							convertFieldsToString: true,
+							schema: [
+								{
+									id: 'id',
+									displayName: 'id',
+									required: false,
+									defaultMatch: true,
+									display: true,
+									type: 'number',
+									canBeUsedToMatch: true,
+								},
+								{
+									id: 'count',
+									displayName: 'count',
+									required: false,
+									defaultMatch: false,
+									display: true,
+									type: 'number',
+									canBeUsedToMatch: false,
+								},
+							],
+						},
+						options: {},
+					},
+					id: '8d6cec63-8db1-440c-8966-4d6311ee69a9',
+					name: 'add products to DB',
+					type: 'n8n-nodes-base.postgres',
+					typeVersion: 2.3,
+					position: [420, 0],
+				};
+
+				const value = {
+					id: 2,
+					count: '23',
+				};
+
+				const parameterName = 'columns.value';
+
+				const result = validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0);
+
+				expect(result).toEqual({
+					id: 2,
+					count: 23,
+				});
+			});
+		});
+
+		describe('when showTypeConversionOptions is true', () => {
+			test('should throw an error', () => {
+				const nodeType = {
+					description: {
+						properties: [
+							{
+								displayName: 'Columns',
+								name: 'columns',
+								type: 'resourceMapper',
+								noDataExpression: true,
+								typeOptions: {
+									resourceMapper: {
+										showTypeConversionOptions: true,
+										mode: 'upsert',
+									},
+								},
+							},
+						],
+					},
+				} as unknown as INodeType;
+
+				const node: INode = {
+					parameters: {
+						columns: {
+							mappingMode: 'defineBelow',
+							value: {
+								id: 2,
+								count: '={{ $json.count }}',
+							},
+							matchingColumns: ['id'],
+							schema: [
+								{
+									id: 'id',
+									displayName: 'id',
+									required: false,
+									defaultMatch: true,
+									display: true,
+									type: 'number',
+									canBeUsedToMatch: true,
+								},
+								{
+									id: 'count',
+									displayName: 'count',
+									required: false,
+									defaultMatch: false,
+									display: true,
+									type: 'number',
+									canBeUsedToMatch: false,
+								},
+							],
+						},
+						options: {},
+					},
+					id: '8d6cec63-8db1-440c-8966-4d6311ee69a9',
+					name: 'add products to DB',
+					type: 'n8n-nodes-base.postgres',
+					typeVersion: 2.3,
+					position: [420, 0],
+				};
+
+				const value = {
+					id: 2,
+					count: '23',
+				};
+
+				const parameterName = 'columns.value';
+
+				expect(() =>
+					validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0),
+				).toThrow(new ExpressionError("Invalid input for 'count' [item 0]"));
+			});
+		});
+	});
 });
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/binary-helper-functions.ts b/packages/core/src/execution-engine/node-execution-context/utils/binary-helper-functions.ts
new file mode 100644
index 0000000000..c1bbff7899
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/binary-helper-functions.ts
@@ -0,0 +1,289 @@
+import { Container } from '@n8n/di';
+import chardet from 'chardet';
+import FileType from 'file-type';
+import { IncomingMessage } from 'http';
+import iconv from 'iconv-lite';
+import { extension, lookup } from 'mime-types';
+import type {
+	BinaryHelperFunctions,
+	IBinaryData,
+	INode,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+} from 'n8n-workflow';
+import { NodeOperationError, fileTypeFromMimeType, ApplicationError } from 'n8n-workflow';
+import path from 'path';
+import type { Readable } from 'stream';
+import { URL } from 'url';
+
+import { BinaryDataService } from '@/binary-data/binary-data.service';
+import type { BinaryData } from '@/binary-data/types';
+import { binaryToBuffer } from '@/binary-data/utils';
+
+import { parseIncomingMessage } from './parse-incoming-message';
+
+export async function binaryToString(body: Buffer | Readable, encoding?: string) {
+	if (!encoding && body instanceof IncomingMessage) {
+		parseIncomingMessage(body);
+		encoding = body.encoding;
+	}
+	const buffer = await binaryToBuffer(body);
+	return iconv.decode(buffer, encoding ?? 'utf-8');
+}
+
+function getBinaryPath(binaryDataId: string): string {
+	return Container.get(BinaryDataService).getPath(binaryDataId);
+}
+
+/**
+ * Returns binary file metadata
+ */
+async function getBinaryMetadata(binaryDataId: string): Promise<BinaryData.Metadata> {
+	return await Container.get(BinaryDataService).getMetadata(binaryDataId);
+}
+
+/**
+ * Returns binary file stream for piping
+ */
+async function getBinaryStream(binaryDataId: string, chunkSize?: number): Promise<Readable> {
+	return await Container.get(BinaryDataService).getAsStream(binaryDataId, chunkSize);
+}
+
+export function assertBinaryData(
+	inputData: ITaskDataConnections,
+	node: INode,
+	itemIndex: number,
+	propertyName: string,
+	inputIndex: number,
+): IBinaryData {
+	const binaryKeyData = inputData.main[inputIndex]![itemIndex].binary;
+	if (binaryKeyData === undefined) {
+		throw new NodeOperationError(
+			node,
+			`This operation expects the node's input data to contain a binary file '${propertyName}', but none was found [item ${itemIndex}]`,
+			{
+				itemIndex,
+				description: 'Make sure that the previous node outputs a binary file',
+			},
+		);
+	}
+
+	const binaryPropertyData = binaryKeyData[propertyName];
+	if (binaryPropertyData === undefined) {
+		throw new NodeOperationError(
+			node,
+			`The item has no binary field '${propertyName}' [item ${itemIndex}]`,
+			{
+				itemIndex,
+				description:
+					'Check that the parameter where you specified the input binary field name is correct, and that it matches a field in the binary input',
+			},
+		);
+	}
+
+	return binaryPropertyData;
+}
+
+/**
+ * Returns binary data buffer for given item index and property name.
+ */
+export async function getBinaryDataBuffer(
+	inputData: ITaskDataConnections,
+	itemIndex: number,
+	propertyName: string,
+	inputIndex: number,
+): Promise<Buffer> {
+	const binaryData = inputData.main[inputIndex]![itemIndex].binary![propertyName];
+	return await Container.get(BinaryDataService).getAsBuffer(binaryData);
+}
+
+export function detectBinaryEncoding(buffer: Buffer): string {
+	return chardet.detect(buffer) as string;
+}
+
+/**
+ * Store an incoming IBinaryData & related buffer using the configured binary data manager.
+ *
+ * @export
+ * @param {IBinaryData} binaryData
+ * @param {Buffer | Readable} bufferOrStream
+ * @returns {Promise<IBinaryData>}
+ */
+export async function setBinaryDataBuffer(
+	binaryData: IBinaryData,
+	bufferOrStream: Buffer | Readable,
+	workflowId: string,
+	executionId: string,
+): Promise<IBinaryData> {
+	return await Container.get(BinaryDataService).store(
+		workflowId,
+		executionId,
+		bufferOrStream,
+		binaryData,
+	);
+}
+
+export async function copyBinaryFile(
+	workflowId: string,
+	executionId: string,
+	filePath: string,
+	fileName: string,
+	mimeType?: string,
+): Promise<IBinaryData> {
+	let fileExtension: string | undefined;
+	if (!mimeType) {
+		// If no mime type is given figure it out
+
+		if (filePath) {
+			// Use file path to guess mime type
+			const mimeTypeLookup = lookup(filePath);
+			if (mimeTypeLookup) {
+				mimeType = mimeTypeLookup;
+			}
+		}
+
+		if (!mimeType) {
+			// read the first bytes of the file to guess mime type
+			const fileTypeData = await FileType.fromFile(filePath);
+			if (fileTypeData) {
+				mimeType = fileTypeData.mime;
+				fileExtension = fileTypeData.ext;
+			}
+		}
+	}
+
+	if (!fileExtension && mimeType) {
+		fileExtension = extension(mimeType) || undefined;
+	}
+
+	if (!mimeType) {
+		// Fall back to text
+		mimeType = 'text/plain';
+	}
+
+	const returnData: IBinaryData = {
+		mimeType,
+		fileType: fileTypeFromMimeType(mimeType),
+		fileExtension,
+		data: '',
+	};
+
+	if (fileName) {
+		returnData.fileName = fileName;
+	} else if (filePath) {
+		returnData.fileName = path.parse(filePath).base;
+	}
+
+	return await Container.get(BinaryDataService).copyBinaryFile(
+		workflowId,
+		executionId,
+		returnData,
+		filePath,
+	);
+}
+
+/**
+ * Takes a buffer and converts it into the format n8n uses. It encodes the binary data as
+ * base64 and adds metadata.
+ */
+// eslint-disable-next-line complexity
+export async function prepareBinaryData(
+	binaryData: Buffer | Readable,
+	executionId: string,
+	workflowId: string,
+	filePath?: string,
+	mimeType?: string,
+): Promise<IBinaryData> {
+	let fileExtension: string | undefined;
+	if (binaryData instanceof IncomingMessage) {
+		if (!filePath) {
+			try {
+				const { responseUrl } = binaryData;
+				filePath =
+					binaryData.contentDisposition?.filename ??
+					((responseUrl && new URL(responseUrl).pathname) ?? binaryData.req?.path)?.slice(1);
+			} catch {}
+		}
+		if (!mimeType) {
+			mimeType = binaryData.contentType;
+		}
+	}
+
+	if (!mimeType) {
+		// If no mime type is given figure it out
+
+		if (filePath) {
+			// Use file path to guess mime type
+			const mimeTypeLookup = lookup(filePath);
+			if (mimeTypeLookup) {
+				mimeType = mimeTypeLookup;
+			}
+		}
+
+		if (!mimeType) {
+			if (Buffer.isBuffer(binaryData)) {
+				// Use buffer to guess mime type
+				const fileTypeData = await FileType.fromBuffer(binaryData);
+				if (fileTypeData) {
+					mimeType = fileTypeData.mime;
+					fileExtension = fileTypeData.ext;
+				}
+			} else if (binaryData instanceof IncomingMessage) {
+				mimeType = binaryData.headers['content-type'];
+			} else {
+				// TODO: detect filetype from other kind of streams
+			}
+		}
+	}
+
+	if (!fileExtension && mimeType) {
+		fileExtension = extension(mimeType) || undefined;
+	}
+
+	if (!mimeType) {
+		// Fall back to text
+		mimeType = 'text/plain';
+	}
+
+	const returnData: IBinaryData = {
+		mimeType,
+		fileType: fileTypeFromMimeType(mimeType),
+		fileExtension,
+		data: '',
+	};
+
+	if (filePath) {
+		const filePathParts = path.parse(filePath);
+
+		if (filePathParts.dir !== '') {
+			returnData.directory = filePathParts.dir;
+		}
+		returnData.fileName = filePathParts.base;
+
+		// Remove the dot
+		fileExtension = filePathParts.ext.slice(1);
+		if (fileExtension) {
+			returnData.fileExtension = fileExtension;
+		}
+	}
+
+	return await setBinaryDataBuffer(returnData, binaryData, workflowId, executionId);
+}
+
+export const getBinaryHelperFunctions = (
+	{ executionId }: IWorkflowExecuteAdditionalData,
+	workflowId: string,
+): BinaryHelperFunctions => ({
+	getBinaryPath,
+	getBinaryStream,
+	getBinaryMetadata,
+	binaryToBuffer,
+	binaryToString,
+	prepareBinaryData: async (binaryData, filePath, mimeType) =>
+		await prepareBinaryData(binaryData, executionId!, workflowId, filePath, mimeType),
+	setBinaryDataBuffer: async (data, binaryData) =>
+		await setBinaryDataBuffer(data, binaryData, workflowId, executionId!),
+	copyBinaryFile: async () => {
+		throw new ApplicationError('`copyBinaryFile` has been removed. Please upgrade this node.');
+	},
+});
diff --git a/packages/core/src/node-execution-context/utils/cleanupParameterData.ts b/packages/core/src/execution-engine/node-execution-context/utils/cleanup-parameter-data.ts
similarity index 100%
rename from packages/core/src/node-execution-context/utils/cleanupParameterData.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/cleanup-parameter-data.ts
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/create-node-as-tool.ts b/packages/core/src/execution-engine/node-execution-context/utils/create-node-as-tool.ts
new file mode 100644
index 0000000000..9f1e707a67
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/create-node-as-tool.ts
@@ -0,0 +1,140 @@
+import { DynamicStructuredTool } from '@langchain/core/tools';
+import { generateZodSchema, NodeOperationError, traverseNodeParameters } from 'n8n-workflow';
+import type { IDataObject, INode, INodeType, FromAIArgument } from 'n8n-workflow';
+import { z } from 'zod';
+
+export type CreateNodeAsToolOptions = {
+	node: INode;
+	nodeType: INodeType;
+	handleToolInvocation: (toolArgs: IDataObject) => Promise<unknown>;
+};
+
+/**
+ * Retrieves and validates the Zod schema for the tool.
+ *
+ * This method:
+ * 1. Collects all $fromAI arguments from node parameters
+ * 2. Validates parameter keys against naming rules
+ * 3. Checks for duplicate keys and ensures consistency
+ * 4. Generates a Zod schema from the validated arguments
+ *
+ * @throws {NodeOperationError} When parameter keys are invalid or when duplicate keys have inconsistent definitions
+ * @returns {z.ZodObject} A Zod schema object representing the structure and validation rules for the node parameters
+ */
+function getSchema(node: INode) {
+	const collectedArguments: FromAIArgument[] = [];
+	try {
+		traverseNodeParameters(node.parameters, collectedArguments);
+	} catch (error) {
+		throw new NodeOperationError(node, error as Error);
+	}
+
+	// Validate each collected argument
+	const nameValidationRegex = /^[a-zA-Z0-9_-]{1,64}$/;
+	const keyMap = new Map<string, FromAIArgument>();
+	for (const argument of collectedArguments) {
+		if (argument.key.length === 0 || !nameValidationRegex.test(argument.key)) {
+			const isEmptyError = 'You must specify a key when using $fromAI()';
+			const isInvalidError = `Parameter key \`${argument.key}\` is invalid`;
+			const error = new Error(argument.key.length === 0 ? isEmptyError : isInvalidError);
+			throw new NodeOperationError(node, error, {
+				description:
+					'Invalid parameter key, must be between 1 and 64 characters long and only contain letters, numbers, underscores, and hyphens',
+			});
+		}
+
+		if (keyMap.has(argument.key)) {
+			// If the key already exists in the Map
+			const existingArg = keyMap.get(argument.key)!;
+
+			// Check if the existing argument has the same description and type
+			if (existingArg.description !== argument.description || existingArg.type !== argument.type) {
+				// If not, throw an error for inconsistent duplicate keys
+				throw new NodeOperationError(
+					node,
+					`Duplicate key '${argument.key}' found with different description or type`,
+					{
+						description:
+							'Ensure all $fromAI() calls with the same key have consistent descriptions and types',
+					},
+				);
+			}
+			// If the duplicate key has consistent description and type, it's allowed (no action needed)
+		} else {
+			// If the key doesn't exist in the Map, add it
+			keyMap.set(argument.key, argument);
+		}
+	}
+
+	// Remove duplicate keys, latest occurrence takes precedence
+	const uniqueArgsMap = collectedArguments.reduce((map, arg) => {
+		map.set(arg.key, arg);
+		return map;
+	}, new Map<string, FromAIArgument>());
+
+	const uniqueArguments = Array.from(uniqueArgsMap.values());
+
+	// Generate Zod schema from unique arguments
+	const schemaObj = uniqueArguments.reduce((acc: Record<string, z.ZodTypeAny>, placeholder) => {
+		acc[placeholder.key] = generateZodSchema(placeholder);
+		return acc;
+	}, {});
+
+	return z.object(schemaObj).required();
+}
+
+/**
+ * Generates a description for a node based on the provided parameters.
+ * @param node The node type.
+ * @param nodeParameters The parameters of the node.
+ * @returns A string description for the node.
+ */
+function makeDescription(node: INode, nodeType: INodeType): string {
+	const manualDescription = node.parameters.toolDescription as string;
+
+	if (node.parameters.descriptionType === 'auto') {
+		const resource = node.parameters.resource as string;
+		const operation = node.parameters.operation as string;
+		let description = nodeType.description.description;
+		if (resource) {
+			description += `\n Resource: ${resource}`;
+		}
+		if (operation) {
+			description += `\n Operation: ${operation}`;
+		}
+		return description.trim();
+	}
+	if (node.parameters.descriptionType === 'manual') {
+		return manualDescription ?? nodeType.description.description;
+	}
+
+	return nodeType.description.description;
+}
+
+/**
+ * Creates a DynamicStructuredTool from a node.
+ * @returns A DynamicStructuredTool instance.
+ */
+function createTool(options: CreateNodeAsToolOptions) {
+	const { node, nodeType, handleToolInvocation } = options;
+	const schema = getSchema(node);
+	const description = makeDescription(node, nodeType);
+	const nodeName = node.name.replace(/ /g, '_');
+	const name = nodeName || nodeType.description.name;
+
+	return new DynamicStructuredTool({
+		name,
+		description,
+		schema,
+		func: async (toolArgs: z.infer<typeof schema>) => await handleToolInvocation(toolArgs),
+	});
+}
+
+/**
+ * Converts node into LangChain tool by analyzing node parameters,
+ * identifying placeholders using the $fromAI function, and generating a Zod schema. It then creates
+ * a DynamicStructuredTool that can be used in LangChain workflows.
+ */
+export function createNodeAsTool(options: CreateNodeAsToolOptions) {
+	return { response: createTool(options) };
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/deduplication-helper-functions.ts b/packages/core/src/execution-engine/node-execution-context/utils/deduplication-helper-functions.ts
new file mode 100644
index 0000000000..f1a65724a5
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/deduplication-helper-functions.ts
@@ -0,0 +1,128 @@
+import type {
+	IDataObject,
+	INode,
+	Workflow,
+	DeduplicationHelperFunctions,
+	IDeduplicationOutput,
+	IDeduplicationOutputItems,
+	ICheckProcessedOptions,
+	DeduplicationScope,
+	DeduplicationItemTypes,
+	ICheckProcessedContextData,
+} from 'n8n-workflow';
+
+import { DataDeduplicationService } from '@/data-deduplication-service';
+
+async function checkProcessedAndRecord(
+	items: DeduplicationItemTypes[],
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<IDeduplicationOutput> {
+	return await DataDeduplicationService.getInstance().checkProcessedAndRecord(
+		items,
+		scope,
+		contextData,
+		options,
+	);
+}
+
+async function checkProcessedItemsAndRecord(
+	key: string,
+	items: IDataObject[],
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<IDeduplicationOutputItems> {
+	return await DataDeduplicationService.getInstance().checkProcessedItemsAndRecord(
+		key,
+		items,
+		scope,
+		contextData,
+		options,
+	);
+}
+
+async function removeProcessed(
+	items: DeduplicationItemTypes[],
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<void> {
+	return await DataDeduplicationService.getInstance().removeProcessed(
+		items,
+		scope,
+		contextData,
+		options,
+	);
+}
+
+async function clearAllProcessedItems(
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<void> {
+	return await DataDeduplicationService.getInstance().clearAllProcessedItems(
+		scope,
+		contextData,
+		options,
+	);
+}
+
+async function getProcessedDataCount(
+	scope: DeduplicationScope,
+	contextData: ICheckProcessedContextData,
+	options: ICheckProcessedOptions,
+): Promise<number> {
+	return await DataDeduplicationService.getInstance().getProcessedDataCount(
+		scope,
+		contextData,
+		options,
+	);
+}
+
+export const getDeduplicationHelperFunctions = (
+	workflow: Workflow,
+	node: INode,
+): DeduplicationHelperFunctions => ({
+	async checkProcessedAndRecord(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutput> {
+		return await checkProcessedAndRecord(items, scope, { node, workflow }, options);
+	},
+	async checkProcessedItemsAndRecord(
+		propertyName: string,
+		items: IDataObject[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<IDeduplicationOutputItems> {
+		return await checkProcessedItemsAndRecord(
+			propertyName,
+			items,
+			scope,
+			{ node, workflow },
+			options,
+		);
+	},
+	async removeProcessed(
+		items: DeduplicationItemTypes[],
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		return await removeProcessed(items, scope, { node, workflow }, options);
+	},
+	async clearAllProcessedItems(
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<void> {
+		return await clearAllProcessedItems(scope, { node, workflow }, options);
+	},
+	async getProcessedDataCount(
+		scope: DeduplicationScope,
+		options: ICheckProcessedOptions,
+	): Promise<number> {
+		return await getProcessedDataCount(scope, { node, workflow }, options);
+	},
+});
diff --git a/packages/core/src/node-execution-context/utils/ensureType.ts b/packages/core/src/execution-engine/node-execution-context/utils/ensure-type.ts
similarity index 100%
rename from packages/core/src/node-execution-context/utils/ensureType.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/ensure-type.ts
diff --git a/packages/core/src/ExecutionMetadata.ts b/packages/core/src/execution-engine/node-execution-context/utils/execution-metadata.ts
similarity index 92%
rename from packages/core/src/ExecutionMetadata.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/execution-metadata.ts
index 8466933e05..29957b983a 100644
--- a/packages/core/src/ExecutionMetadata.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/execution-metadata.ts
@@ -1,7 +1,7 @@
 import type { IRunExecutionData } from 'n8n-workflow';
 import { LoggerProxy as Logger } from 'n8n-workflow';
 
-import { InvalidExecutionMetadataError } from './errors/invalid-execution-metadata.error';
+import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
 
 export const KV_LIMIT = 10;
 
@@ -38,9 +38,9 @@ export function setWorkflowExecutionMetadata(
 		Logger.error('Custom data key over 50 characters long. Truncating to 50 characters.');
 	}
 	if (val.length > 255) {
-		Logger.error('Custom data value over 255 characters long. Truncating to 255 characters.');
+		Logger.error('Custom data value over 512 characters long. Truncating to 512 characters.');
 	}
-	executionData.resultData.metadata[key.slice(0, 50)] = val.slice(0, 255);
+	executionData.resultData.metadata[key.slice(0, 50)] = val.slice(0, 512);
 }
 
 export function setAllWorkflowExecutionMetadata(
diff --git a/packages/core/src/ExtractValue.ts b/packages/core/src/execution-engine/node-execution-context/utils/extract-value.ts
similarity index 100%
rename from packages/core/src/ExtractValue.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/extract-value.ts
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts b/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
new file mode 100644
index 0000000000..23153bb94d
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
@@ -0,0 +1,121 @@
+import { Container } from '@n8n/di';
+import type { FileSystemHelperFunctions, INode } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+import { createReadStream } from 'node:fs';
+import { access as fsAccess, writeFile as fsWriteFile } from 'node:fs/promises';
+import { join, resolve } from 'node:path';
+
+import {
+	BINARY_DATA_STORAGE_PATH,
+	BLOCK_FILE_ACCESS_TO_N8N_FILES,
+	CONFIG_FILES,
+	CUSTOM_EXTENSION_ENV,
+	RESTRICT_FILE_ACCESS_TO,
+	UM_EMAIL_TEMPLATES_INVITE,
+	UM_EMAIL_TEMPLATES_PWRESET,
+} from '@/constants';
+import { InstanceSettings } from '@/instance-settings';
+
+const getAllowedPaths = () => {
+	const restrictFileAccessTo = process.env[RESTRICT_FILE_ACCESS_TO];
+	if (!restrictFileAccessTo) {
+		return [];
+	}
+	const allowedPaths = restrictFileAccessTo
+		.split(';')
+		.map((path) => path.trim())
+		.filter((path) => path);
+	return allowedPaths;
+};
+
+export function isFilePathBlocked(filePath: string): boolean {
+	const allowedPaths = getAllowedPaths();
+	const resolvedFilePath = resolve(filePath);
+	const blockFileAccessToN8nFiles = process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
+
+	//if allowed paths are defined, allow access only to those paths
+	if (allowedPaths.length) {
+		for (const path of allowedPaths) {
+			if (resolvedFilePath.startsWith(path)) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	//restrict access to .n8n folder, ~/.cache/n8n/public, and other .env config related paths
+	if (blockFileAccessToN8nFiles) {
+		const { n8nFolder, staticCacheDir } = Container.get(InstanceSettings);
+		const restrictedPaths = [n8nFolder, staticCacheDir];
+
+		if (process.env[CONFIG_FILES]) {
+			restrictedPaths.push(...process.env[CONFIG_FILES].split(','));
+		}
+
+		if (process.env[CUSTOM_EXTENSION_ENV]) {
+			const customExtensionFolders = process.env[CUSTOM_EXTENSION_ENV].split(';');
+			restrictedPaths.push(...customExtensionFolders);
+		}
+
+		if (process.env[BINARY_DATA_STORAGE_PATH]) {
+			restrictedPaths.push(process.env[BINARY_DATA_STORAGE_PATH]);
+		}
+
+		if (process.env[UM_EMAIL_TEMPLATES_INVITE]) {
+			restrictedPaths.push(process.env[UM_EMAIL_TEMPLATES_INVITE]);
+		}
+
+		if (process.env[UM_EMAIL_TEMPLATES_PWRESET]) {
+			restrictedPaths.push(process.env[UM_EMAIL_TEMPLATES_PWRESET]);
+		}
+
+		//check if the file path is restricted
+		for (const path of restrictedPaths) {
+			if (resolvedFilePath.startsWith(path)) {
+				return true;
+			}
+		}
+	}
+
+	//path is not restricted
+	return false;
+}
+
+export const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions => ({
+	async createReadStream(filePath) {
+		try {
+			await fsAccess(filePath);
+		} catch (error) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			throw error.code === 'ENOENT'
+				? // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+					new NodeOperationError(node, error, {
+						message: `The file "${String(filePath)}" could not be accessed.`,
+						level: 'warning',
+					})
+				: error;
+		}
+		if (isFilePathBlocked(filePath as string)) {
+			const allowedPaths = getAllowedPaths();
+			const message = allowedPaths.length ? ` Allowed paths: ${allowedPaths.join(', ')}` : '';
+			throw new NodeOperationError(node, `Access to the file is not allowed.${message}`, {
+				level: 'warning',
+			});
+		}
+		return createReadStream(filePath);
+	},
+
+	getStoragePath() {
+		return join(Container.get(InstanceSettings).n8nFolder, `storage/${node.type}`);
+	},
+
+	async writeContentToFile(filePath, content, flag) {
+		if (isFilePathBlocked(filePath as string)) {
+			throw new NodeOperationError(node, `The file "${String(filePath)}" is not writable.`, {
+				level: 'warning',
+			});
+		}
+		return await fsWriteFile(filePath, content, { encoding: 'binary', flag });
+	},
+});
diff --git a/packages/core/src/node-execution-context/utils/getAdditionalKeys.ts b/packages/core/src/execution-engine/node-execution-context/utils/get-additional-keys.ts
similarity index 93%
rename from packages/core/src/node-execution-context/utils/getAdditionalKeys.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/get-additional-keys.ts
index 28bf3b89f6..7e18d0f2d1 100644
--- a/packages/core/src/node-execution-context/utils/getAdditionalKeys.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/get-additional-keys.ts
@@ -6,14 +6,15 @@ import type {
 } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
 
-import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/Constants';
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/constants';
+
 import {
 	setWorkflowExecutionMetadata,
 	setAllWorkflowExecutionMetadata,
 	getWorkflowExecutionMetadata,
 	getAllWorkflowExecutionMetadata,
-} from '@/ExecutionMetadata';
-import { getSecretsProxy } from '@/Secrets';
+} from './execution-metadata';
+import { getSecretsProxy } from './get-secrets-proxy';
 
 /** Returns the additional keys for Expressions and Function-Nodes */
 export function getAdditionalKeys(
diff --git a/packages/core/src/node-execution-context/utils/getInputConnectionData.ts b/packages/core/src/execution-engine/node-execution-context/utils/get-input-connection-data.ts
similarity index 96%
rename from packages/core/src/node-execution-context/utils/getInputConnectionData.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/get-input-connection-data.ts
index 231f672d65..9f76d0e106 100644
--- a/packages/core/src/node-execution-context/utils/getInputConnectionData.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/get-input-connection-data.ts
@@ -19,10 +19,10 @@ import {
 	ApplicationError,
 } from 'n8n-workflow';
 
-import { createNodeAsTool } from '@/CreateNodeAsTool';
+import { createNodeAsTool } from './create-node-as-tool';
 // eslint-disable-next-line import/no-cycle
-import { SupplyDataContext } from '@/node-execution-context';
-import type { ExecuteContext, WebhookContext } from '@/node-execution-context';
+import { SupplyDataContext } from '../../node-execution-context';
+import type { ExecuteContext, WebhookContext } from '../../node-execution-context';
 
 export async function getInputConnectionData(
 	this: ExecuteContext | WebhookContext | SupplyDataContext,
diff --git a/packages/core/src/Secrets.ts b/packages/core/src/execution-engine/node-execution-context/utils/get-secrets-proxy.ts
similarity index 100%
rename from packages/core/src/Secrets.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/get-secrets-proxy.ts
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/parse-incoming-message.ts b/packages/core/src/execution-engine/node-execution-context/utils/parse-incoming-message.ts
new file mode 100644
index 0000000000..148e59be86
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/parse-incoming-message.ts
@@ -0,0 +1,95 @@
+import type { IncomingMessage } from 'http';
+
+function parseHeaderParameters(parameters: string[]): Record<string, string> {
+	return parameters.reduce(
+		(acc, param) => {
+			const [key, value] = param.split('=');
+			let decodedValue = decodeURIComponent(value).trim();
+			if (decodedValue.startsWith('"') && decodedValue.endsWith('"')) {
+				decodedValue = decodedValue.slice(1, -1);
+			}
+			acc[key.toLowerCase().trim()] = decodedValue;
+			return acc;
+		},
+		{} as Record<string, string>,
+	);
+}
+
+interface IContentType {
+	type: string;
+	parameters: {
+		charset: string;
+		[key: string]: string;
+	};
+}
+
+/**
+ * Parses the Content-Type header string into a structured object
+ * @returns {IContentType | null} Parsed content type details or null if no content type is detected
+ */
+export const parseContentType = (contentType?: string): IContentType | null => {
+	if (!contentType) {
+		return null;
+	}
+
+	const [type, ...parameters] = contentType.split(';');
+
+	return {
+		type: type.toLowerCase(),
+		parameters: { charset: 'utf-8', ...parseHeaderParameters(parameters) },
+	};
+};
+
+interface IContentDisposition {
+	type: string;
+	filename?: string;
+}
+
+/**
+ * Parses the Content-Disposition header string into a structured object
+ * @returns {IContentDisposition | null} Parsed content disposition details or null if no content disposition is detected
+ */
+export const parseContentDisposition = (
+	contentDisposition?: string,
+): IContentDisposition | null => {
+	if (!contentDisposition) {
+		return null;
+	}
+
+	// This is invalid syntax, but common
+	// Example 'filename="example.png"' (instead of 'attachment; filename="example.png"')
+	if (!contentDisposition.startsWith('attachment') && !contentDisposition.startsWith('inline')) {
+		contentDisposition = `attachment; ${contentDisposition}`;
+	}
+
+	const [type, ...parameters] = contentDisposition.split(';');
+
+	const parsedParameters = parseHeaderParameters(parameters);
+
+	let { filename } = parsedParameters;
+	const wildcard = parsedParameters['filename*'];
+	if (wildcard) {
+		// https://datatracker.ietf.org/doc/html/rfc5987
+		const [_encoding, _locale, content] = wildcard?.split("'") ?? [];
+		filename = content;
+	}
+
+	return { type, filename };
+};
+
+/**
+ * Augments an IncomingMessage with parsed content type and disposition information
+ */
+export function parseIncomingMessage(message: IncomingMessage) {
+	const contentType = parseContentType(message.headers['content-type']);
+	if (contentType) {
+		const { type, parameters } = contentType;
+		message.contentType = type;
+		message.encoding = parameters.charset.toLowerCase() as BufferEncoding;
+	}
+
+	const contentDisposition = parseContentDisposition(message.headers['content-disposition']);
+	if (contentDisposition) {
+		message.contentDisposition = contentDisposition;
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/parse-request-object.ts b/packages/core/src/execution-engine/node-execution-context/utils/parse-request-object.ts
new file mode 100644
index 0000000000..fb80eff52d
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/parse-request-object.ts
@@ -0,0 +1,468 @@
+import { Container } from '@n8n/di';
+import type { AxiosHeaders, AxiosRequestConfig } from 'axios';
+import crypto from 'crypto';
+import FormData from 'form-data';
+import { Agent, type AgentOptions } from 'https';
+import type { GenericValue, IRequestOptions } from 'n8n-workflow';
+import { stringify } from 'qs';
+import { URL } from 'url';
+
+import { Logger } from '@/logging/logger';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const pushFormDataValue = (form: FormData, key: string, value: any) => {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+	if (value?.hasOwnProperty('value') && value.hasOwnProperty('options')) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
+		form.append(key, value.value, value.options);
+	} else {
+		form.append(key, value);
+	}
+};
+
+const createFormDataObject = (data: Record<string, unknown>) => {
+	const formData = new FormData();
+	const keys = Object.keys(data);
+	keys.forEach((key) => {
+		const formField = data[key];
+
+		if (formField instanceof Array) {
+			formField.forEach((item) => {
+				pushFormDataValue(formData, key, item);
+			});
+		} else {
+			pushFormDataValue(formData, key, formField);
+		}
+	});
+	return formData;
+};
+
+function searchForHeader(config: AxiosRequestConfig, headerName: string) {
+	if (config.headers === undefined) {
+		return undefined;
+	}
+
+	const headerNames = Object.keys(config.headers);
+	headerName = headerName.toLowerCase();
+	return headerNames.find((thisHeader) => thisHeader.toLowerCase() === headerName);
+}
+
+async function generateContentLengthHeader(config: AxiosRequestConfig) {
+	if (!(config.data instanceof FormData)) {
+		return;
+	}
+	try {
+		const length = await new Promise<number>((res, rej) => {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+			config.data.getLength((error: Error | null, dataLength: number) => {
+				if (error) rej(error);
+				else res(dataLength);
+			});
+		});
+		config.headers = {
+			...config.headers,
+			'content-length': length,
+		};
+	} catch (error) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		Container.get(Logger).error('Unable to calculate form data length', { error });
+	}
+}
+
+const getHostFromRequestObject = (
+	requestObject: Partial<{
+		url: string;
+		uri: string;
+		baseURL: string;
+	}>,
+): string | null => {
+	try {
+		const url = (requestObject.url ?? requestObject.uri) as string;
+		return new URL(url, requestObject.baseURL).hostname;
+	} catch (error) {
+		return null;
+	}
+};
+
+const getBeforeRedirectFn =
+	(agentOptions: AgentOptions, axiosConfig: AxiosRequestConfig) =>
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	(redirectedRequest: Record<string, any>) => {
+		const redirectAgent = new Agent({
+			...agentOptions,
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			servername: redirectedRequest.hostname,
+		});
+		redirectedRequest.agent = redirectAgent;
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		redirectedRequest.agents.https = redirectAgent;
+
+		if (axiosConfig.headers?.Authorization) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+			redirectedRequest.headers.Authorization = axiosConfig.headers.Authorization;
+		}
+		if (axiosConfig.auth) {
+			redirectedRequest.auth = `${axiosConfig.auth.username}:${axiosConfig.auth.password}`;
+		}
+	};
+
+/**
+ * This function is a temporary implementation that translates all http requests
+ * done via the request library to axios directly.
+ * We are not using n8n's interface as it would an unnecessary step,
+ * considering the `request` helper has been be deprecated and should be removed.
+ * @deprecated This is only used by legacy request helpers, that are also deprecated
+ */
+// eslint-disable-next-line complexity
+export async function parseRequestObject(requestObject: IRequestOptions) {
+	const axiosConfig: AxiosRequestConfig = {};
+
+	if (requestObject.headers !== undefined) {
+		axiosConfig.headers = requestObject.headers as AxiosHeaders;
+	}
+
+	// Let's start parsing the hardest part, which is the request body.
+	// The process here is as following?
+	// - Check if we have a `content-type` header. If this was set,
+	//   we will follow
+	// - Check if the `form` property was set. If yes, then it's x-www-form-urlencoded
+	// - Check if the `formData` property exists. If yes, then it's multipart/form-data
+	// - Lastly, we should have a regular `body` that is probably a JSON.
+
+	const contentTypeHeaderKeyName =
+		axiosConfig.headers &&
+		Object.keys(axiosConfig.headers).find(
+			(headerName) => headerName.toLowerCase() === 'content-type',
+		);
+	const contentType =
+		contentTypeHeaderKeyName &&
+		(axiosConfig.headers?.[contentTypeHeaderKeyName] as string | undefined);
+	if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
+		// there are nodes incorrectly created, informing the content type header
+		// and also using formData. Request lib takes precedence for the formData.
+		// We will do the same.
+		// Merge body and form properties.
+		if (typeof requestObject.body === 'string') {
+			axiosConfig.data = requestObject.body;
+		} else {
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			const allData = Object.assign(requestObject.body || {}, requestObject.form || {}) as Record<
+				string,
+				string
+			>;
+			if (requestObject.useQuerystring === true) {
+				axiosConfig.data = stringify(allData, { arrayFormat: 'repeat' });
+			} else {
+				axiosConfig.data = stringify(allData);
+			}
+		}
+	} else if (contentType?.includes('multipart/form-data')) {
+		if (requestObject.formData !== undefined && requestObject.formData instanceof FormData) {
+			axiosConfig.data = requestObject.formData;
+		} else {
+			const allData: Partial<FormData> = {
+				...(requestObject.body as object | undefined),
+				...(requestObject.formData as object | undefined),
+			};
+
+			axiosConfig.data = createFormDataObject(allData);
+		}
+		// replace the existing header with a new one that
+		// contains the boundary property.
+		delete axiosConfig.headers?.[contentTypeHeaderKeyName!];
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+		const headers = axiosConfig.data.getHeaders();
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/prefer-nullish-coalescing
+		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
+		await generateContentLengthHeader(axiosConfig);
+	} else {
+		// When using the `form` property it means the content should be x-www-form-urlencoded.
+		if (requestObject.form !== undefined && requestObject.body === undefined) {
+			// If we have only form
+			axiosConfig.data =
+				typeof requestObject.form === 'string'
+					? stringify(requestObject.form, { format: 'RFC3986' })
+					: stringify(requestObject.form).toString();
+			if (axiosConfig.headers !== undefined) {
+				const headerName = searchForHeader(axiosConfig, 'content-type');
+				if (headerName) {
+					delete axiosConfig.headers[headerName];
+				}
+				axiosConfig.headers['Content-Type'] = 'application/x-www-form-urlencoded';
+			} else {
+				axiosConfig.headers = {
+					'Content-Type': 'application/x-www-form-urlencoded',
+				};
+			}
+		} else if (requestObject.formData !== undefined) {
+			// remove any "content-type" that might exist.
+			if (axiosConfig.headers !== undefined) {
+				const headers = Object.keys(axiosConfig.headers);
+				headers.forEach((header) => {
+					if (header.toLowerCase() === 'content-type') {
+						delete axiosConfig.headers?.[header];
+					}
+				});
+			}
+
+			if (requestObject.formData instanceof FormData) {
+				axiosConfig.data = requestObject.formData;
+			} else {
+				axiosConfig.data = createFormDataObject(requestObject.formData as Record<string, unknown>);
+			}
+			// Mix in headers as FormData creates the boundary.
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+			const headers = axiosConfig.data.getHeaders();
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/prefer-nullish-coalescing
+			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
+			await generateContentLengthHeader(axiosConfig);
+		} else if (requestObject.body !== undefined) {
+			// If we have body and possibly form
+			if (requestObject.form !== undefined && requestObject.body) {
+				// merge both objects when exist.
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				requestObject.body = Object.assign(requestObject.body, requestObject.form);
+			}
+			axiosConfig.data = requestObject.body as FormData | GenericValue | GenericValue[];
+		}
+	}
+
+	if (requestObject.uri !== undefined) {
+		axiosConfig.url = requestObject.uri?.toString();
+	}
+
+	if (requestObject.url !== undefined) {
+		axiosConfig.url = requestObject.url?.toString();
+	}
+
+	if (requestObject.baseURL !== undefined) {
+		axiosConfig.baseURL = requestObject.baseURL?.toString();
+	}
+
+	if (requestObject.method !== undefined) {
+		axiosConfig.method = requestObject.method;
+	}
+
+	if (requestObject.qs !== undefined && Object.keys(requestObject.qs as object).length > 0) {
+		axiosConfig.params = requestObject.qs;
+	}
+
+	function hasArrayFormatOptions(
+		arg: IRequestOptions,
+	): arg is Required<Pick<IRequestOptions, 'qsStringifyOptions'>> {
+		if (
+			typeof arg.qsStringifyOptions === 'object' &&
+			arg.qsStringifyOptions !== null &&
+			!Array.isArray(arg.qsStringifyOptions) &&
+			'arrayFormat' in arg.qsStringifyOptions
+		) {
+			return true;
+		}
+
+		return false;
+	}
+
+	if (
+		requestObject.useQuerystring === true ||
+		(hasArrayFormatOptions(requestObject) &&
+			requestObject.qsStringifyOptions.arrayFormat === 'repeat')
+	) {
+		axiosConfig.paramsSerializer = (params) => {
+			return stringify(params, { arrayFormat: 'repeat' });
+		};
+	} else if (requestObject.useQuerystring === false) {
+		axiosConfig.paramsSerializer = (params) => {
+			return stringify(params, { arrayFormat: 'indices' });
+		};
+	}
+
+	if (
+		hasArrayFormatOptions(requestObject) &&
+		requestObject.qsStringifyOptions.arrayFormat === 'brackets'
+	) {
+		axiosConfig.paramsSerializer = (params) => {
+			return stringify(params, { arrayFormat: 'brackets' });
+		};
+	}
+
+	if (requestObject.auth !== undefined) {
+		// Check support for sendImmediately
+		if (requestObject.auth.bearer !== undefined) {
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
+				Authorization: `Bearer ${requestObject.auth.bearer}`,
+			});
+		} else {
+			const authObj = requestObject.auth;
+			// Request accepts both user/username and pass/password
+			axiosConfig.auth = {
+				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+				username: (authObj.user || authObj.username) as string,
+				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+				password: (authObj.password || authObj.pass) as string,
+			};
+		}
+	}
+
+	// Only set header if we have a body, otherwise it may fail
+	if (requestObject.json === true) {
+		// Add application/json headers - do not set charset as it breaks a lot of stuff
+		// only add if no other accept headers was sent.
+		const acceptHeaderExists =
+			axiosConfig.headers === undefined
+				? false
+				: Object.keys(axiosConfig.headers)
+						.map((headerKey) => headerKey.toLowerCase())
+						.includes('accept');
+		if (!acceptHeaderExists) {
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
+				Accept: 'application/json',
+			});
+		}
+	}
+	if (requestObject.json === false || requestObject.json === undefined) {
+		// Prevent json parsing
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		axiosConfig.transformResponse = (res) => res;
+	}
+
+	// Axios will follow redirects by default, so we simply tell it otherwise if needed.
+	const { method } = requestObject;
+	if (
+		(requestObject.followRedirect !== false &&
+			(!method || method === 'GET' || method === 'HEAD')) ||
+		requestObject.followAllRedirects
+	) {
+		axiosConfig.maxRedirects = requestObject.maxRedirects;
+	} else {
+		axiosConfig.maxRedirects = 0;
+	}
+
+	const host = getHostFromRequestObject(requestObject);
+	const agentOptions: AgentOptions = { ...requestObject.agentOptions };
+	if (host) {
+		agentOptions.servername = host;
+	}
+	if (requestObject.rejectUnauthorized === false) {
+		agentOptions.rejectUnauthorized = false;
+		agentOptions.secureOptions = crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT;
+	}
+
+	axiosConfig.httpsAgent = new Agent(agentOptions);
+
+	axiosConfig.beforeRedirect = getBeforeRedirectFn(agentOptions, axiosConfig);
+
+	if (requestObject.timeout !== undefined) {
+		axiosConfig.timeout = requestObject.timeout;
+	}
+
+	if (requestObject.proxy !== undefined) {
+		// try our best to parse the url provided.
+		if (typeof requestObject.proxy === 'string') {
+			try {
+				const url = new URL(requestObject.proxy);
+				// eslint-disable-next-line @typescript-eslint/no-shadow
+				const host = url.hostname.startsWith('[') ? url.hostname.slice(1, -1) : url.hostname;
+				axiosConfig.proxy = {
+					host,
+					port: parseInt(url.port, 10),
+					protocol: url.protocol,
+				};
+				if (!url.port) {
+					// Sets port to a default if not informed
+					if (url.protocol === 'http') {
+						axiosConfig.proxy.port = 80;
+					} else if (url.protocol === 'https') {
+						axiosConfig.proxy.port = 443;
+					}
+				}
+				if (url.username || url.password) {
+					axiosConfig.proxy.auth = {
+						username: url.username,
+						password: url.password,
+					};
+				}
+			} catch (error) {
+				// Not a valid URL. We will try to simply parse stuff
+				// such as user:pass@host:port without protocol (we'll assume http)
+				if (requestObject.proxy.includes('@')) {
+					const [userpass, hostport] = requestObject.proxy.split('@');
+					const [username, password] = userpass.split(':');
+					const [hostname, port] = hostport.split(':');
+					// eslint-disable-next-line @typescript-eslint/no-shadow
+					const host = hostname.startsWith('[') ? hostname.slice(1, -1) : hostname;
+					axiosConfig.proxy = {
+						host,
+						port: parseInt(port, 10),
+						protocol: 'http',
+						auth: {
+							username,
+							password,
+						},
+					};
+				} else if (requestObject.proxy.includes(':')) {
+					const [hostname, port] = requestObject.proxy.split(':');
+					axiosConfig.proxy = {
+						host: hostname,
+						port: parseInt(port, 10),
+						protocol: 'http',
+					};
+				} else {
+					axiosConfig.proxy = {
+						host: requestObject.proxy,
+						port: 80,
+						protocol: 'http',
+					};
+				}
+			}
+		} else {
+			axiosConfig.proxy = requestObject.proxy;
+		}
+	}
+
+	if (requestObject.useStream) {
+		axiosConfig.responseType = 'stream';
+	} else if (requestObject.encoding === null) {
+		// When downloading files, return an arrayBuffer.
+		axiosConfig.responseType = 'arraybuffer';
+	}
+
+	// If we don't set an accept header
+	// Axios forces "application/json, text/plan, */*"
+	// Which causes some nodes like NextCloud to break
+	// as the service returns XML unless requested otherwise.
+	const allHeaders = axiosConfig.headers ? Object.keys(axiosConfig.headers) : [];
+	if (!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'accept')) {
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, { accept: '*/*' });
+	}
+	if (
+		requestObject.json !== false &&
+		axiosConfig.data !== undefined &&
+		axiosConfig.data !== '' &&
+		!(axiosConfig.data instanceof Buffer) &&
+		!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'content-type')
+	) {
+		// Use default header for application/json
+		// If we don't specify this here, axios will add
+		// application/json; charset=utf-8
+		// and this breaks a lot of stuff
+		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
+			'content-type': 'application/json',
+		});
+	}
+
+	if (requestObject.simple === false) {
+		axiosConfig.validateStatus = () => true;
+	}
+
+	/**
+	 * Missing properties:
+	 * encoding (need testing)
+	 * gzip (ignored - default already works)
+	 * resolveWithFullResponse (implemented elsewhere)
+	 */
+	return axiosConfig;
+}
diff --git a/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts b/packages/core/src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts
similarity index 90%
rename from packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts
index d058c50a52..73b5423f49 100644
--- a/packages/core/src/node-execution-context/utils/validateValueAgainstSchema.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyCollection,
 	INodePropertyOptions,
 	INodeType,
+	ResourceMapperTypeOptions,
 } from 'n8n-workflow';
 import {
 	ExpressionError,
@@ -14,15 +15,17 @@ import {
 	validateFieldType,
 } from 'n8n-workflow';
 
-import type { ExtendedValidationResult } from '@/Interfaces';
+import type { ExtendedValidationResult } from '@/interfaces';
 
 const validateResourceMapperValue = (
 	parameterName: string,
 	paramValues: { [key: string]: unknown },
 	node: INode,
-	skipRequiredCheck = false,
+	resourceMapperTypeOptions?: ResourceMapperTypeOptions,
 ): ExtendedValidationResult => {
 	const result: ExtendedValidationResult = { valid: true, newValue: paramValues };
+	const skipRequiredCheck = resourceMapperTypeOptions?.mode !== 'add';
+	const enableTypeValidationOptions = Boolean(resourceMapperTypeOptions?.showTypeConversionOptions);
 	const paramNameParts = parameterName.split('.');
 	if (paramNameParts.length !== 2) {
 		return result;
@@ -44,7 +47,7 @@ const validateResourceMapperValue = (
 			!skipRequiredCheck &&
 			schemaEntry?.required === true &&
 			schemaEntry.type !== 'boolean' &&
-			!resolvedValue
+			(resolvedValue === undefined || resolvedValue === null)
 		) {
 			return {
 				valid: false,
@@ -56,8 +59,8 @@ const validateResourceMapperValue = (
 		if (schemaEntry?.type) {
 			const validationResult = validateFieldType(key, resolvedValue, schemaEntry.type, {
 				valueOptions: schemaEntry.options,
-				strict: !resourceMapperField.attemptToConvertTypes,
-				parseStrings: !!resourceMapperField.convertFieldsToString,
+				strict: enableTypeValidationOptions && !resourceMapperField.attemptToConvertTypes,
+				parseStrings: enableTypeValidationOptions && resourceMapperField.convertFieldsToString,
 			});
 
 			if (!validationResult.valid) {
@@ -185,7 +188,7 @@ export const validateValueAgainstSchema = (
 			parameterName,
 			parameterValue as { [key: string]: unknown },
 			node,
-			propertyDescription.typeOptions?.resourceMapper?.mode !== 'add',
+			propertyDescription.typeOptions?.resourceMapper,
 		);
 	} else if (['fixedCollection', 'collection'].includes(propertyDescription.type)) {
 		validationResult = validateCollection(
diff --git a/packages/core/src/node-execution-context/webhook-context.ts b/packages/core/src/execution-engine/node-execution-context/webhook-context.ts
similarity index 95%
rename from packages/core/src/node-execution-context/webhook-context.ts
rename to packages/core/src/execution-engine/node-execution-context/webhook-context.ts
index 9d131a4103..dba5c8124c 100644
--- a/packages/core/src/node-execution-context/webhook-context.ts
+++ b/packages/core/src/execution-engine/node-execution-context/webhook-context.ts
@@ -20,15 +20,14 @@ import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
 
 // eslint-disable-next-line import/no-cycle
 import {
-	copyBinaryFile,
-	getBinaryHelperFunctions,
 	getNodeWebhookUrl,
 	getRequestHelperFunctions,
 	returnJsonArray,
-} from '@/NodeExecuteFunctions';
+} from '@/node-execute-functions';
 
 import { NodeExecutionContext } from './node-execution-context';
-import { getInputConnectionData } from './utils/getInputConnectionData';
+import { copyBinaryFile, getBinaryHelperFunctions } from './utils/binary-helper-functions';
+import { getInputConnectionData } from './utils/get-input-connection-data';
 
 export class WebhookContext extends NodeExecutionContext implements IWebhookFunctions {
 	readonly helpers: IWebhookFunctions['helpers'];
diff --git a/packages/core/src/node-execution-context/workflow-node-context.ts b/packages/core/src/execution-engine/node-execution-context/workflow-node-context.ts
similarity index 100%
rename from packages/core/src/node-execution-context/workflow-node-context.ts
rename to packages/core/src/execution-engine/node-execution-context/workflow-node-context.ts
diff --git a/packages/core/src/execution-engine/partial-execution-utils/__tests__/clean-run-data.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/clean-run-data.test.ts
new file mode 100644
index 0000000000..1e46e40070
--- /dev/null
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/clean-run-data.test.ts
@@ -0,0 +1,234 @@
+// NOTE: Diagrams in this file have been created with https://asciiflow.com/#/
+// If you update the tests, please update the diagrams as well.
+// If you add a test, please create a new diagram.
+//
+// Map
+// 0  means the output has no run data
+// 1  means the output has run data
+// ►► denotes the node that the user wants to execute to
+// XX denotes that the node is disabled
+// PD denotes that the node has pinned data
+
+import { NodeConnectionType, type IRunData } from 'n8n-workflow';
+
+import { createNodeData, toITaskData } from './helpers';
+import { cleanRunData } from '../clean-run-data';
+import { DirectedGraph } from '../directed-graph';
+
+describe('cleanRunData', () => {
+	// ┌─────┐    ┌─────┐   ┌─────┐
+	// │node1├───►│node2├──►│node3│
+	// └─────┘    └─────┘   └─────┘
+	test('deletes all run data of all children and the node being passed in', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const node3 = createNodeData({ name: 'Node3' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2, node3)
+			.addConnections({ from: node1, to: node2 }, { from: node2, to: node3 });
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
+			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([node1]));
+
+		// ASSERT
+		expect(newRunData).toEqual({});
+	});
+
+	// ┌─────┐    ┌─────┐   ┌─────┐
+	// │node1├───►│node2├──►│node3│
+	// └─────┘    └─────┘   └─────┘
+	test('retains the run data of parent nodes of the node being passed in', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const node3 = createNodeData({ name: 'Node3' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2, node3)
+			.addConnections({ from: node1, to: node2 }, { from: node2, to: node3 });
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
+			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([node2]));
+
+		// ASSERT
+		expect(newRunData).toEqual({ [node1.name]: runData[node1.name] });
+	});
+
+	//     ┌─────┐    ┌─────┐   ┌─────┐
+	//  ┌─►│node1├───►│node2├──►│node3├─┐
+	//  │  └─────┘    └─────┘   └─────┘ │
+	//  │                               │
+	//  └───────────────────────────────┘
+	test('terminates when finding a cycle', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const node3 = createNodeData({ name: 'Node3' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2, node3)
+			.addConnections(
+				{ from: node1, to: node2 },
+				{ from: node2, to: node3 },
+				{ from: node3, to: node1 },
+			);
+
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
+			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([node2]));
+
+		// ASSERT
+		// TODO: Find out if this is a desirable result in milestone 2
+		expect(newRunData).toEqual({});
+	});
+
+	// ┌─────┐    ┌─────┐
+	// │node1├───►│node2│
+	// └─────┘    └─────┘
+	test('removes run data of nodes that are not in the subgraph', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2)
+			.addConnections({ from: node1, to: node2 });
+		// not part of the graph
+		const node3 = createNodeData({ name: 'Node3' });
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
+			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([node2]));
+
+		// ASSERT
+		expect(newRunData).toEqual({
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+		});
+	});
+
+	//               ►
+	//  ┌─────┐     ┌────────┐
+	//  │node1├─────►rootNode│
+	//  └─────┘     └───▲────┘
+	//                  │
+	//              ┌───┴───┐
+	//              │subNode│
+	//              └───────┘
+	test('removes run data of sub nodes when the start node is a root node', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const rootNode = createNodeData({ name: 'Root Node' });
+		const subNode = createNodeData({ name: 'Sub Node' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, rootNode, subNode)
+			.addConnections(
+				{ from: node1, to: rootNode },
+				{ from: subNode, to: rootNode, type: NodeConnectionType.AiLanguageModel },
+			);
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[rootNode.name]: [toITaskData([{ data: { value: 2 } }])],
+			[subNode.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([rootNode]));
+
+		// ASSERT
+		expect(newRunData).toEqual({
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+		});
+	});
+
+	//            ►
+	// ┌─────┐   ┌─────┐    ┌────────┐
+	// │node1├───►node2├────►rootNode│
+	// └─────┘   └─────┘    └───▲────┘
+	//                          │
+	//                      ┌───┴───┐
+	//                      │subNode│
+	//                      └───────┘
+	test('removes run data of sub nodes for root nodes downstream of the start node', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const rootNode = createNodeData({ name: 'Root Node' });
+		const subNode = createNodeData({ name: 'Sub Node' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2, rootNode, subNode)
+			.addConnections(
+				{ from: node1, to: node2 },
+				{ from: node2, to: rootNode },
+				{ from: subNode, to: rootNode, type: NodeConnectionType.AiLanguageModel },
+			);
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[node2.name]: [toITaskData([{ data: { value: 1 } }])],
+			[rootNode.name]: [toITaskData([{ data: { value: 2 } }])],
+			[subNode.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([node2]));
+
+		// ASSERT
+		expect(newRunData).toEqual({
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+		});
+	});
+
+	//           ►
+	// ┌─────┐  ┌────────┐  ┌────────┐
+	// │node1├──►rootNode├──►rootNode│
+	// └─────┘  └───▲────┘  └───▲────┘
+	//              │           │
+	//              │       ┌───┴───┐
+	//              └───────┤subNode│
+	//                      └───────┘
+	test('removes run data of sub nodes as well if the sub node is shared between multiple root nodes', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const rootNode1 = createNodeData({ name: 'Root Node 1' });
+		const rootNode2 = createNodeData({ name: 'Root Node 2' });
+		const subNode = createNodeData({ name: 'Sub Node' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, rootNode1, rootNode2, subNode)
+			.addConnections(
+				{ from: node1, to: rootNode1 },
+				{ from: rootNode1, to: rootNode2 },
+				{ from: subNode, to: rootNode1, type: NodeConnectionType.AiLanguageModel },
+				{ from: subNode, to: rootNode2, type: NodeConnectionType.AiLanguageModel },
+			);
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[rootNode1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[rootNode2.name]: [toITaskData([{ data: { value: 2 } }])],
+			[subNode.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([rootNode1]));
+
+		// ASSERT
+		expect(newRunData).toEqual({
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+		});
+	});
+});
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/directed-graph.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/directed-graph.test.ts
index 5d769004a5..a825c144a9 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/directed-graph.test.ts
@@ -13,7 +13,7 @@ import type { INode } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { createNodeData, defaultWorkflowParameter } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
+import { DirectedGraph } from '../directed-graph';
 
 describe('DirectedGraph', () => {
 	//     ┌─────┐    ┌─────┐   ┌─────┐
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/filterDisabledNodes.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/filter-disabled-nodes.test.ts
similarity index 97%
rename from packages/core/src/PartialExecutionUtils/__tests__/filterDisabledNodes.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/filter-disabled-nodes.test.ts
index 7e60e009a8..69348720f7 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/filterDisabledNodes.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/filter-disabled-nodes.test.ts
@@ -12,8 +12,8 @@
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { createNodeData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { filterDisabledNodes } from '../filterDisabledNodes';
+import { DirectedGraph } from '../directed-graph';
+import { filterDisabledNodes } from '../filter-disabled-nodes';
 
 describe('filterDisabledNodes', () => {
 	//                     XX
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
index f2a99fdb92..a0c86515c2 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
@@ -12,8 +12,8 @@
 import { type IPinData, type IRunData } from 'n8n-workflow';
 
 import { createNodeData, toITaskData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { findStartNodes, isDirty } from '../findStartNodes';
+import { DirectedGraph } from '../directed-graph';
+import { findStartNodes, isDirty } from '../find-start-nodes';
 
 describe('isDirty', () => {
 	test("if the node has pinned data it's not dirty", () => {
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
index e479214e10..1a6382017a 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
@@ -12,8 +12,8 @@
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { createNodeData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { findSubgraph } from '../findSubgraph';
+import { DirectedGraph } from '../directed-graph';
+import { findSubgraph } from '../find-subgraph';
 
 describe('findSubgraph', () => {
 	//                 ►►
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/get-source-data-groups.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/get-source-data-groups.test.ts
index d8c3485d65..872a452aa7 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/get-source-data-groups.test.ts
@@ -11,8 +11,8 @@ import type { IPinData } from 'n8n-workflow';
 import { NodeConnectionType, type IRunData } from 'n8n-workflow';
 
 import { createNodeData, toITaskData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { getSourceDataGroups } from '../getSourceDataGroups';
+import { DirectedGraph } from '../directed-graph';
+import { getSourceDataGroups } from '../get-source-data-groups';
 
 describe('getSourceDataGroups', () => {
 	//┌───────┐1
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/handleCycles.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/handle-cycles.test.ts
similarity index 98%
rename from packages/core/src/PartialExecutionUtils/__tests__/handleCycles.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/handle-cycles.test.ts
index def9fed0ff..06ed5daf47 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/handleCycles.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/handle-cycles.test.ts
@@ -10,8 +10,8 @@
 // PD denotes that the node has pinned data
 
 import { createNodeData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { handleCycles } from '../handleCycles';
+import { DirectedGraph } from '../directed-graph';
+import { handleCycles } from '../handle-cycles';
 
 describe('handleCycles', () => {
 	//                 ┌────┐          ┌─────────┐
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/helpers.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/__tests__/helpers.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/helpers.ts
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/recreate-node-execution-stack.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/recreate-node-execution-stack.test.ts
index b78b9df135..0f20896e21 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/recreate-node-execution-stack.test.ts
@@ -18,15 +18,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, type IPinData, type IRunData } from 'n8n-workflow';
 
+import { createNodeData, toITaskData } from './helpers';
+import { DirectedGraph } from '../directed-graph';
+import { findSubgraph } from '../find-subgraph';
 import {
 	addWaitingExecution,
 	addWaitingExecutionSource,
 	recreateNodeExecutionStack,
-} from '@/PartialExecutionUtils/recreateNodeExecutionStack';
-
-import { createNodeData, toITaskData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { findSubgraph } from '../findSubgraph';
+} from '../recreate-node-execution-stack';
 
 describe('recreateNodeExecutionStack', () => {
 	//                   ►►
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/to-iconnections.test.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/to-iconnections.test.ts
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/to-itask-data.test.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/to-itask-data.test.ts
diff --git a/packages/core/src/PartialExecutionUtils/cleanRunData.ts b/packages/core/src/execution-engine/partial-execution-utils/clean-run-data.ts
similarity index 53%
rename from packages/core/src/PartialExecutionUtils/cleanRunData.ts
rename to packages/core/src/execution-engine/partial-execution-utils/clean-run-data.ts
index 6ed5db6100..46f6eea52d 100644
--- a/packages/core/src/PartialExecutionUtils/cleanRunData.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/clean-run-data.ts
@@ -1,6 +1,6 @@
-import type { INode, IRunData } from 'n8n-workflow';
+import { NodeConnectionType, type INode, type IRunData } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
+import type { DirectedGraph } from './directed-graph';
 
 /**
  * Returns new run data that does not contain data for any node that is a child
@@ -16,10 +16,22 @@ export function cleanRunData(
 
 	for (const startNode of startNodes) {
 		delete newRunData[startNode.name];
-		const children = graph.getChildren(startNode);
 
-		for (const child of children) {
-			delete newRunData[child.name];
+		const children = graph.getChildren(startNode);
+		for (const node of [startNode, ...children]) {
+			delete newRunData[node.name];
+
+			// Delete runData for subNodes
+			const subNodeConnections = graph.getParentConnections(node);
+			for (const subNodeConnection of subNodeConnections) {
+				// Sub nodes never use the Main connection type, so this filters out
+				// the connection that goes upstream of the startNode.
+				if (subNodeConnection.type === NodeConnectionType.Main) {
+					continue;
+				}
+
+				delete newRunData[subNodeConnection.from.name];
+			}
 		}
 	}
 
diff --git a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts b/packages/core/src/execution-engine/partial-execution-utils/directed-graph.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/DirectedGraph.ts
rename to packages/core/src/execution-engine/partial-execution-utils/directed-graph.ts
diff --git a/packages/core/src/PartialExecutionUtils/filterDisabledNodes.ts b/packages/core/src/execution-engine/partial-execution-utils/filter-disabled-nodes.ts
similarity index 88%
rename from packages/core/src/PartialExecutionUtils/filterDisabledNodes.ts
rename to packages/core/src/execution-engine/partial-execution-utils/filter-disabled-nodes.ts
index c381f70759..af9ffb3512 100644
--- a/packages/core/src/PartialExecutionUtils/filterDisabledNodes.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/filter-disabled-nodes.ts
@@ -1,6 +1,6 @@
 import { NodeConnectionType } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
+import type { DirectedGraph } from './directed-graph';
 
 export function filterDisabledNodes(graph: DirectedGraph): DirectedGraph {
 	const filteredGraph = graph.clone();
diff --git a/packages/core/src/PartialExecutionUtils/findStartNodes.ts b/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
similarity index 98%
rename from packages/core/src/PartialExecutionUtils/findStartNodes.ts
rename to packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
index 1c1c0b9fc7..d7b3fb522d 100644
--- a/packages/core/src/PartialExecutionUtils/findStartNodes.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
@@ -1,7 +1,7 @@
 import { NodeConnectionType, type INode, type IPinData, type IRunData } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
-import { getIncomingData, getIncomingDataFromAnyRun } from './getIncomingData';
+import type { DirectedGraph } from './directed-graph';
+import { getIncomingData, getIncomingDataFromAnyRun } from './get-incoming-data';
 
 /**
  * A node is dirty if either of the following is true:
diff --git a/packages/core/src/PartialExecutionUtils/findSubgraph.ts b/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
similarity index 97%
rename from packages/core/src/PartialExecutionUtils/findSubgraph.ts
rename to packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
index 039124c1ad..f333f4764e 100644
--- a/packages/core/src/PartialExecutionUtils/findSubgraph.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
@@ -1,7 +1,7 @@
 import { NodeConnectionType, type INode } from 'n8n-workflow';
 
-import type { GraphConnection } from './DirectedGraph';
-import { DirectedGraph } from './DirectedGraph';
+import type { GraphConnection } from './directed-graph';
+import { DirectedGraph } from './directed-graph';
 
 function findSubgraphRecursive(
 	graph: DirectedGraph,
diff --git a/packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts b/packages/core/src/execution-engine/partial-execution-utils/find-trigger-for-partial-execution.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts
rename to packages/core/src/execution-engine/partial-execution-utils/find-trigger-for-partial-execution.ts
diff --git a/packages/core/src/PartialExecutionUtils/getIncomingData.ts b/packages/core/src/execution-engine/partial-execution-utils/get-incoming-data.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/getIncomingData.ts
rename to packages/core/src/execution-engine/partial-execution-utils/get-incoming-data.ts
diff --git a/packages/core/src/PartialExecutionUtils/getSourceDataGroups.ts b/packages/core/src/execution-engine/partial-execution-utils/get-source-data-groups.ts
similarity index 98%
rename from packages/core/src/PartialExecutionUtils/getSourceDataGroups.ts
rename to packages/core/src/execution-engine/partial-execution-utils/get-source-data-groups.ts
index d9a9940816..d96aba3062 100644
--- a/packages/core/src/PartialExecutionUtils/getSourceDataGroups.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/get-source-data-groups.ts
@@ -1,6 +1,6 @@
 import { type INode, type IPinData, type IRunData } from 'n8n-workflow';
 
-import type { GraphConnection, DirectedGraph } from './DirectedGraph';
+import type { GraphConnection, DirectedGraph } from './directed-graph';
 
 function sortByInputIndexThenByName(
 	connection1: GraphConnection,
diff --git a/packages/core/src/PartialExecutionUtils/handleCycles.ts b/packages/core/src/execution-engine/partial-execution-utils/handle-cycles.ts
similarity index 96%
rename from packages/core/src/PartialExecutionUtils/handleCycles.ts
rename to packages/core/src/execution-engine/partial-execution-utils/handle-cycles.ts
index 94a8ae8cbc..1e52b491ed 100644
--- a/packages/core/src/PartialExecutionUtils/handleCycles.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/handle-cycles.ts
@@ -1,7 +1,7 @@
 import type { INode } from 'n8n-workflow';
 import * as a from 'node:assert/strict';
 
-import type { DirectedGraph } from './DirectedGraph';
+import type { DirectedGraph } from './directed-graph';
 
 /**
  * Returns a new set of start nodes.
diff --git a/packages/core/src/execution-engine/partial-execution-utils/index.ts b/packages/core/src/execution-engine/partial-execution-utils/index.ts
new file mode 100644
index 0000000000..d363f52302
--- /dev/null
+++ b/packages/core/src/execution-engine/partial-execution-utils/index.ts
@@ -0,0 +1,8 @@
+export { DirectedGraph } from './directed-graph';
+export { findTriggerForPartialExecution } from './find-trigger-for-partial-execution';
+export { findStartNodes } from './find-start-nodes';
+export { findSubgraph } from './find-subgraph';
+export { recreateNodeExecutionStack } from './recreate-node-execution-stack';
+export { cleanRunData } from './clean-run-data';
+export { handleCycles } from './handle-cycles';
+export { filterDisabledNodes } from './filter-disabled-nodes';
diff --git a/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts b/packages/core/src/execution-engine/partial-execution-utils/recreate-node-execution-stack.ts
similarity index 97%
rename from packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
rename to packages/core/src/execution-engine/partial-execution-utils/recreate-node-execution-stack.ts
index 542d4b8fbd..95aced2515 100644
--- a/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/recreate-node-execution-stack.ts
@@ -12,9 +12,9 @@ import {
 	type IWaitingForExecutionSource,
 } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
-import { getIncomingDataFromAnyRun } from './getIncomingData';
-import { getSourceDataGroups } from './getSourceDataGroups';
+import type { DirectedGraph } from './directed-graph';
+import { getIncomingDataFromAnyRun } from './get-incoming-data';
+import { getSourceDataGroups } from './get-source-data-groups';
 
 export function addWaitingExecution(
 	waitingExecution: IWaitingForExecution,
diff --git a/packages/core/src/RoutingNode.ts b/packages/core/src/execution-engine/routing-node.ts
similarity index 89%
rename from packages/core/src/RoutingNode.ts
rename to packages/core/src/execution-engine/routing-node.ts
index 1c041735d8..e62bdfd34c 100644
--- a/packages/core/src/RoutingNode.ts
+++ b/packages/core/src/execution-engine/routing-node.ts
@@ -6,24 +6,25 @@
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
-import { NodeHelpers, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
+import {
+	NodeHelpers,
+	NodeApiError,
+	NodeOperationError,
+	sleep,
+	NodeConnectionType,
+} from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	IHttpRequestOptions,
 	IN8nHttpFullResponse,
-	INode,
 	INodeExecutionData,
 	INodeParameters,
 	INodePropertyOptions,
 	INodeType,
 	DeclarativeRestApiSettings,
-	IRunExecutionData,
-	ITaskDataConnections,
 	IWorkflowDataProxyAdditionalKeys,
-	IWorkflowExecuteAdditionalData,
 	NodeParameterValue,
-	WorkflowExecuteMode,
 	IDataObject,
 	IExecuteData,
 	IExecuteSingleFunctions,
@@ -33,70 +34,39 @@ import type {
 	NodeParameterValueType,
 	PostReceiveAction,
 	JsonObject,
-	CloseFunction,
 	INodeCredentialDescription,
 	IExecutePaginationFunctions,
-	Workflow,
 } from 'n8n-workflow';
 import url from 'node:url';
 
-import { ExecuteContext, ExecuteSingleContext } from './node-execution-context';
+import { type ExecuteContext, ExecuteSingleContext } from './node-execution-context';
 
 export class RoutingNode {
-	additionalData: IWorkflowExecuteAdditionalData;
-
-	connectionInputData: INodeExecutionData[];
-
-	node: INode;
-
-	mode: WorkflowExecuteMode;
-
-	runExecutionData: IRunExecutionData;
-
-	workflow: Workflow;
-
 	constructor(
-		workflow: Workflow,
-		node: INode,
-		connectionInputData: INodeExecutionData[],
-		runExecutionData: IRunExecutionData,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-	) {
-		this.additionalData = additionalData;
-		this.connectionInputData = connectionInputData;
-		this.runExecutionData = runExecutionData;
-		this.mode = mode;
-		this.node = node;
-		this.workflow = workflow;
-	}
+		private readonly context: ExecuteContext,
+		private readonly nodeType: INodeType,
+		private readonly credentialsDecrypted?: ICredentialsDecrypted,
+	) {}
 
 	// eslint-disable-next-line complexity
-	async runNode(
-		inputData: ITaskDataConnections,
-		runIndex: number,
-		nodeType: INodeType,
-		executeData: IExecuteData,
-		credentialsDecrypted?: ICredentialsDecrypted,
-		abortSignal?: AbortSignal,
-	): Promise<INodeExecutionData[][] | null | undefined> {
-		const items = inputData.main[0] as INodeExecutionData[];
-		const returnData: INodeExecutionData[] = [];
-
-		const closeFunctions: CloseFunction[] = [];
-		const executeFunctions = new ExecuteContext(
-			this.workflow,
-			this.node,
-			this.additionalData,
-			this.mode,
-			this.runExecutionData,
-			runIndex,
-			this.connectionInputData,
-			inputData,
+	async runNode(): Promise<INodeExecutionData[][] | undefined> {
+		const { context, nodeType, credentialsDecrypted } = this;
+		const {
+			additionalData,
 			executeData,
-			closeFunctions,
-			abortSignal,
-		);
+			inputData,
+			node,
+			workflow,
+			mode,
+			runIndex,
+			connectionInputData,
+			runExecutionData,
+		} = context;
+		const abortSignal = context.getExecutionCancelSignal();
+
+		const items = (inputData[NodeConnectionType.Main] ??
+			inputData[NodeConnectionType.AiTool])[0] as INodeExecutionData[];
+		const returnData: INodeExecutionData[] = [];
 
 		let credentialDescription: INodeCredentialDescription | undefined;
 
@@ -104,17 +74,14 @@ export class RoutingNode {
 			if (nodeType.description.credentials.length === 1) {
 				credentialDescription = nodeType.description.credentials[0];
 			} else {
-				const authenticationMethod = executeFunctions.getNodeParameter(
-					'authentication',
-					0,
-				) as string;
+				const authenticationMethod = context.getNodeParameter('authentication', 0) as string;
 				credentialDescription = nodeType.description.credentials.find((x) =>
 					x.displayOptions?.show?.authentication?.includes(authenticationMethod),
 				);
 				if (!credentialDescription) {
 					throw new NodeOperationError(
-						this.node,
-						`Node type "${this.node.type}" does not have any credentials of type "${authenticationMethod}" defined`,
+						node,
+						`Node type "${node.type}" does not have any credentials of type "${authenticationMethod}" defined`,
 						{ level: 'warning' },
 					);
 				}
@@ -127,7 +94,7 @@ export class RoutingNode {
 		} else if (credentialDescription) {
 			try {
 				credentials =
-					(await executeFunctions.getCredentials<ICredentialDataDecryptedObject>(
+					(await context.getCredentials<ICredentialDataDecryptedObject>(
 						credentialDescription.name,
 						0,
 					)) || {};
@@ -142,7 +109,7 @@ export class RoutingNode {
 			}
 		}
 
-		const { batching } = executeFunctions.getNodeParameter('requestOptions', 0, {}) as {
+		const { batching } = context.getNodeParameter('requestOptions', 0, {}) as {
 			batching: { batch: { batchSize: number; batchInterval: number } };
 		};
 
@@ -163,13 +130,13 @@ export class RoutingNode {
 			}
 
 			const thisArgs = new ExecuteSingleContext(
-				this.workflow,
-				this.node,
-				this.additionalData,
-				this.mode,
-				this.runExecutionData,
+				workflow,
+				node,
+				additionalData,
+				mode,
+				runExecutionData,
 				runIndex,
-				this.connectionInputData,
+				connectionInputData,
 				inputData,
 				itemIndex,
 				executeData,
@@ -214,7 +181,7 @@ export class RoutingNode {
 						itemIndex,
 						runIndex,
 						executeData,
-						{ $credentials: credentials, $version: this.node.typeVersion },
+						{ $credentials: credentials, $version: node.typeVersion },
 						false,
 					) as string;
 					// eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -223,14 +190,14 @@ export class RoutingNode {
 			}
 
 			for (const property of nodeType.description.properties) {
-				let value = get(this.node.parameters, property.name, []) as string | NodeParameterValue;
+				let value = get(node.parameters, property.name, []) as string | NodeParameterValue;
 				// If the value is an expression resolve it
 				value = this.getParameterValue(
 					value,
 					itemIndex,
 					runIndex,
 					executeData,
-					{ $credentials: credentials, $version: this.node.typeVersion },
+					{ $credentials: credentials, $version: node.typeVersion },
 					false,
 				) as string | NodeParameterValue;
 
@@ -240,7 +207,7 @@ export class RoutingNode {
 					itemIndex,
 					runIndex,
 					'',
-					{ $credentials: credentials, $value: value, $version: this.node.typeVersion },
+					{ $credentials: credentials, $value: value, $version: node.typeVersion },
 				);
 
 				this.mergeOptions(itemContext[itemIndex].requestData, tempOptions);
@@ -255,7 +222,7 @@ export class RoutingNode {
 						!(property in proxyParsed) ||
 						proxyParsed[property as keyof typeof proxyParsed] === null
 					) {
-						throw new NodeOperationError(this.node, 'The proxy is not value', {
+						throw new NodeOperationError(node, 'The proxy is not value', {
 							runIndex,
 							itemIndex,
 							description: `The proxy URL does not contain a valid value for "${property}"`,
@@ -291,7 +258,7 @@ export class RoutingNode {
 			}
 
 			requestPromises.push(
-				this.makeRoutingRequest(
+				this.makeRequest(
 					itemContext[itemIndex].requestData,
 					itemContext[itemIndex].thisArgs,
 					itemIndex,
@@ -327,7 +294,7 @@ export class RoutingNode {
 					throw error;
 				}
 
-				throw new NodeApiError(this.node, error as JsonObject, {
+				throw new NodeApiError(node, error as JsonObject, {
 					runIndex,
 					itemIndex,
 					message: error?.message,
@@ -347,7 +314,7 @@ export class RoutingNode {
 		return [returnData];
 	}
 
-	mergeOptions(
+	private mergeOptions(
 		destinationOptions: DeclarativeRestApiSettings.ResultOptions,
 		sourceOptions?: DeclarativeRestApiSettings.ResultOptions,
 	): void {
@@ -368,7 +335,7 @@ export class RoutingNode {
 		}
 	}
 
-	async runPostReceiveAction(
+	private async runPostReceiveAction(
 		executeSingleFunctions: IExecuteSingleFunctions,
 		action: PostReceiveAction,
 		inputData: INodeExecutionData[],
@@ -380,6 +347,9 @@ export class RoutingNode {
 		if (typeof action === 'function') {
 			return await action.call(executeSingleFunctions, inputData, responseData);
 		}
+
+		const { node } = this.context;
+
 		if (action.type === 'rootProperty') {
 			try {
 				return inputData.flatMap((item) => {
@@ -395,13 +365,14 @@ export class RoutingNode {
 					});
 				});
 			} catch (error) {
-				throw new NodeOperationError(this.node, error as Error, {
+				throw new NodeOperationError(node, error as Error, {
 					runIndex,
 					itemIndex,
 					description: `The rootProperty "${action.properties.property}" could not be found on item.`,
 				});
 			}
 		}
+
 		if (action.type === 'filter') {
 			const passValue = action.properties.pass;
 
@@ -416,7 +387,7 @@ export class RoutingNode {
 						$response: responseData,
 						$responseItem: item.json,
 						$value: parameterValue,
-						$version: this.node.typeVersion,
+						$version: node.typeVersion,
 					},
 					false,
 				) as boolean;
@@ -424,17 +395,19 @@ export class RoutingNode {
 
 			return inputData;
 		}
+
 		if (action.type === 'limit') {
 			const maxResults = this.getParameterValue(
 				action.properties.maxResults,
 				itemIndex,
 				runIndex,
 				executeSingleFunctions.getExecuteData(),
-				{ $response: responseData, $value: parameterValue, $version: this.node.typeVersion },
+				{ $response: responseData, $value: parameterValue, $version: node.typeVersion },
 				false,
 			) as string;
 			return inputData.slice(0, parseInt(maxResults, 10));
 		}
+
 		if (action.type === 'set') {
 			const { value } = action.properties;
 			// If the value is an expression resolve it
@@ -445,12 +418,13 @@ export class RoutingNode {
 						itemIndex,
 						runIndex,
 						executeSingleFunctions.getExecuteData(),
-						{ $response: responseData, $value: parameterValue, $version: this.node.typeVersion },
+						{ $response: responseData, $value: parameterValue, $version: node.typeVersion },
 						false,
 					) as IDataObject,
 				},
 			];
 		}
+
 		if (action.type === 'sort') {
 			// Sort the returned options
 			const sortKey = action.properties.key;
@@ -468,6 +442,7 @@ export class RoutingNode {
 
 			return inputData;
 		}
+
 		if (action.type === 'setKeyValue') {
 			const returnData: INodeExecutionData[] = [];
 
@@ -491,7 +466,7 @@ export class RoutingNode {
 							$response: responseData,
 							$responseItem: item.json,
 							$value: parameterValue,
-							$version: this.node.typeVersion,
+							$version: node.typeVersion,
 						},
 						false,
 					) as string;
@@ -503,6 +478,7 @@ export class RoutingNode {
 
 			return returnData;
 		}
+
 		if (action.type === 'binaryData') {
 			const body = (responseData.body = Buffer.from(responseData.body as string));
 			let { destinationProperty } = action.properties;
@@ -512,7 +488,7 @@ export class RoutingNode {
 				itemIndex,
 				runIndex,
 				executeSingleFunctions.getExecuteData(),
-				{ $response: responseData, $value: parameterValue, $version: this.node.typeVersion },
+				{ $response: responseData, $value: parameterValue, $version: node.typeVersion },
 				false,
 			) as string;
 
@@ -535,7 +511,7 @@ export class RoutingNode {
 		return [];
 	}
 
-	async postProcessResponseData(
+	private async postProcessResponseData(
 		executeSingleFunctions: IExecuteSingleFunctions,
 		responseData: IN8nHttpFullResponse,
 		requestData: DeclarativeRestApiSettings.ResultOptions,
@@ -580,7 +556,7 @@ export class RoutingNode {
 		return returnData;
 	}
 
-	async rawRoutingRequest(
+	private async rawRoutingRequest(
 		executeSingleFunctions: IExecuteSingleFunctions,
 		requestData: DeclarativeRestApiSettings.ResultOptions,
 		credentialType?: string,
@@ -604,7 +580,7 @@ export class RoutingNode {
 		return responseData;
 	}
 
-	async makeRoutingRequest(
+	private async makeRequest(
 		requestData: DeclarativeRestApiSettings.ResultOptions,
 		executeSingleFunctions: IExecuteSingleFunctions,
 		itemIndex: number,
@@ -639,6 +615,7 @@ export class RoutingNode {
 			);
 		};
 
+		const { node } = this.context;
 		const executePaginationFunctions = Object.create(executeSingleFunctions, {
 			makeRoutingRequest: { value: makeRoutingRequest },
 		}) as IExecutePaginationFunctions;
@@ -669,7 +646,7 @@ export class RoutingNode {
 					const additionalKeys = {
 						$request: requestData.options,
 						$response: {} as IN8nHttpFullResponse,
-						$version: this.node.typeVersion,
+						$version: node.typeVersion,
 					};
 
 					do {
@@ -763,7 +740,7 @@ export class RoutingNode {
 								| undefined;
 							if (tempResponseValue === undefined) {
 								throw new NodeOperationError(
-									this.node,
+									node,
 									`The rootProperty "${properties.rootProperty}" could not be found on item.`,
 									{ runIndex, itemIndex },
 								);
@@ -801,7 +778,7 @@ export class RoutingNode {
 		return responseData;
 	}
 
-	getParameterValue(
+	private getParameterValue(
 		parameterValue: NodeParameterValueType,
 		itemIndex: number,
 		runIndex: number,
@@ -813,14 +790,15 @@ export class RoutingNode {
 			typeof parameterValue === 'object' ||
 			(typeof parameterValue === 'string' && parameterValue.charAt(0) === '=')
 		) {
-			return this.workflow.expression.getParameterValue(
+			const { node, workflow, mode, connectionInputData, runExecutionData } = this.context;
+			return workflow.expression.getParameterValue(
 				parameterValue,
-				this.runExecutionData ?? null,
+				runExecutionData ?? null,
 				runIndex,
 				itemIndex,
-				this.node.name,
-				this.connectionInputData,
-				this.mode,
+				node.name,
+				connectionInputData,
+				mode,
 				additionalKeys ?? {},
 				executeData,
 				returnObjectAsString,
@@ -851,14 +829,8 @@ export class RoutingNode {
 		};
 		let basePath = path ? `${path}.` : '';
 
-		if (
-			!NodeHelpers.displayParameter(
-				this.node.parameters,
-				nodeProperties,
-				this.node,
-				this.node.parameters,
-			)
-		) {
+		const { node } = this.context;
+		if (!NodeHelpers.displayParameter(node.parameters, nodeProperties, node, node.parameters)) {
 			return undefined;
 		}
 		if (nodeProperties.routing) {
@@ -1032,7 +1004,7 @@ export class RoutingNode {
 		let value;
 		if (nodeProperties.type === 'options') {
 			const optionValue = NodeHelpers.getParameterValueByPath(
-				this.node.parameters,
+				node.parameters,
 				nodeProperties.name,
 				basePath.slice(0, -1),
 			);
@@ -1050,14 +1022,14 @@ export class RoutingNode {
 					itemIndex,
 					runIndex,
 					`${basePath}${nodeProperties.name}`,
-					{ $value: optionValue, $version: this.node.typeVersion },
+					{ $value: optionValue, $version: node.typeVersion },
 				);
 
 				this.mergeOptions(returnData, tempOptions);
 			}
 		} else if (nodeProperties.type === 'collection') {
 			value = NodeHelpers.getParameterValueByPath(
-				this.node.parameters,
+				node.parameters,
 				nodeProperties.name,
 				basePath.slice(0, -1),
 			);
@@ -1074,7 +1046,7 @@ export class RoutingNode {
 						itemIndex,
 						runIndex,
 						`${basePath}${nodeProperties.name}`,
-						{ $version: this.node.typeVersion },
+						{ $version: node.typeVersion },
 					);
 
 					this.mergeOptions(returnData, tempOptions);
@@ -1085,7 +1057,7 @@ export class RoutingNode {
 			for (const propertyOptions of nodeProperties.options as INodePropertyCollection[]) {
 				// Check if the option got set and if not skip it
 				value = NodeHelpers.getParameterValueByPath(
-					this.node.parameters,
+					node.parameters,
 					propertyOptions.name,
 					basePath.slice(0, -1),
 				);
diff --git a/packages/core/src/ScheduledTaskManager.ts b/packages/core/src/execution-engine/scheduled-task-manager.ts
similarity index 95%
rename from packages/core/src/ScheduledTaskManager.ts
rename to packages/core/src/execution-engine/scheduled-task-manager.ts
index 0c33f9872c..1a20700b00 100644
--- a/packages/core/src/ScheduledTaskManager.ts
+++ b/packages/core/src/execution-engine/scheduled-task-manager.ts
@@ -2,7 +2,7 @@ import { Service } from '@n8n/di';
 import { CronJob } from 'cron';
 import type { CronExpression, Workflow } from 'n8n-workflow';
 
-import { InstanceSettings } from './InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
 
 @Service()
 export class ScheduledTaskManager {
diff --git a/packages/core/src/SSHClientsManager.ts b/packages/core/src/execution-engine/ssh-clients-manager.ts
similarity index 100%
rename from packages/core/src/SSHClientsManager.ts
rename to packages/core/src/execution-engine/ssh-clients-manager.ts
diff --git a/packages/core/src/TriggersAndPollers.ts b/packages/core/src/execution-engine/triggers-and-pollers.ts
similarity index 68%
rename from packages/core/src/TriggersAndPollers.ts
rename to packages/core/src/execution-engine/triggers-and-pollers.ts
index 681d50641a..9c90327149 100644
--- a/packages/core/src/TriggersAndPollers.ts
+++ b/packages/core/src/execution-engine/triggers-and-pollers.ts
@@ -5,7 +5,6 @@ import type {
 	INode,
 	INodeExecutionData,
 	IPollFunctions,
-	IGetExecuteTriggerFunctions,
 	IWorkflowExecuteAdditionalData,
 	WorkflowExecuteMode,
 	WorkflowActivateMode,
@@ -14,6 +13,9 @@ import type {
 	IExecuteResponsePromiseData,
 	IRun,
 } from 'n8n-workflow';
+import assert from 'node:assert';
+
+import type { IGetExecuteTriggerFunctions } from './interfaces';
 
 @Service()
 export class TriggersAndPollers {
@@ -46,46 +48,34 @@ export class TriggersAndPollers {
 
 			// Add the manual trigger response which resolves when the first time data got emitted
 			triggerResponse!.manualTriggerResponse = new Promise((resolve, reject) => {
+				const { hooks } = additionalData;
+				assert.ok(hooks, 'Execution lifecycle hooks are not defined');
+
 				triggerFunctions.emit = (
-					(resolveEmit) =>
-					(
-						data: INodeExecutionData[][],
-						responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-						donePromise?: IDeferredPromise<IRun>,
-					) => {
-						additionalData.hooks!.hookFunctions.sendResponse = [
-							async (response: IExecuteResponsePromiseData): Promise<void> => {
-								if (responsePromise) {
-									responsePromise.resolve(response);
-								}
-							},
-						];
-
-						if (donePromise) {
-							additionalData.hooks!.hookFunctions.workflowExecuteAfter?.unshift(
-								async (runData: IRun): Promise<void> => {
-									return donePromise.resolve(runData);
-								},
-							);
-						}
-
-						resolveEmit(data);
+					data: INodeExecutionData[][],
+					responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+					donePromise?: IDeferredPromise<IRun>,
+				) => {
+					if (responsePromise) {
+						hooks.addHandler('sendResponse', (response) => responsePromise.resolve(response));
 					}
-				)(resolve);
+
+					if (donePromise) {
+						hooks.addHandler('workflowExecuteAfter', (runData) => donePromise.resolve(runData));
+					}
+
+					resolve(data);
+				};
+
 				triggerFunctions.emitError = (
-					(rejectEmit) =>
-					(error: Error, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>) => {
-						additionalData.hooks!.hookFunctions.sendResponse = [
-							async (): Promise<void> => {
-								if (responsePromise) {
-									responsePromise.reject(error);
-								}
-							},
-						];
-
-						rejectEmit(error);
+					error: Error,
+					responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+				) => {
+					if (responsePromise) {
+						hooks.addHandler('sendResponse', () => responsePromise.reject(error));
 					}
-				)(reject);
+					reject(error);
+				};
 			});
 
 			return triggerResponse;
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/execution-engine/workflow-execute.ts
similarity index 97%
rename from packages/core/src/WorkflowExecute.ts
rename to packages/core/src/execution-engine/workflow-execute.ts
index 3817fe32b2..00a7a580a3 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/execution-engine/workflow-execute.ts
@@ -44,7 +44,6 @@ import type {
 } from 'n8n-workflow';
 import {
 	LoggerProxy as Logger,
-	WorkflowOperationError,
 	NodeHelpers,
 	NodeConnectionType,
 	ApplicationError,
@@ -55,9 +54,11 @@ import {
 } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
 
-import { ErrorReporter } from './error-reporter';
+import { ErrorReporter } from '@/errors/error-reporter';
+import { WorkflowHasIssuesError } from '@/errors/workflow-has-issues.error';
+import * as NodeExecuteFunctions from '@/node-execute-functions';
+
 import { ExecuteContext, PollContext } from './node-execution-context';
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 import {
 	DirectedGraph,
 	findStartNodes,
@@ -67,9 +68,9 @@ import {
 	recreateNodeExecutionStack,
 	handleCycles,
 	filterDisabledNodes,
-} from './PartialExecutionUtils';
-import { RoutingNode } from './RoutingNode';
-import { TriggersAndPollers } from './TriggersAndPollers';
+} from './partial-execution-utils';
+import { RoutingNode } from './routing-node';
+import { TriggersAndPollers } from './triggers-and-pollers';
 
 export class WorkflowExecute {
 	private status: ExecutionStatus = 'new';
@@ -404,19 +405,6 @@ export class WorkflowExecute {
 		return this.processRunExecutionData(graph.toWorkflow({ ...workflow }));
 	}
 
-	/**
-	 * Executes the hook with the given name
-	 *
-	 */
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	async executeHook(hookName: string, parameters: any[]): Promise<void> {
-		if (this.additionalData.hooks === undefined) {
-			return;
-		}
-
-		return await this.additionalData.hooks.executeHookFunctions(hookName, parameters);
-	}
-
 	/**
 	 * Merges temporary execution metadata into the final runData structure.
 	 * During workflow execution, metadata is collected in a temporary location
@@ -1170,27 +1158,23 @@ export class WorkflowExecute {
 			// For webhook nodes always simply pass the data through
 			return { data: inputData.main as INodeExecutionData[][] };
 		} else {
-			// For nodes which have routing information on properties
-
-			const routingNode = new RoutingNode(
+			// NOTE: This block is only called by nodes tests.
+			// In the application, declarative nodes get assigned a `.execute` method in NodeTypes.
+			const context = new ExecuteContext(
 				workflow,
 				node,
-				connectionInputData,
-				runExecutionData ?? null,
 				additionalData,
 				mode,
+				runExecutionData,
+				runIndex,
+				connectionInputData,
+				inputData,
+				executionData,
+				[],
 			);
-
-			return {
-				data: await routingNode.runNode(
-					inputData,
-					runIndex,
-					nodeType,
-					executionData,
-					undefined,
-					abortSignal,
-				),
-			};
+			const routingNode = new RoutingNode(context, nodeType);
+			const data = await routingNode.runNode();
+			return { data };
 		}
 	}
 
@@ -1210,7 +1194,21 @@ export class WorkflowExecute {
 
 		this.status = 'running';
 
-		const startNode = this.runExecutionData.executionData!.nodeExecutionStack[0].node.name;
+		const { hooks, executionId } = this.additionalData;
+		assert.ok(hooks, 'Failed to run workflow due to missing execution lifecycle hooks');
+
+		if (!this.runExecutionData.executionData) {
+			throw new ApplicationError('Failed to run workflow due to missing execution data', {
+				extra: {
+					workflowId: workflow.id,
+					executionId,
+					mode: this.mode,
+				},
+			});
+		}
+
+		/** Node execution stack will be empty for an execution containing only Chat Trigger. */
+		const startNode = this.runExecutionData.executionData.nodeExecutionStack.at(0)?.node.name;
 
 		let destinationNode: string | undefined;
 		if (this.runExecutionData.startData && this.runExecutionData.startData.destinationNode) {
@@ -1225,9 +1223,7 @@ export class WorkflowExecute {
 			pinDataNodeNames,
 		});
 		if (workflowIssues !== null) {
-			throw new WorkflowOperationError(
-				'The workflow has issues and cannot be executed for that reason. Please fix them first.',
-			);
+			throw new WorkflowHasIssuesError();
 		}
 
 		// Variables which hold temporary data for each node-execution
@@ -1245,7 +1241,7 @@ export class WorkflowExecute {
 
 		if (this.runExecutionData.waitTill) {
 			const lastNodeExecuted = this.runExecutionData.resultData.lastNodeExecuted as string;
-			this.runExecutionData.executionData!.nodeExecutionStack[0].node.disabled = true;
+			this.runExecutionData.executionData.nodeExecutionStack[0].node.disabled = true;
 			this.runExecutionData.waitTill = undefined;
 			this.runExecutionData.resultData.runData[lastNodeExecuted].pop();
 		}
@@ -1263,14 +1259,14 @@ export class WorkflowExecute {
 				this.status = 'canceled';
 				this.abortController.abort();
 				const fullRunData = this.getFullRunData(startedAt);
-				void this.executeHook('workflowExecuteAfter', [fullRunData]);
+				void hooks.runHook('workflowExecuteAfter', [fullRunData]);
 			});
 
 			// eslint-disable-next-line complexity
 			const returnPromise = (async () => {
 				try {
 					if (!this.additionalData.restartExecutionId) {
-						await this.executeHook('workflowExecuteBefore', [workflow, this.runExecutionData]);
+						await hooks.runHook('workflowExecuteBefore', [workflow, this.runExecutionData]);
 					}
 				} catch (error) {
 					const e = error as unknown as ExecutionBaseError;
@@ -1354,7 +1350,7 @@ export class WorkflowExecute {
 						node: executionNode.name,
 						workflowId: workflow.id,
 					});
-					await this.executeHook('nodeExecuteBefore', [executionNode.name]);
+					await hooks.runHook('nodeExecuteBefore', [executionNode.name]);
 
 					// Get the index of the current run
 					runIndex = 0;
@@ -1645,7 +1641,7 @@ export class WorkflowExecute {
 							this.runExecutionData.executionData!.nodeExecutionStack.unshift(executionData);
 							// Only execute the nodeExecuteAfter hook if the node did not get aborted
 							if (!this.isCancelled) {
-								await this.executeHook('nodeExecuteAfter', [
+								await hooks.runHook('nodeExecuteAfter', [
 									executionNode.name,
 									taskData,
 									this.runExecutionData,
@@ -1687,7 +1683,7 @@ export class WorkflowExecute {
 					this.runExecutionData.resultData.runData[executionNode.name].push(taskData);
 
 					if (this.runExecutionData.waitTill) {
-						await this.executeHook('nodeExecuteAfter', [
+						await hooks.runHook('nodeExecuteAfter', [
 							executionNode.name,
 							taskData,
 							this.runExecutionData,
@@ -1706,7 +1702,7 @@ export class WorkflowExecute {
 					) {
 						// Before stopping, make sure we are executing hooks so
 						// That frontend is notified for example for manual executions.
-						await this.executeHook('nodeExecuteAfter', [
+						await hooks.runHook('nodeExecuteAfter', [
 							executionNode.name,
 							taskData,
 							this.runExecutionData,
@@ -1816,7 +1812,7 @@ export class WorkflowExecute {
 					// Execute hooks now to make sure that all hooks are executed properly
 					// Await is needed to make sure that we don't fall into concurrency problems
 					// When saving node execution data
-					await this.executeHook('nodeExecuteAfter', [
+					await hooks.runHook('nodeExecuteAfter', [
 						executionNode.name,
 						taskData,
 						this.runExecutionData,
@@ -2019,7 +2015,7 @@ export class WorkflowExecute {
 
 					this.moveNodeMetadata();
 
-					await this.executeHook('workflowExecuteAfter', [fullRunData, newStaticData]).catch(
+					await hooks.runHook('workflowExecuteAfter', [fullRunData, newStaticData]).catch(
 						// eslint-disable-next-line @typescript-eslint/no-shadow
 						(error) => {
 							console.error('There was a problem running hook "workflowExecuteAfter"', error);
@@ -2112,7 +2108,10 @@ export class WorkflowExecute {
 		this.moveNodeMetadata();
 		// Prevent from running the hook if the error is an abort error as it was already handled
 		if (!this.isCancelled) {
-			await this.executeHook('workflowExecuteAfter', [fullRunData, newStaticData]);
+			await this.additionalData.hooks?.runHook('workflowExecuteAfter', [
+				fullRunData,
+				newStaticData,
+			]);
 		}
 
 		if (closeFunction) {
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 7abbd9ad9a..0a620468bf 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,29 +1,19 @@
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
+import * as NodeExecuteFunctions from './node-execute-functions';
 
-export * from './decorators';
-export * from './errors';
-export * from './ActiveWorkflows';
-export * from './BinaryData/BinaryData.service';
-export * from './BinaryData/types';
-export { Cipher } from './Cipher';
-export * from './Constants';
-export * from './Credentials';
-export * from './DirectoryLoader';
-export * from './Interfaces';
-export { InstanceSettings, InstanceType } from './InstanceSettings';
-export { Logger } from './logging/logger';
-export * from './NodeExecuteFunctions';
-export * from './RoutingNode';
-export * from './WorkflowExecute';
-export { NodeExecuteFunctions };
+export * from './binary-data';
+export * from './constants';
+export * from './credentials';
 export * from './data-deduplication-service';
+export * from './decorators';
+export * from './encryption';
 export * from './errors';
-export { ObjectStoreService } from './ObjectStore/ObjectStore.service.ee';
-export { BinaryData } from './BinaryData/types';
-export { isStoredMode as isValidNonDefaultMode } from './BinaryData/utils';
-export * from './ExecutionMetadata';
-export * from './node-execution-context';
-export * from './PartialExecutionUtils';
-export { ErrorReporter } from './error-reporter';
-export * from './SerializedBuffer';
-export { isObjectLiteral } from './utils';
+export * from './execution-engine';
+export * from './instance-settings';
+export * from './logging';
+export * from './nodes-loader';
+export * from './utils';
+export { WorkflowHasIssuesError } from './errors/workflow-has-issues.error';
+
+export * from './interfaces';
+export * from './node-execute-functions';
+export { NodeExecuteFunctions };
diff --git a/packages/core/test/InstanceSettings.test.ts b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
similarity index 81%
rename from packages/core/test/InstanceSettings.test.ts
rename to packages/core/src/instance-settings/__tests__/instance-settings.test.ts
index 1fe96d3490..b57ed99f09 100644
--- a/packages/core/test/InstanceSettings.test.ts
+++ b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
@@ -2,11 +2,10 @@ import { mock } from 'jest-mock-extended';
 jest.mock('node:fs', () => mock<typeof fs>());
 import * as fs from 'node:fs';
 
-import { InstanceSettings } from '@/InstanceSettings';
-import { InstanceSettingsConfig } from '@/InstanceSettingsConfig';
+import { InstanceSettings } from '@/instance-settings';
+import { InstanceSettingsConfig } from '@/instance-settings/instance-settings-config';
 import { Logger } from '@/logging/logger';
-
-import { mockInstance } from './utils';
+import { mockInstance } from '@test/utils';
 
 describe('InstanceSettings', () => {
 	const userFolder = '/test';
@@ -214,33 +213,58 @@ describe('InstanceSettings', () => {
 		});
 
 		it('should return true if /.dockerenv exists', () => {
-			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(true);
+			mockFs.existsSync.mockImplementation((path) => path === '/.dockerenv');
 			expect(settings.isDocker).toBe(true);
 			expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
 			expect(mockFs.readFileSync).not.toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
 		});
 
-		it('should return true if /proc/self/cgroup contains docker', () => {
-			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(false);
-			mockFs.readFileSync
-				.calledWith('/proc/self/cgroup', 'utf8')
-				.mockReturnValueOnce('docker cgroup');
-
+		it('should return true if /run/.containerenv exists', () => {
+			mockFs.existsSync.mockImplementation((path) => path === '/run/.containerenv');
 			expect(settings.isDocker).toBe(true);
-			expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
-			expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+			expect(mockFs.existsSync).toHaveBeenCalledWith('/run/.containerenv');
+			expect(mockFs.readFileSync).not.toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
 		});
 
+		test.each(['docker', 'kubepods', 'containerd'])(
+			'should return true if /proc/self/cgroup contains %s',
+			(str) => {
+				mockFs.existsSync.mockReturnValueOnce(false);
+				mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce(str);
+
+				expect(settings.isDocker).toBe(true);
+				expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+				expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+			},
+		);
+
+		test.each(['docker', 'kubelet', 'containerd'])(
+			'should return true if /proc/self/mountinfo contains %s',
+			(str) => {
+				mockFs.existsSync.mockReturnValueOnce(false);
+				mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce('');
+				mockFs.readFileSync.calledWith('/proc/self/mountinfo', 'utf8').mockReturnValueOnce(str);
+
+				expect(settings.isDocker).toBe(true);
+				expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+				expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+				expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/mountinfo', 'utf8');
+			},
+		);
+
 		it('should return false if no docker indicators are found', () => {
 			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(false);
 			mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce('');
+			mockFs.readFileSync.calledWith('/proc/self/mountinfo', 'utf8').mockReturnValueOnce('');
 			expect(settings.isDocker).toBe(false);
 		});
 
-		it('should return false if checking for docker throws an error', () => {
-			mockFs.existsSync.calledWith('/.dockerenv').mockImplementationOnce(() => {
-				throw new Error('Access denied');
+		it('should return false if reading any of these files throws an error', () => {
+			mockFs.existsSync.mockReturnValue(false);
+			mockFs.readFileSync.mockImplementation(() => {
+				throw new Error('File not found');
 			});
+
 			expect(settings.isDocker).toBe(false);
 		});
 
diff --git a/packages/core/src/instance-settings/index.ts b/packages/core/src/instance-settings/index.ts
new file mode 100644
index 0000000000..74b05f5d98
--- /dev/null
+++ b/packages/core/src/instance-settings/index.ts
@@ -0,0 +1 @@
+export { InstanceSettings, InstanceType } from './instance-settings';
diff --git a/packages/core/src/InstanceSettingsConfig.ts b/packages/core/src/instance-settings/instance-settings-config.ts
similarity index 100%
rename from packages/core/src/InstanceSettingsConfig.ts
rename to packages/core/src/instance-settings/instance-settings-config.ts
diff --git a/packages/core/src/InstanceSettings.ts b/packages/core/src/instance-settings/instance-settings.ts
similarity index 92%
rename from packages/core/src/InstanceSettings.ts
rename to packages/core/src/instance-settings/instance-settings.ts
index d06f68fc12..5f8a68596b 100644
--- a/packages/core/src/InstanceSettings.ts
+++ b/packages/core/src/instance-settings/instance-settings.ts
@@ -5,10 +5,10 @@ import { customAlphabet } from 'nanoid';
 import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import path from 'path';
 
+import { Memoized } from '@/decorators';
 import { Logger } from '@/logging/logger';
 
-import { Memoized } from './decorators';
-import { InstanceSettingsConfig } from './InstanceSettingsConfig';
+import { InstanceSettingsConfig } from './instance-settings-config';
 
 const nanoid = customAlphabet(ALPHABET, 16);
 
@@ -142,19 +142,30 @@ export class InstanceSettings {
 	}
 
 	/**
-	 * Whether this instance is running inside a Docker container.
-	 *
-	 * Based on: https://github.com/sindresorhus/is-docker
+	 * Whether this instance is running inside a Docker/Podman/Kubernetes container.
 	 */
 	@Memoized
 	get isDocker() {
+		if (existsSync('/.dockerenv') || existsSync('/run/.containerenv')) return true;
 		try {
-			return (
-				existsSync('/.dockerenv') || readFileSync('/proc/self/cgroup', 'utf8').includes('docker')
-			);
-		} catch {
-			return false;
-		}
+			const cgroupV1 = readFileSync('/proc/self/cgroup', 'utf8');
+			if (
+				cgroupV1.includes('docker') ||
+				cgroupV1.includes('kubepods') ||
+				cgroupV1.includes('containerd')
+			)
+				return true;
+		} catch {}
+		try {
+			const cgroupV2 = readFileSync('/proc/self/mountinfo', 'utf8');
+			if (
+				cgroupV2.includes('docker') ||
+				cgroupV2.includes('kubelet') ||
+				cgroupV2.includes('containerd')
+			)
+				return true;
+		} catch {}
+		return false;
 	}
 
 	update(newSettings: WritableSettings) {
diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/interfaces.ts
similarity index 73%
rename from packages/core/src/Interfaces.ts
rename to packages/core/src/interfaces.ts
index 2963e46185..a00176eee9 100644
--- a/packages/core/src/Interfaces.ts
+++ b/packages/core/src/interfaces.ts
@@ -20,19 +20,4 @@ export interface IWorkflowData {
 	triggerResponses?: ITriggerResponse[];
 }
 
-export namespace n8n {
-	export interface PackageJson {
-		name: string;
-		version: string;
-		n8n?: {
-			credentials?: string[];
-			nodes?: string[];
-		};
-		author?: {
-			name?: string;
-			email?: string;
-		};
-	}
-}
-
 export type ExtendedValidationResult = ValidationResult & { fieldName?: string };
diff --git a/packages/core/src/logging/__tests__/logger.test.ts b/packages/core/src/logging/__tests__/logger.test.ts
index d34eaf250a..1a9ee8e7ef 100644
--- a/packages/core/src/logging/__tests__/logger.test.ts
+++ b/packages/core/src/logging/__tests__/logger.test.ts
@@ -7,7 +7,7 @@ import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
 import { LoggerProxy } from 'n8n-workflow';
 
-import type { InstanceSettingsConfig } from '@/InstanceSettingsConfig';
+import type { InstanceSettingsConfig } from '@/instance-settings/instance-settings-config';
 
 import { Logger } from '../logger';
 
diff --git a/packages/core/src/logging/index.ts b/packages/core/src/logging/index.ts
new file mode 100644
index 0000000000..a1332e91c6
--- /dev/null
+++ b/packages/core/src/logging/index.ts
@@ -0,0 +1 @@
+export { Logger } from './logger';
diff --git a/packages/core/src/logging/logger.ts b/packages/core/src/logging/logger.ts
index 8115f93c86..82a47649ff 100644
--- a/packages/core/src/logging/logger.ts
+++ b/packages/core/src/logging/logger.ts
@@ -14,9 +14,9 @@ import path, { basename } from 'node:path';
 import pc from 'picocolors';
 import winston from 'winston';
 
-import { inDevelopment, inProduction } from '@/Constants';
-import { InstanceSettingsConfig } from '@/InstanceSettingsConfig';
-import { isObjectLiteral } from '@/utils';
+import { inDevelopment, inProduction } from '@/constants';
+import { InstanceSettingsConfig } from '@/instance-settings/instance-settings-config';
+import { isObjectLiteral } from '@/utils/is-object-literal';
 
 const noOp = () => {};
 
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/node-execute-functions.ts
similarity index 60%
rename from packages/core/src/NodeExecuteFunctions.ts
rename to packages/core/src/node-execute-functions.ts
index 9504ad1c78..34a4757962 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/node-execute-functions.ts
@@ -14,31 +14,20 @@ import type {
 } from '@n8n/client-oauth2';
 import { ClientOAuth2 } from '@n8n/client-oauth2';
 import { Container } from '@n8n/di';
-import type { AxiosError, AxiosHeaders, AxiosRequestConfig, AxiosResponse } from 'axios';
+import type { AxiosError, AxiosRequestConfig, AxiosResponse } from 'axios';
 import axios from 'axios';
-import chardet from 'chardet';
 import crypto, { createHmac } from 'crypto';
-import FileType from 'file-type';
 import FormData from 'form-data';
-import { createReadStream } from 'fs';
-import { access as fsAccess, writeFile as fsWriteFile } from 'fs/promises';
 import { IncomingMessage } from 'http';
 import { Agent, type AgentOptions } from 'https';
-import iconv from 'iconv-lite';
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
 import merge from 'lodash/merge';
 import pick from 'lodash/pick';
-import { extension, lookup } from 'mime-types';
 import type {
-	BinaryHelperFunctions,
-	FileSystemHelperFunctions,
-	GenericValue,
 	IAdditionalCredentialOptions,
 	IAllExecuteFunctions,
-	IBinaryData,
 	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteData,
 	IExecuteFunctions,
@@ -52,13 +41,11 @@ import type {
 	IPollFunctions,
 	IRequestOptions,
 	IRunExecutionData,
-	ITaskDataConnections,
 	ITriggerFunctions,
 	IWebhookDescription,
 	IWorkflowDataProxyAdditionalKeys,
 	IWorkflowExecuteAdditionalData,
 	NodeExecutionWithMetadata,
-	NodeHelperFunctions,
 	NodeParameterValueType,
 	PaginationOptions,
 	RequestHelperFunctions,
@@ -66,13 +53,6 @@ import type {
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
 	SSHTunnelFunctions,
-	DeduplicationHelperFunctions,
-	IDeduplicationOutput,
-	IDeduplicationOutputItems,
-	ICheckProcessedOptions,
-	DeduplicationScope,
-	DeduplicationItemTypes,
-	ICheckProcessedContextData,
 	WebhookType,
 	SchedulingFunctions,
 } from 'n8n-workflow';
@@ -82,7 +62,6 @@ import {
 	NodeOperationError,
 	NodeSslError,
 	deepCopy,
-	fileTypeFromMimeType,
 	isObjectEmpty,
 	ExecutionBaseError,
 	jsonParse,
@@ -91,32 +70,23 @@ import {
 } from 'n8n-workflow';
 import type { Token } from 'oauth-1.0a';
 import clientOAuth1 from 'oauth-1.0a';
-import path from 'path';
 import { stringify } from 'qs';
 import { Readable } from 'stream';
 import url, { URL, URLSearchParams } from 'url';
 
 import { Logger } from '@/logging/logger';
 
-import { BinaryDataService } from './BinaryData/BinaryData.service';
-import type { BinaryData } from './BinaryData/types';
-import { binaryToBuffer } from './BinaryData/utils';
-import {
-	BINARY_DATA_STORAGE_PATH,
-	BLOCK_FILE_ACCESS_TO_N8N_FILES,
-	CONFIG_FILES,
-	CUSTOM_EXTENSION_ENV,
-	RESTRICT_FILE_ACCESS_TO,
-	UM_EMAIL_TEMPLATES_INVITE,
-	UM_EMAIL_TEMPLATES_PWRESET,
-} from './Constants';
-import { DataDeduplicationService } from './data-deduplication-service';
-import { InstanceSettings } from './InstanceSettings';
-import type { IResponseError } from './Interfaces';
 // eslint-disable-next-line import/no-cycle
-import { PollContext, TriggerContext } from './node-execution-context';
-import { ScheduledTaskManager } from './ScheduledTaskManager';
-import { SSHClientsManager } from './SSHClientsManager';
+import {
+	binaryToString,
+	parseIncomingMessage,
+	parseRequestObject,
+	PollContext,
+	TriggerContext,
+} from './execution-engine/node-execution-context';
+import { ScheduledTaskManager } from './execution-engine/scheduled-task-manager';
+import { SSHClientsManager } from './execution-engine/ssh-clients-manager';
+import type { IResponseError } from './interfaces';
 
 axios.defaults.timeout = 300000;
 // Prevent axios from adding x-form-www-urlencoded headers by default
@@ -137,31 +107,6 @@ axios.interceptors.request.use((config) => {
 	return config;
 });
 
-const pushFormDataValue = (form: FormData, key: string, value: any) => {
-	if (value?.hasOwnProperty('value') && value.hasOwnProperty('options')) {
-		form.append(key, value.value, value.options);
-	} else {
-		form.append(key, value);
-	}
-};
-
-const createFormDataObject = (data: Record<string, unknown>) => {
-	const formData = new FormData();
-	const keys = Object.keys(data);
-	keys.forEach((key) => {
-		const formField = data[key];
-
-		if (formField instanceof Array) {
-			formField.forEach((item) => {
-				pushFormDataValue(formData, key, item);
-			});
-		} else {
-			pushFormDataValue(formData, key, formField);
-		}
-	});
-	return formData;
-};
-
 export const validateUrl = (url?: string): boolean => {
 	if (!url) return false;
 
@@ -183,29 +128,6 @@ function searchForHeader(config: AxiosRequestConfig, headerName: string) {
 	return headerNames.find((thisHeader) => thisHeader.toLowerCase() === headerName);
 }
 
-async function generateContentLengthHeader(config: AxiosRequestConfig) {
-	if (!(config.data instanceof FormData)) {
-		return;
-	}
-	try {
-		const length = await new Promise<number>((res, rej) => {
-			config.data.getLength((error: Error | null, length: number) => {
-				if (error) {
-					rej(error);
-					return;
-				}
-				res(length);
-			});
-		});
-		config.headers = {
-			...config.headers,
-			'content-length': length,
-		};
-	} catch (error) {
-		Container.get(Logger).error('Unable to calculate form data length', { error });
-	}
-}
-
 const getHostFromRequestObject = (
 	requestObject: Partial<{
 		url: string;
@@ -239,351 +161,6 @@ const getBeforeRedirectFn =
 		}
 	};
 
-// eslint-disable-next-line complexity
-export async function parseRequestObject(requestObject: IRequestOptions) {
-	// This function is a temporary implementation
-	// That translates all http requests done via
-	// the request library to axios directly
-	// We are not using n8n's interface as it would
-	// an unnecessary step, considering the `request`
-	// helper can be deprecated and removed.
-	const axiosConfig: AxiosRequestConfig = {};
-
-	if (requestObject.headers !== undefined) {
-		axiosConfig.headers = requestObject.headers as AxiosHeaders;
-	}
-
-	// Let's start parsing the hardest part, which is the request body.
-	// The process here is as following?
-	// - Check if we have a `content-type` header. If this was set,
-	//   we will follow
-	// - Check if the `form` property was set. If yes, then it's x-www-form-urlencoded
-	// - Check if the `formData` property exists. If yes, then it's multipart/form-data
-	// - Lastly, we should have a regular `body` that is probably a JSON.
-
-	const contentTypeHeaderKeyName =
-		axiosConfig.headers &&
-		Object.keys(axiosConfig.headers).find(
-			(headerName) => headerName.toLowerCase() === 'content-type',
-		);
-	const contentType =
-		contentTypeHeaderKeyName &&
-		(axiosConfig.headers?.[contentTypeHeaderKeyName] as string | undefined);
-	if (contentType === 'application/x-www-form-urlencoded' && requestObject.formData === undefined) {
-		// there are nodes incorrectly created, informing the content type header
-		// and also using formData. Request lib takes precedence for the formData.
-		// We will do the same.
-		// Merge body and form properties.
-		if (typeof requestObject.body === 'string') {
-			axiosConfig.data = requestObject.body;
-		} else {
-			const allData = Object.assign(requestObject.body || {}, requestObject.form || {}) as Record<
-				string,
-				string
-			>;
-			if (requestObject.useQuerystring === true) {
-				axiosConfig.data = stringify(allData, { arrayFormat: 'repeat' });
-			} else {
-				axiosConfig.data = stringify(allData);
-			}
-		}
-	} else if (contentType?.includes('multipart/form-data')) {
-		if (requestObject.formData !== undefined && requestObject.formData instanceof FormData) {
-			axiosConfig.data = requestObject.formData;
-		} else {
-			const allData: Partial<FormData> = {
-				...(requestObject.body as object | undefined),
-				...(requestObject.formData as object | undefined),
-			};
-
-			axiosConfig.data = createFormDataObject(allData);
-		}
-		// replace the existing header with a new one that
-		// contains the boundary property.
-		delete axiosConfig.headers?.[contentTypeHeaderKeyName!];
-		const headers = axiosConfig.data.getHeaders();
-		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
-		await generateContentLengthHeader(axiosConfig);
-	} else {
-		// When using the `form` property it means the content should be x-www-form-urlencoded.
-		if (requestObject.form !== undefined && requestObject.body === undefined) {
-			// If we have only form
-			axiosConfig.data =
-				typeof requestObject.form === 'string'
-					? stringify(requestObject.form, { format: 'RFC3986' })
-					: stringify(requestObject.form).toString();
-			if (axiosConfig.headers !== undefined) {
-				const headerName = searchForHeader(axiosConfig, 'content-type');
-				if (headerName) {
-					delete axiosConfig.headers[headerName];
-				}
-				axiosConfig.headers['Content-Type'] = 'application/x-www-form-urlencoded';
-			} else {
-				axiosConfig.headers = {
-					'Content-Type': 'application/x-www-form-urlencoded',
-				};
-			}
-		} else if (requestObject.formData !== undefined) {
-			// remove any "content-type" that might exist.
-			if (axiosConfig.headers !== undefined) {
-				const headers = Object.keys(axiosConfig.headers);
-				headers.forEach((header) => {
-					if (header.toLowerCase() === 'content-type') {
-						delete axiosConfig.headers?.[header];
-					}
-				});
-			}
-
-			if (requestObject.formData instanceof FormData) {
-				axiosConfig.data = requestObject.formData;
-			} else {
-				axiosConfig.data = createFormDataObject(requestObject.formData as Record<string, unknown>);
-			}
-			// Mix in headers as FormData creates the boundary.
-			const headers = axiosConfig.data.getHeaders();
-			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, headers);
-			await generateContentLengthHeader(axiosConfig);
-		} else if (requestObject.body !== undefined) {
-			// If we have body and possibly form
-			if (requestObject.form !== undefined && requestObject.body) {
-				// merge both objects when exist.
-				requestObject.body = Object.assign(requestObject.body, requestObject.form);
-			}
-			axiosConfig.data = requestObject.body as FormData | GenericValue | GenericValue[];
-		}
-	}
-
-	if (requestObject.uri !== undefined) {
-		axiosConfig.url = requestObject.uri?.toString();
-	}
-
-	if (requestObject.url !== undefined) {
-		axiosConfig.url = requestObject.url?.toString();
-	}
-
-	if (requestObject.baseURL !== undefined) {
-		axiosConfig.baseURL = requestObject.baseURL?.toString();
-	}
-
-	if (requestObject.method !== undefined) {
-		axiosConfig.method = requestObject.method;
-	}
-
-	if (requestObject.qs !== undefined && Object.keys(requestObject.qs as object).length > 0) {
-		axiosConfig.params = requestObject.qs;
-	}
-
-	function hasArrayFormatOptions(
-		arg: IRequestOptions,
-	): arg is Required<Pick<IRequestOptions, 'qsStringifyOptions'>> {
-		if (
-			typeof arg.qsStringifyOptions === 'object' &&
-			arg.qsStringifyOptions !== null &&
-			!Array.isArray(arg.qsStringifyOptions) &&
-			'arrayFormat' in arg.qsStringifyOptions
-		) {
-			return true;
-		}
-
-		return false;
-	}
-
-	if (
-		requestObject.useQuerystring === true ||
-		(hasArrayFormatOptions(requestObject) &&
-			requestObject.qsStringifyOptions.arrayFormat === 'repeat')
-	) {
-		axiosConfig.paramsSerializer = (params) => {
-			return stringify(params, { arrayFormat: 'repeat' });
-		};
-	} else if (requestObject.useQuerystring === false) {
-		axiosConfig.paramsSerializer = (params) => {
-			return stringify(params, { arrayFormat: 'indices' });
-		};
-	}
-
-	if (
-		hasArrayFormatOptions(requestObject) &&
-		requestObject.qsStringifyOptions.arrayFormat === 'brackets'
-	) {
-		axiosConfig.paramsSerializer = (params) => {
-			return stringify(params, { arrayFormat: 'brackets' });
-		};
-	}
-
-	if (requestObject.auth !== undefined) {
-		// Check support for sendImmediately
-		if (requestObject.auth.bearer !== undefined) {
-			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
-				Authorization: `Bearer ${requestObject.auth.bearer}`,
-			});
-		} else {
-			const authObj = requestObject.auth;
-			// Request accepts both user/username and pass/password
-			axiosConfig.auth = {
-				username: (authObj.user || authObj.username) as string,
-				password: (authObj.password || authObj.pass) as string,
-			};
-		}
-	}
-
-	// Only set header if we have a body, otherwise it may fail
-	if (requestObject.json === true) {
-		// Add application/json headers - do not set charset as it breaks a lot of stuff
-		// only add if no other accept headers was sent.
-		const acceptHeaderExists =
-			axiosConfig.headers === undefined
-				? false
-				: Object.keys(axiosConfig.headers)
-						.map((headerKey) => headerKey.toLowerCase())
-						.includes('accept');
-		if (!acceptHeaderExists) {
-			axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
-				Accept: 'application/json',
-			});
-		}
-	}
-	if (requestObject.json === false || requestObject.json === undefined) {
-		// Prevent json parsing
-		axiosConfig.transformResponse = (res) => res;
-	}
-
-	// Axios will follow redirects by default, so we simply tell it otherwise if needed.
-	const { method } = requestObject;
-	if (
-		(requestObject.followRedirect !== false &&
-			(!method || method === 'GET' || method === 'HEAD')) ||
-		requestObject.followAllRedirects
-	) {
-		axiosConfig.maxRedirects = requestObject.maxRedirects;
-	} else {
-		axiosConfig.maxRedirects = 0;
-	}
-
-	const host = getHostFromRequestObject(requestObject);
-	const agentOptions: AgentOptions = { ...requestObject.agentOptions };
-	if (host) {
-		agentOptions.servername = host;
-	}
-	if (requestObject.rejectUnauthorized === false) {
-		agentOptions.rejectUnauthorized = false;
-		agentOptions.secureOptions = crypto.constants.SSL_OP_LEGACY_SERVER_CONNECT;
-	}
-
-	axiosConfig.httpsAgent = new Agent(agentOptions);
-
-	axiosConfig.beforeRedirect = getBeforeRedirectFn(agentOptions, axiosConfig);
-
-	if (requestObject.timeout !== undefined) {
-		axiosConfig.timeout = requestObject.timeout;
-	}
-
-	if (requestObject.proxy !== undefined) {
-		// try our best to parse the url provided.
-		if (typeof requestObject.proxy === 'string') {
-			try {
-				const url = new URL(requestObject.proxy);
-				const host = url.hostname.startsWith('[') ? url.hostname.slice(1, -1) : url.hostname;
-				axiosConfig.proxy = {
-					host,
-					port: parseInt(url.port, 10),
-					protocol: url.protocol,
-				};
-				if (!url.port) {
-					// Sets port to a default if not informed
-					if (url.protocol === 'http') {
-						axiosConfig.proxy.port = 80;
-					} else if (url.protocol === 'https') {
-						axiosConfig.proxy.port = 443;
-					}
-				}
-				if (url.username || url.password) {
-					axiosConfig.proxy.auth = {
-						username: url.username,
-						password: url.password,
-					};
-				}
-			} catch (error) {
-				// Not a valid URL. We will try to simply parse stuff
-				// such as user:pass@host:port without protocol (we'll assume http)
-				if (requestObject.proxy.includes('@')) {
-					const [userpass, hostport] = requestObject.proxy.split('@');
-					const [username, password] = userpass.split(':');
-					const [hostname, port] = hostport.split(':');
-					const host = hostname.startsWith('[') ? hostname.slice(1, -1) : hostname;
-					axiosConfig.proxy = {
-						host,
-						port: parseInt(port, 10),
-						protocol: 'http',
-						auth: {
-							username,
-							password,
-						},
-					};
-				} else if (requestObject.proxy.includes(':')) {
-					const [hostname, port] = requestObject.proxy.split(':');
-					axiosConfig.proxy = {
-						host: hostname,
-						port: parseInt(port, 10),
-						protocol: 'http',
-					};
-				} else {
-					axiosConfig.proxy = {
-						host: requestObject.proxy,
-						port: 80,
-						protocol: 'http',
-					};
-				}
-			}
-		} else {
-			axiosConfig.proxy = requestObject.proxy;
-		}
-	}
-
-	if (requestObject.useStream) {
-		axiosConfig.responseType = 'stream';
-	} else if (requestObject.encoding === null) {
-		// When downloading files, return an arrayBuffer.
-		axiosConfig.responseType = 'arraybuffer';
-	}
-
-	// If we don't set an accept header
-	// Axios forces "application/json, text/plan, */*"
-	// Which causes some nodes like NextCloud to break
-	// as the service returns XML unless requested otherwise.
-	const allHeaders = axiosConfig.headers ? Object.keys(axiosConfig.headers) : [];
-	if (!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'accept')) {
-		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, { accept: '*/*' });
-	}
-	if (
-		requestObject.json !== false &&
-		axiosConfig.data !== undefined &&
-		axiosConfig.data !== '' &&
-		!(axiosConfig.data instanceof Buffer) &&
-		!allHeaders.some((headerKey) => headerKey.toLowerCase() === 'content-type')
-	) {
-		// Use default header for application/json
-		// If we don't specify this here, axios will add
-		// application/json; charset=utf-8
-		// and this breaks a lot of stuff
-		axiosConfig.headers = Object.assign(axiosConfig.headers || {}, {
-			'content-type': 'application/json',
-		});
-	}
-
-	if (requestObject.simple === false) {
-		axiosConfig.validateStatus = () => true;
-	}
-
-	/**
-	 * Missing properties:
-	 * encoding (need testing)
-	 * gzip (ignored - default already works)
-	 * resolveWithFullResponse (implemented elsewhere)
-	 */
-	return axiosConfig;
-}
-
 function digestAuthAxiosConfig(
 	axiosConfig: AxiosRequestConfig,
 	response: AxiosResponse,
@@ -635,96 +212,6 @@ function digestAuthAxiosConfig(
 	return axiosConfig;
 }
 
-interface IContentType {
-	type: string;
-	parameters: {
-		charset: string;
-		[key: string]: string;
-	};
-}
-
-interface IContentDisposition {
-	type: string;
-	filename?: string;
-}
-
-function parseHeaderParameters(parameters: string[]): Record<string, string> {
-	return parameters.reduce(
-		(acc, param) => {
-			const [key, value] = param.split('=');
-			let decodedValue = decodeURIComponent(value).trim();
-			if (decodedValue.startsWith('"') && decodedValue.endsWith('"')) {
-				decodedValue = decodedValue.slice(1, -1);
-			}
-			acc[key.toLowerCase().trim()] = decodedValue;
-			return acc;
-		},
-		{} as Record<string, string>,
-	);
-}
-
-export function parseContentType(contentType?: string): IContentType | null {
-	if (!contentType) {
-		return null;
-	}
-
-	const [type, ...parameters] = contentType.split(';');
-
-	return {
-		type: type.toLowerCase(),
-		parameters: { charset: 'utf-8', ...parseHeaderParameters(parameters) },
-	};
-}
-
-export function parseContentDisposition(contentDisposition?: string): IContentDisposition | null {
-	if (!contentDisposition) {
-		return null;
-	}
-
-	// This is invalid syntax, but common
-	// Example 'filename="example.png"' (instead of 'attachment; filename="example.png"')
-	if (!contentDisposition.startsWith('attachment') && !contentDisposition.startsWith('inline')) {
-		contentDisposition = `attachment; ${contentDisposition}`;
-	}
-
-	const [type, ...parameters] = contentDisposition.split(';');
-
-	const parsedParameters = parseHeaderParameters(parameters);
-
-	let { filename } = parsedParameters;
-	const wildcard = parsedParameters['filename*'];
-	if (wildcard) {
-		// https://datatracker.ietf.org/doc/html/rfc5987
-		const [_encoding, _locale, content] = wildcard?.split("'") ?? [];
-		filename = content;
-	}
-
-	return { type, filename };
-}
-
-export function parseIncomingMessage(message: IncomingMessage) {
-	const contentType = parseContentType(message.headers['content-type']);
-	if (contentType) {
-		const { type, parameters } = contentType;
-		message.contentType = type;
-		message.encoding = parameters.charset.toLowerCase() as BufferEncoding;
-	}
-
-	const contentDisposition = parseContentDisposition(message.headers['content-disposition']);
-	if (contentDisposition) {
-		message.contentDisposition = contentDisposition;
-	}
-}
-
-export async function binaryToString(body: Buffer | Readable, encoding?: string) {
-	if (!encoding && body instanceof IncomingMessage) {
-		parseIncomingMessage(body);
-		encoding = body.encoding;
-	}
-	const buffer = await binaryToBuffer(body);
-	return iconv.decode(buffer, encoding ?? 'utf-8');
-}
-
 export async function invokeAxios(
 	axiosConfig: AxiosRequestConfig,
 	authOptions: IRequestOptions['auth'] = {},
@@ -745,6 +232,9 @@ export async function invokeAxios(
 	}
 }
 
+/**
+ * @deprecated This is only used by legacy request helpers, that are also deprecated
+ */
 export async function proxyRequestToAxios(
 	workflow: Workflow | undefined,
 	additionalData: IWorkflowExecuteAdditionalData | undefined,
@@ -773,7 +263,7 @@ export async function proxyRequestToAxios(
 		} else if (body === '') {
 			body = axiosConfig.responseType === 'arraybuffer' ? Buffer.alloc(0) : undefined;
 		}
-		await additionalData?.hooks?.executeHookFunctions('nodeFetchedData', [workflow?.id, node]);
+		await additionalData?.hooks?.runHook('nodeFetchedData', [workflow?.id, node]);
 		return configObject.resolveWithFullResponse
 			? {
 					body,
@@ -980,318 +470,6 @@ export async function httpRequest(
 	return result.data;
 }
 
-export function getBinaryPath(binaryDataId: string): string {
-	return Container.get(BinaryDataService).getPath(binaryDataId);
-}
-
-/**
- * Returns binary file metadata
- */
-export async function getBinaryMetadata(binaryDataId: string): Promise<BinaryData.Metadata> {
-	return await Container.get(BinaryDataService).getMetadata(binaryDataId);
-}
-
-/**
- * Returns binary file stream for piping
- */
-export async function getBinaryStream(binaryDataId: string, chunkSize?: number): Promise<Readable> {
-	return await Container.get(BinaryDataService).getAsStream(binaryDataId, chunkSize);
-}
-
-export function assertBinaryData(
-	inputData: ITaskDataConnections,
-	node: INode,
-	itemIndex: number,
-	propertyName: string,
-	inputIndex: number,
-): IBinaryData {
-	const binaryKeyData = inputData.main[inputIndex]![itemIndex].binary;
-	if (binaryKeyData === undefined) {
-		throw new NodeOperationError(
-			node,
-			`This operation expects the node's input data to contain a binary file '${propertyName}', but none was found [item ${itemIndex}]`,
-			{
-				itemIndex,
-				description: 'Make sure that the previous node outputs a binary file',
-			},
-		);
-	}
-
-	const binaryPropertyData = binaryKeyData[propertyName];
-	if (binaryPropertyData === undefined) {
-		throw new NodeOperationError(
-			node,
-			`The item has no binary field '${propertyName}' [item ${itemIndex}]`,
-			{
-				itemIndex,
-				description:
-					'Check that the parameter where you specified the input binary field name is correct, and that it matches a field in the binary input',
-			},
-		);
-	}
-
-	return binaryPropertyData;
-}
-
-/**
- * Returns binary data buffer for given item index and property name.
- */
-export async function getBinaryDataBuffer(
-	inputData: ITaskDataConnections,
-	itemIndex: number,
-	propertyName: string,
-	inputIndex: number,
-): Promise<Buffer> {
-	const binaryData = inputData.main[inputIndex]![itemIndex].binary![propertyName];
-	return await Container.get(BinaryDataService).getAsBuffer(binaryData);
-}
-
-export function detectBinaryEncoding(buffer: Buffer): string {
-	return chardet.detect(buffer) as string;
-}
-
-/**
- * Store an incoming IBinaryData & related buffer using the configured binary data manager.
- *
- * @export
- * @param {IBinaryData} binaryData
- * @param {Buffer | Readable} bufferOrStream
- * @returns {Promise<IBinaryData>}
- */
-export async function setBinaryDataBuffer(
-	binaryData: IBinaryData,
-	bufferOrStream: Buffer | Readable,
-	workflowId: string,
-	executionId: string,
-): Promise<IBinaryData> {
-	return await Container.get(BinaryDataService).store(
-		workflowId,
-		executionId,
-		bufferOrStream,
-		binaryData,
-	);
-}
-
-export async function copyBinaryFile(
-	workflowId: string,
-	executionId: string,
-	filePath: string,
-	fileName: string,
-	mimeType?: string,
-): Promise<IBinaryData> {
-	let fileExtension: string | undefined;
-	if (!mimeType) {
-		// If no mime type is given figure it out
-
-		if (filePath) {
-			// Use file path to guess mime type
-			const mimeTypeLookup = lookup(filePath);
-			if (mimeTypeLookup) {
-				mimeType = mimeTypeLookup;
-			}
-		}
-
-		if (!mimeType) {
-			// read the first bytes of the file to guess mime type
-			const fileTypeData = await FileType.fromFile(filePath);
-			if (fileTypeData) {
-				mimeType = fileTypeData.mime;
-				fileExtension = fileTypeData.ext;
-			}
-		}
-	}
-
-	if (!fileExtension && mimeType) {
-		fileExtension = extension(mimeType) || undefined;
-	}
-
-	if (!mimeType) {
-		// Fall back to text
-		mimeType = 'text/plain';
-	}
-
-	const returnData: IBinaryData = {
-		mimeType,
-		fileType: fileTypeFromMimeType(mimeType),
-		fileExtension,
-		data: '',
-	};
-
-	if (fileName) {
-		returnData.fileName = fileName;
-	} else if (filePath) {
-		returnData.fileName = path.parse(filePath).base;
-	}
-
-	return await Container.get(BinaryDataService).copyBinaryFile(
-		workflowId,
-		executionId,
-		returnData,
-		filePath,
-	);
-}
-
-/**
- * Takes a buffer and converts it into the format n8n uses. It encodes the binary data as
- * base64 and adds metadata.
- */
-// eslint-disable-next-line complexity
-export async function prepareBinaryData(
-	binaryData: Buffer | Readable,
-	executionId: string,
-	workflowId: string,
-	filePath?: string,
-	mimeType?: string,
-): Promise<IBinaryData> {
-	let fileExtension: string | undefined;
-	if (binaryData instanceof IncomingMessage) {
-		if (!filePath) {
-			try {
-				const { responseUrl } = binaryData;
-				filePath =
-					binaryData.contentDisposition?.filename ??
-					((responseUrl && new URL(responseUrl).pathname) ?? binaryData.req?.path)?.slice(1);
-			} catch {}
-		}
-		if (!mimeType) {
-			mimeType = binaryData.contentType;
-		}
-	}
-
-	if (!mimeType) {
-		// If no mime type is given figure it out
-
-		if (filePath) {
-			// Use file path to guess mime type
-			const mimeTypeLookup = lookup(filePath);
-			if (mimeTypeLookup) {
-				mimeType = mimeTypeLookup;
-			}
-		}
-
-		if (!mimeType) {
-			if (Buffer.isBuffer(binaryData)) {
-				// Use buffer to guess mime type
-				const fileTypeData = await FileType.fromBuffer(binaryData);
-				if (fileTypeData) {
-					mimeType = fileTypeData.mime;
-					fileExtension = fileTypeData.ext;
-				}
-			} else if (binaryData instanceof IncomingMessage) {
-				mimeType = binaryData.headers['content-type'];
-			} else {
-				// TODO: detect filetype from other kind of streams
-			}
-		}
-	}
-
-	if (!fileExtension && mimeType) {
-		fileExtension = extension(mimeType) || undefined;
-	}
-
-	if (!mimeType) {
-		// Fall back to text
-		mimeType = 'text/plain';
-	}
-
-	const returnData: IBinaryData = {
-		mimeType,
-		fileType: fileTypeFromMimeType(mimeType),
-		fileExtension,
-		data: '',
-	};
-
-	if (filePath) {
-		if (filePath.includes('?')) {
-			// Remove maybe present query parameters
-			filePath = filePath.split('?').shift();
-		}
-
-		const filePathParts = path.parse(filePath as string);
-
-		if (filePathParts.dir !== '') {
-			returnData.directory = filePathParts.dir;
-		}
-		returnData.fileName = filePathParts.base;
-
-		// Remove the dot
-		const fileExtension = filePathParts.ext.slice(1);
-		if (fileExtension) {
-			returnData.fileExtension = fileExtension;
-		}
-	}
-
-	return await setBinaryDataBuffer(returnData, binaryData, workflowId, executionId);
-}
-
-export async function checkProcessedAndRecord(
-	items: DeduplicationItemTypes[],
-	scope: DeduplicationScope,
-	contextData: ICheckProcessedContextData,
-	options: ICheckProcessedOptions,
-): Promise<IDeduplicationOutput> {
-	return await DataDeduplicationService.getInstance().checkProcessedAndRecord(
-		items,
-		scope,
-		contextData,
-		options,
-	);
-}
-
-export async function checkProcessedItemsAndRecord(
-	key: string,
-	items: IDataObject[],
-	scope: DeduplicationScope,
-	contextData: ICheckProcessedContextData,
-	options: ICheckProcessedOptions,
-): Promise<IDeduplicationOutputItems> {
-	return await DataDeduplicationService.getInstance().checkProcessedItemsAndRecord(
-		key,
-		items,
-		scope,
-		contextData,
-		options,
-	);
-}
-
-export async function removeProcessed(
-	items: DeduplicationItemTypes[],
-	scope: DeduplicationScope,
-	contextData: ICheckProcessedContextData,
-	options: ICheckProcessedOptions,
-): Promise<void> {
-	return await DataDeduplicationService.getInstance().removeProcessed(
-		items,
-		scope,
-		contextData,
-		options,
-	);
-}
-
-export async function clearAllProcessedItems(
-	scope: DeduplicationScope,
-	contextData: ICheckProcessedContextData,
-	options: ICheckProcessedOptions,
-): Promise<void> {
-	return await DataDeduplicationService.getInstance().clearAllProcessedItems(
-		scope,
-		contextData,
-		options,
-	);
-}
-
-export async function getProcessedDataCount(
-	scope: DeduplicationScope,
-	contextData: ICheckProcessedContextData,
-	options: ICheckProcessedOptions,
-): Promise<number> {
-	return await DataDeduplicationService.getInstance().getProcessedDataCount(
-		scope,
-		contextData,
-		options,
-	);
-}
-
 export function applyPaginationRequestData(
 	requestData: IRequestOptions,
 	paginationRequestData: PaginationOptions['request'],
@@ -2341,180 +1519,6 @@ export const getSchedulingFunctions = (workflow: Workflow): SchedulingFunctions
 	};
 };
 
-const getAllowedPaths = () => {
-	const restrictFileAccessTo = process.env[RESTRICT_FILE_ACCESS_TO];
-	if (!restrictFileAccessTo) {
-		return [];
-	}
-	const allowedPaths = restrictFileAccessTo
-		.split(';')
-		.map((path) => path.trim())
-		.filter((path) => path);
-	return allowedPaths;
-};
-
-export function isFilePathBlocked(filePath: string): boolean {
-	const allowedPaths = getAllowedPaths();
-	const resolvedFilePath = path.resolve(filePath);
-	const blockFileAccessToN8nFiles = process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] !== 'false';
-
-	//if allowed paths are defined, allow access only to those paths
-	if (allowedPaths.length) {
-		for (const path of allowedPaths) {
-			if (resolvedFilePath.startsWith(path)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	//restrict access to .n8n folder, ~/.cache/n8n/public, and other .env config related paths
-	if (blockFileAccessToN8nFiles) {
-		const { n8nFolder, staticCacheDir } = Container.get(InstanceSettings);
-		const restrictedPaths = [n8nFolder, staticCacheDir];
-
-		if (process.env[CONFIG_FILES]) {
-			restrictedPaths.push(...process.env[CONFIG_FILES].split(','));
-		}
-
-		if (process.env[CUSTOM_EXTENSION_ENV]) {
-			const customExtensionFolders = process.env[CUSTOM_EXTENSION_ENV].split(';');
-			restrictedPaths.push(...customExtensionFolders);
-		}
-
-		if (process.env[BINARY_DATA_STORAGE_PATH]) {
-			restrictedPaths.push(process.env[BINARY_DATA_STORAGE_PATH]);
-		}
-
-		if (process.env[UM_EMAIL_TEMPLATES_INVITE]) {
-			restrictedPaths.push(process.env[UM_EMAIL_TEMPLATES_INVITE]);
-		}
-
-		if (process.env[UM_EMAIL_TEMPLATES_PWRESET]) {
-			restrictedPaths.push(process.env[UM_EMAIL_TEMPLATES_PWRESET]);
-		}
-
-		//check if the file path is restricted
-		for (const path of restrictedPaths) {
-			if (resolvedFilePath.startsWith(path)) {
-				return true;
-			}
-		}
-	}
-
-	//path is not restricted
-	return false;
-}
-
-export const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions => ({
-	async createReadStream(filePath) {
-		try {
-			await fsAccess(filePath);
-		} catch (error) {
-			throw error.code === 'ENOENT'
-				? new NodeOperationError(node, error, {
-						message: `The file "${String(filePath)}" could not be accessed.`,
-						level: 'warning',
-					})
-				: error;
-		}
-		if (isFilePathBlocked(filePath as string)) {
-			const allowedPaths = getAllowedPaths();
-			const message = allowedPaths.length ? ` Allowed paths: ${allowedPaths.join(', ')}` : '';
-			throw new NodeOperationError(node, `Access to the file is not allowed.${message}`, {
-				level: 'warning',
-			});
-		}
-		return createReadStream(filePath);
-	},
-
-	getStoragePath() {
-		return path.join(Container.get(InstanceSettings).n8nFolder, `storage/${node.type}`);
-	},
-
-	async writeContentToFile(filePath, content, flag) {
-		if (isFilePathBlocked(filePath as string)) {
-			throw new NodeOperationError(node, `The file "${String(filePath)}" is not writable.`, {
-				level: 'warning',
-			});
-		}
-		return await fsWriteFile(filePath, content, { encoding: 'binary', flag });
-	},
-});
-
-export const getNodeHelperFunctions = (
-	{ executionId }: IWorkflowExecuteAdditionalData,
-	workflowId: string,
-): NodeHelperFunctions => ({
-	copyBinaryFile: async (filePath, fileName, mimeType) =>
-		await copyBinaryFile(workflowId, executionId!, filePath, fileName, mimeType),
-});
-
-export const getBinaryHelperFunctions = (
-	{ executionId }: IWorkflowExecuteAdditionalData,
-	workflowId: string,
-): BinaryHelperFunctions => ({
-	getBinaryPath,
-	getBinaryStream,
-	getBinaryMetadata,
-	binaryToBuffer,
-	binaryToString,
-	prepareBinaryData: async (binaryData, filePath, mimeType) =>
-		await prepareBinaryData(binaryData, executionId!, workflowId, filePath, mimeType),
-	setBinaryDataBuffer: async (data, binaryData) =>
-		await setBinaryDataBuffer(data, binaryData, workflowId, executionId!),
-	copyBinaryFile: async () => {
-		throw new ApplicationError('`copyBinaryFile` has been removed. Please upgrade this node.');
-	},
-});
-
-export const getCheckProcessedHelperFunctions = (
-	workflow: Workflow,
-	node: INode,
-): DeduplicationHelperFunctions => ({
-	async checkProcessedAndRecord(
-		items: DeduplicationItemTypes[],
-		scope: DeduplicationScope,
-		options: ICheckProcessedOptions,
-	): Promise<IDeduplicationOutput> {
-		return await checkProcessedAndRecord(items, scope, { node, workflow }, options);
-	},
-	async checkProcessedItemsAndRecord(
-		propertyName: string,
-		items: IDataObject[],
-		scope: DeduplicationScope,
-		options: ICheckProcessedOptions,
-	): Promise<IDeduplicationOutputItems> {
-		return await checkProcessedItemsAndRecord(
-			propertyName,
-			items,
-			scope,
-			{ node, workflow },
-			options,
-		);
-	},
-	async removeProcessed(
-		items: DeduplicationItemTypes[],
-		scope: DeduplicationScope,
-		options: ICheckProcessedOptions,
-	): Promise<void> {
-		return await removeProcessed(items, scope, { node, workflow }, options);
-	},
-	async clearAllProcessedItems(
-		scope: DeduplicationScope,
-		options: ICheckProcessedOptions,
-	): Promise<void> {
-		return await clearAllProcessedItems(scope, { node, workflow }, options);
-	},
-	async getProcessedDataCount(
-		scope: DeduplicationScope,
-		options: ICheckProcessedOptions,
-	): Promise<number> {
-		return await getProcessedDataCount(scope, { node, workflow }, options);
-	},
-});
-
 /**
  * Returns a copy of the items which only contains the json data and
  * of that only the defined properties
@@ -2560,15 +1564,3 @@ export function getExecuteTriggerFunctions(
 ): ITriggerFunctions {
 	return new TriggerContext(workflow, node, additionalData, mode, activation);
 }
-
-export function getCredentialTestFunctions(): ICredentialTestFunctions {
-	return {
-		logger: Container.get(Logger),
-		helpers: {
-			...getSSHTunnelFunctions(),
-			request: async (uriOrObject: string | object, options?: object) => {
-				return await proxyRequestToAxios(undefined, undefined, undefined, uriOrObject, options);
-			},
-		},
-	};
-}
diff --git a/packages/core/src/node-execution-context/helpers/binary-helpers.ts b/packages/core/src/node-execution-context/helpers/binary-helpers.ts
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/core/test/DirectoryLoader.test.ts b/packages/core/src/nodes-loader/__tests__/directory-loader.test.ts
similarity index 95%
rename from packages/core/test/DirectoryLoader.test.ts
rename to packages/core/src/nodes-loader/__tests__/directory-loader.test.ts
index 01a8c8d34a..cb66300257 100644
--- a/packages/core/test/DirectoryLoader.test.ts
+++ b/packages/core/src/nodes-loader/__tests__/directory-loader.test.ts
@@ -22,12 +22,10 @@ jest.mock('fast-glob', () => async (pattern: string) => {
 		: ['dist/Credential1.js'];
 });
 
-import * as classLoader from '@/ClassLoader';
-import {
-	CustomDirectoryLoader,
-	PackageDirectoryLoader,
-	LazyPackageDirectoryLoader,
-} from '@/DirectoryLoader';
+import { CustomDirectoryLoader } from '../custom-directory-loader';
+import { LazyPackageDirectoryLoader } from '../lazy-package-directory-loader';
+import * as classLoader from '../load-class-in-isolation';
+import { PackageDirectoryLoader } from '../package-directory-loader';
 
 describe('DirectoryLoader', () => {
 	const directory = '/not/a/real/path';
@@ -235,10 +233,7 @@ describe('DirectoryLoader', () => {
 					return JSON.stringify({});
 				}
 				if (path.endsWith('types/nodes.json')) {
-					return JSON.stringify([
-						{ name: 'n8n-nodes-testing.node1' },
-						{ name: 'n8n-nodes-testing.node2' },
-					]);
+					return JSON.stringify([{ name: 'node1' }, { name: 'node2' }]);
 				}
 				if (path.endsWith('types/credentials.json')) {
 					return JSON.stringify([]);
@@ -254,7 +249,7 @@ describe('DirectoryLoader', () => {
 				node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
 			});
 			expect(loader.types.nodes).toHaveLength(1);
-			expect(loader.types.nodes[0].name).toBe('n8n-nodes-testing.node1');
+			expect(loader.types.nodes[0].name).toBe('node1');
 			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
 		});
 
@@ -274,10 +269,7 @@ describe('DirectoryLoader', () => {
 					return JSON.stringify({});
 				}
 				if (path.endsWith('types/nodes.json')) {
-					return JSON.stringify([
-						{ name: 'n8n-nodes-testing.node1' },
-						{ name: 'n8n-nodes-testing.node2' },
-					]);
+					return JSON.stringify([{ name: 'node1' }, { name: 'node2' }]);
 				}
 				if (path.endsWith('types/credentials.json')) {
 					return JSON.stringify([]);
@@ -314,10 +306,7 @@ describe('DirectoryLoader', () => {
 					return JSON.stringify({});
 				}
 				if (path.endsWith('types/nodes.json')) {
-					return JSON.stringify([
-						{ name: 'n8n-nodes-testing.node1' },
-						{ name: 'n8n-nodes-testing.node2' },
-					]);
+					return JSON.stringify([{ name: 'node1' }, { name: 'node2' }]);
 				}
 				if (path.endsWith('types/credentials.json')) {
 					return JSON.stringify([]);
@@ -333,7 +322,7 @@ describe('DirectoryLoader', () => {
 				node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
 			});
 			expect(loader.types.nodes).toHaveLength(1);
-			expect(loader.types.nodes[0].name).toBe('n8n-nodes-testing.node2');
+			expect(loader.types.nodes[0].name).toBe('node2');
 			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
 		});
 	});
@@ -654,18 +643,6 @@ describe('DirectoryLoader', () => {
 			expect(nodeWithIcon.description.icon).toBeUndefined();
 		});
 
-		it('should skip node if included in excludeNodes', () => {
-			const loader = new CustomDirectoryLoader(directory, ['CUSTOM.node1']);
-			const filePath = 'dist/Node1/Node1.node.js';
-
-			loader.loadNodeFromFile(filePath);
-
-			expect(loader.nodeTypes).toEqual({});
-			expect(loader.known.nodes).toEqual({});
-			expect(loader.types.nodes).toEqual([]);
-			expect(loader.loadedNodes).toEqual([]);
-		});
-
 		it('should skip node if not in includeNodes', () => {
 			const loader = new CustomDirectoryLoader(directory, [], ['CUSTOM.other']);
 			const filePath = 'dist/Node1/Node1.node.js';
diff --git a/packages/core/test/ClassLoader.test.ts b/packages/core/src/nodes-loader/__tests__/load-class-in-isolation.test.ts
similarity index 93%
rename from packages/core/test/ClassLoader.test.ts
rename to packages/core/src/nodes-loader/__tests__/load-class-in-isolation.test.ts
index 9527572662..656830fa87 100644
--- a/packages/core/test/ClassLoader.test.ts
+++ b/packages/core/src/nodes-loader/__tests__/load-class-in-isolation.test.ts
@@ -1,8 +1,8 @@
 import vm from 'vm';
 
-import { loadClassInIsolation } from '@/ClassLoader';
+import { loadClassInIsolation } from '../load-class-in-isolation';
 
-describe('ClassLoader', () => {
+describe('loadClassInIsolation', () => {
 	const filePath = '/path/to/TestClass.js';
 	const className = 'TestClass';
 
diff --git a/packages/core/src/nodes-loader/constants.ts b/packages/core/src/nodes-loader/constants.ts
new file mode 100644
index 0000000000..171be0352b
--- /dev/null
+++ b/packages/core/src/nodes-loader/constants.ts
@@ -0,0 +1,31 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { cronNodeOptions } from 'n8n-workflow';
+
+export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
+
+export const commonPollingParameters: INodeProperties[] = [
+	{
+		displayName: 'Poll Times',
+		name: 'pollTimes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Poll Time',
+		},
+		default: { item: [{ mode: 'everyMinute' }] },
+		description: 'Time at which polling should occur',
+		placeholder: 'Add Poll Time',
+		options: cronNodeOptions,
+	},
+];
+
+export const commonCORSParameters: INodeProperties[] = [
+	{
+		displayName: 'Allowed Origins (CORS)',
+		name: 'allowedOrigins',
+		type: 'string',
+		default: '*',
+		description:
+			'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
+	},
+];
diff --git a/packages/core/src/nodes-loader/custom-directory-loader.ts b/packages/core/src/nodes-loader/custom-directory-loader.ts
new file mode 100644
index 0000000000..8e84440608
--- /dev/null
+++ b/packages/core/src/nodes-loader/custom-directory-loader.ts
@@ -0,0 +1,31 @@
+import glob from 'fast-glob';
+
+import { DirectoryLoader } from './directory-loader';
+
+/**
+ * Loader for source files of nodes and credentials located in a custom dir,
+ * e.g. `~/.n8n/custom`
+ */
+export class CustomDirectoryLoader extends DirectoryLoader {
+	packageName = 'CUSTOM';
+
+	override async loadAll() {
+		const nodes = await glob('**/*.node.js', {
+			cwd: this.directory,
+			absolute: true,
+		});
+
+		for (const nodePath of nodes) {
+			this.loadNodeFromFile(nodePath);
+		}
+
+		const credentials = await glob('**/*.credentials.js', {
+			cwd: this.directory,
+			absolute: true,
+		});
+
+		for (const credentialPath of credentials) {
+			this.loadCredentialFromFile(credentialPath);
+		}
+	}
+}
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/nodes-loader/directory-loader.ts
similarity index 66%
rename from packages/core/src/DirectoryLoader.ts
rename to packages/core/src/nodes-loader/directory-loader.ts
index 26dace0fd1..094aa8d1e0 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/nodes-loader/directory-loader.ts
@@ -1,5 +1,4 @@
 import { Container } from '@n8n/di';
-import glob from 'fast-glob';
 import uniqBy from 'lodash/uniqBy';
 import type {
 	CodexData,
@@ -16,18 +15,15 @@ import type {
 	IVersionedNodeType,
 	KnownNodesAndCredentials,
 } from 'n8n-workflow';
-import { ApplicationError, applyDeclarativeNodeOptionParameters, jsonParse } from 'n8n-workflow';
-import { readFileSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
+import { ApplicationError, applyDeclarativeNodeOptionParameters } from 'n8n-workflow';
 import * as path from 'path';
 
+import { UnrecognizedCredentialTypeError } from '@/errors/unrecognized-credential-type.error';
+import { UnrecognizedNodeTypeError } from '@/errors/unrecognized-node-type.error';
 import { Logger } from '@/logging/logger';
 
-import { loadClassInIsolation } from './ClassLoader';
-import { commonCORSParameters, commonPollingParameters, CUSTOM_NODES_CATEGORY } from './Constants';
-import { UnrecognizedCredentialTypeError } from './errors/unrecognized-credential-type.error';
-import { UnrecognizedNodeTypeError } from './errors/unrecognized-node-type.error';
-import type { n8n } from './Interfaces';
+import { commonCORSParameters, commonPollingParameters, CUSTOM_NODES_CATEGORY } from './constants';
+import { loadClassInIsolation } from './load-class-in-isolation';
 
 function toJSON(this: ICredentialType) {
 	return {
@@ -80,8 +76,8 @@ export abstract class DirectoryLoader {
 
 	constructor(
 		readonly directory: string,
-		protected readonly excludeNodes: string[] = [],
-		protected readonly includeNodes: string[] = [],
+		protected excludeNodes: string[] = [],
+		protected includeNodes: string[] = [],
 	) {}
 
 	abstract packageName: string;
@@ -121,13 +117,12 @@ export abstract class DirectoryLoader {
 		this.addCodex(tempNode, filePath);
 
 		const nodeType = tempNode.description.name;
-		const fullNodeType = `${this.packageName}.${nodeType}`;
 
-		if (this.includeNodes.length && !this.includeNodes.includes(fullNodeType)) {
+		if (this.includeNodes.length && !this.includeNodes.includes(nodeType)) {
 			return;
 		}
 
-		if (this.excludeNodes.includes(fullNodeType)) {
+		if (this.excludeNodes.includes(nodeType)) {
 			return;
 		}
 
@@ -151,7 +146,7 @@ export abstract class DirectoryLoader {
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
 				throw new ApplicationError(
 					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead.',
-					{ extra: { nodeType: fullNodeType } },
+					{ extra: { nodeType } },
 				);
 			}
 		} else {
@@ -396,171 +391,3 @@ export abstract class DirectoryLoader {
 		}
 	}
 }
-
-/**
- * Loader for source files of nodes and credentials located in a custom dir,
- * e.g. `~/.n8n/custom`
- */
-export class CustomDirectoryLoader extends DirectoryLoader {
-	packageName = 'CUSTOM';
-
-	override async loadAll() {
-		const nodes = await glob('**/*.node.js', {
-			cwd: this.directory,
-			absolute: true,
-		});
-
-		for (const nodePath of nodes) {
-			this.loadNodeFromFile(nodePath);
-		}
-
-		const credentials = await glob('**/*.credentials.js', {
-			cwd: this.directory,
-			absolute: true,
-		});
-
-		for (const credentialPath of credentials) {
-			this.loadCredentialFromFile(credentialPath);
-		}
-	}
-}
-
-/**
- * Loader for source files of nodes and credentials located in a package dir,
- * e.g. /nodes-base or community packages.
- */
-export class PackageDirectoryLoader extends DirectoryLoader {
-	packageJson: n8n.PackageJson = this.readJSONSync('package.json');
-
-	packageName = this.packageJson.name;
-
-	override async loadAll() {
-		const { n8n } = this.packageJson;
-		if (!n8n) return;
-
-		const { nodes, credentials } = n8n;
-
-		if (Array.isArray(nodes)) {
-			for (const nodePath of nodes) {
-				this.loadNodeFromFile(nodePath);
-			}
-		}
-
-		if (Array.isArray(credentials)) {
-			for (const credentialPath of credentials) {
-				this.loadCredentialFromFile(credentialPath);
-			}
-		}
-
-		this.inferSupportedNodes();
-
-		this.logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
-			credentials: credentials?.length ?? 0,
-			nodes: nodes?.length ?? 0,
-		});
-	}
-
-	private inferSupportedNodes() {
-		const knownCredentials = this.known.credentials;
-		for (const { type: credentialType } of Object.values(this.credentialTypes)) {
-			const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
-			if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
-				credentialType.httpRequestNode.hidden = true;
-			}
-
-			credentialType.supportedNodes = supportedNodes;
-
-			if (!credentialType.iconUrl && !credentialType.icon) {
-				for (const supportedNode of supportedNodes) {
-					const nodeDescription = this.nodeTypes[supportedNode]?.type.description;
-
-					if (!nodeDescription) continue;
-					if (nodeDescription.icon) {
-						credentialType.icon = nodeDescription.icon;
-						credentialType.iconColor = nodeDescription.iconColor;
-						break;
-					}
-					if (nodeDescription.iconUrl) {
-						credentialType.iconUrl = nodeDescription.iconUrl;
-						break;
-					}
-				}
-			}
-		}
-	}
-
-	private parseJSON<T>(fileString: string, filePath: string): T {
-		try {
-			return jsonParse<T>(fileString);
-		} catch (error) {
-			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
-		}
-	}
-
-	protected readJSONSync<T>(file: string): T {
-		const filePath = this.resolvePath(file);
-		const fileString = readFileSync(filePath, 'utf8');
-		return this.parseJSON<T>(fileString, filePath);
-	}
-
-	protected async readJSON<T>(file: string): Promise<T> {
-		const filePath = this.resolvePath(file);
-		const fileString = await readFile(filePath, 'utf8');
-		return this.parseJSON<T>(fileString, filePath);
-	}
-}
-
-/**
- * This loader extends PackageDirectoryLoader to load node and credentials lazily, if possible
- */
-export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
-	override async loadAll() {
-		try {
-			this.known.nodes = await this.readJSON('dist/known/nodes.json');
-			this.known.credentials = await this.readJSON('dist/known/credentials.json');
-
-			this.types.nodes = await this.readJSON('dist/types/nodes.json');
-			this.types.credentials = await this.readJSON('dist/types/credentials.json');
-
-			if (this.includeNodes.length) {
-				const allowedNodes: typeof this.known.nodes = {};
-				for (const fullNodeType of this.includeNodes) {
-					const [packageName, nodeType] = fullNodeType.split('.');
-					if (packageName === this.packageName && nodeType in this.known.nodes) {
-						allowedNodes[nodeType] = this.known.nodes[nodeType];
-					}
-				}
-				this.known.nodes = allowedNodes;
-
-				this.types.nodes = this.types.nodes.filter((nodeType) =>
-					this.includeNodes.includes(nodeType.name),
-				);
-			}
-
-			if (this.excludeNodes.length) {
-				for (const fullNodeType of this.excludeNodes) {
-					const [packageName, nodeType] = fullNodeType.split('.');
-					if (packageName === this.packageName) {
-						delete this.known.nodes[nodeType];
-					}
-				}
-
-				this.types.nodes = this.types.nodes.filter(
-					(nodeType) => !this.excludeNodes.includes(nodeType.name),
-				);
-			}
-
-			this.logger.debug(`Lazy-loading nodes and credentials from ${this.packageJson.name}`, {
-				nodes: this.types.nodes?.length ?? 0,
-				credentials: this.types.credentials?.length ?? 0,
-			});
-
-			this.isLazyLoaded = true;
-
-			return; // We can load nodes and credentials lazily now
-		} catch {
-			this.logger.debug("Can't enable lazy-loading");
-			await super.loadAll();
-		}
-	}
-}
diff --git a/packages/core/src/nodes-loader/index.ts b/packages/core/src/nodes-loader/index.ts
new file mode 100644
index 0000000000..f8fedca5be
--- /dev/null
+++ b/packages/core/src/nodes-loader/index.ts
@@ -0,0 +1,5 @@
+export { DirectoryLoader, type Types } from './directory-loader';
+export { CustomDirectoryLoader } from './custom-directory-loader';
+export { PackageDirectoryLoader } from './package-directory-loader';
+export { LazyPackageDirectoryLoader } from './lazy-package-directory-loader';
+export type { n8n } from './types';
diff --git a/packages/core/src/nodes-loader/lazy-package-directory-loader.ts b/packages/core/src/nodes-loader/lazy-package-directory-loader.ts
new file mode 100644
index 0000000000..5da6084e1a
--- /dev/null
+++ b/packages/core/src/nodes-loader/lazy-package-directory-loader.ts
@@ -0,0 +1,52 @@
+import { PackageDirectoryLoader } from './package-directory-loader';
+
+/**
+ * This loader extends PackageDirectoryLoader to load node and credentials lazily, if possible
+ */
+export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
+	override async loadAll() {
+		try {
+			this.known.nodes = await this.readJSON('dist/known/nodes.json');
+			this.known.credentials = await this.readJSON('dist/known/credentials.json');
+
+			this.types.nodes = await this.readJSON('dist/types/nodes.json');
+			this.types.credentials = await this.readJSON('dist/types/credentials.json');
+
+			if (this.includeNodes.length) {
+				const allowedNodes: typeof this.known.nodes = {};
+				for (const nodeType of this.includeNodes) {
+					if (nodeType in this.known.nodes) {
+						allowedNodes[nodeType] = this.known.nodes[nodeType];
+					}
+				}
+				this.known.nodes = allowedNodes;
+
+				this.types.nodes = this.types.nodes.filter((nodeType) =>
+					this.includeNodes.includes(nodeType.name),
+				);
+			}
+
+			if (this.excludeNodes.length) {
+				for (const nodeType of this.excludeNodes) {
+					delete this.known.nodes[nodeType];
+				}
+
+				this.types.nodes = this.types.nodes.filter(
+					(nodeType) => !this.excludeNodes.includes(nodeType.name),
+				);
+			}
+
+			this.logger.debug(`Lazy-loading nodes and credentials from ${this.packageJson.name}`, {
+				nodes: this.types.nodes?.length ?? 0,
+				credentials: this.types.credentials?.length ?? 0,
+			});
+
+			this.isLazyLoaded = true;
+
+			return; // We can load nodes and credentials lazily now
+		} catch {
+			this.logger.debug("Can't enable lazy-loading");
+			await super.loadAll();
+		}
+	}
+}
diff --git a/packages/core/src/ClassLoader.ts b/packages/core/src/nodes-loader/load-class-in-isolation.ts
similarity index 100%
rename from packages/core/src/ClassLoader.ts
rename to packages/core/src/nodes-loader/load-class-in-isolation.ts
diff --git a/packages/core/src/nodes-loader/package-directory-loader.ts b/packages/core/src/nodes-loader/package-directory-loader.ts
new file mode 100644
index 0000000000..4c46a684ec
--- /dev/null
+++ b/packages/core/src/nodes-loader/package-directory-loader.ts
@@ -0,0 +1,107 @@
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { readFileSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+
+import { DirectoryLoader } from './directory-loader';
+import type { n8n } from './types';
+
+/**
+ * Loader for source files of nodes and credentials located in a package dir,
+ * e.g. /nodes-base or community packages.
+ */
+export class PackageDirectoryLoader extends DirectoryLoader {
+	packageJson: n8n.PackageJson;
+
+	packageName: string;
+
+	constructor(directory: string, excludeNodes: string[] = [], includeNodes: string[] = []) {
+		super(directory, excludeNodes, includeNodes);
+
+		this.packageJson = this.readJSONSync('package.json');
+		this.packageName = this.packageJson.name;
+		this.excludeNodes = this.extractNodeTypes(excludeNodes);
+		this.includeNodes = this.extractNodeTypes(includeNodes);
+	}
+
+	private extractNodeTypes(fullNodeTypes: string[]) {
+		return fullNodeTypes
+			.map((fullNodeType) => fullNodeType.split('.'))
+			.filter(([packageName]) => packageName === this.packageName)
+			.map(([_, nodeType]) => nodeType);
+	}
+
+	override async loadAll() {
+		const { n8n } = this.packageJson;
+		if (!n8n) return;
+
+		const { nodes, credentials } = n8n;
+
+		if (Array.isArray(nodes)) {
+			for (const nodePath of nodes) {
+				this.loadNodeFromFile(nodePath);
+			}
+		}
+
+		if (Array.isArray(credentials)) {
+			for (const credentialPath of credentials) {
+				this.loadCredentialFromFile(credentialPath);
+			}
+		}
+
+		this.inferSupportedNodes();
+
+		this.logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
+			credentials: credentials?.length ?? 0,
+			nodes: nodes?.length ?? 0,
+		});
+	}
+
+	private inferSupportedNodes() {
+		const knownCredentials = this.known.credentials;
+		for (const { type: credentialType } of Object.values(this.credentialTypes)) {
+			const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
+			if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
+				credentialType.httpRequestNode.hidden = true;
+			}
+
+			credentialType.supportedNodes = supportedNodes;
+
+			if (!credentialType.iconUrl && !credentialType.icon) {
+				for (const supportedNode of supportedNodes) {
+					const nodeDescription = this.nodeTypes[supportedNode]?.type.description;
+
+					if (!nodeDescription) continue;
+					if (nodeDescription.icon) {
+						credentialType.icon = nodeDescription.icon;
+						credentialType.iconColor = nodeDescription.iconColor;
+						break;
+					}
+					if (nodeDescription.iconUrl) {
+						credentialType.iconUrl = nodeDescription.iconUrl;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	private parseJSON<T>(fileString: string, filePath: string): T {
+		try {
+			return jsonParse<T>(fileString);
+		} catch (error) {
+			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
+		}
+	}
+
+	protected readJSONSync<T>(file: string): T {
+		const filePath = this.resolvePath(file);
+		const fileString = readFileSync(filePath, 'utf8');
+		return this.parseJSON<T>(fileString, filePath);
+	}
+
+	protected async readJSON<T>(file: string): Promise<T> {
+		const filePath = this.resolvePath(file);
+		const fileString = await readFile(filePath, 'utf8');
+		return this.parseJSON<T>(fileString, filePath);
+	}
+}
diff --git a/packages/core/src/nodes-loader/types.ts b/packages/core/src/nodes-loader/types.ts
new file mode 100644
index 0000000000..e898c44b2d
--- /dev/null
+++ b/packages/core/src/nodes-loader/types.ts
@@ -0,0 +1,14 @@
+export namespace n8n {
+	export interface PackageJson {
+		name: string;
+		version: string;
+		n8n?: {
+			credentials?: string[];
+			nodes?: string[];
+		};
+		author?: {
+			name?: string;
+			email?: string;
+		};
+	}
+}
diff --git a/packages/core/src/__tests__/utils.test.ts b/packages/core/src/utils/__tests__/is-object-literal.test.ts
similarity index 95%
rename from packages/core/src/__tests__/utils.test.ts
rename to packages/core/src/utils/__tests__/is-object-literal.test.ts
index a8532ed589..f6c3cfddd0 100644
--- a/packages/core/src/__tests__/utils.test.ts
+++ b/packages/core/src/utils/__tests__/is-object-literal.test.ts
@@ -1,4 +1,4 @@
-import { isObjectLiteral } from '@/utils';
+import { isObjectLiteral } from '../is-object-literal';
 
 describe('isObjectLiteral', () => {
 	test.each([
diff --git a/packages/core/test/SerializedBuffer.test.ts b/packages/core/src/utils/__tests__/serialized-buffer.test.ts
similarity index 92%
rename from packages/core/test/SerializedBuffer.test.ts
rename to packages/core/src/utils/__tests__/serialized-buffer.test.ts
index 95d7213401..19b7df496d 100644
--- a/packages/core/test/SerializedBuffer.test.ts
+++ b/packages/core/src/utils/__tests__/serialized-buffer.test.ts
@@ -1,5 +1,5 @@
-import type { SerializedBuffer } from '@/SerializedBuffer';
-import { toBuffer, isSerializedBuffer } from '@/SerializedBuffer';
+import type { SerializedBuffer } from '../serialized-buffer';
+import { toBuffer, isSerializedBuffer } from '../serialized-buffer';
 
 // Mock data for tests
 const validSerializedBuffer: SerializedBuffer = {
diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
new file mode 100644
index 0000000000..4973c13417
--- /dev/null
+++ b/packages/core/src/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './serialized-buffer';
+export { isObjectLiteral } from './is-object-literal';
diff --git a/packages/core/src/utils.ts b/packages/core/src/utils/is-object-literal.ts
similarity index 100%
rename from packages/core/src/utils.ts
rename to packages/core/src/utils/is-object-literal.ts
diff --git a/packages/core/src/SerializedBuffer.ts b/packages/core/src/utils/serialized-buffer.ts
similarity index 91%
rename from packages/core/src/SerializedBuffer.ts
rename to packages/core/src/utils/serialized-buffer.ts
index d6ea874c7a..e98e1a0883 100644
--- a/packages/core/src/SerializedBuffer.ts
+++ b/packages/core/src/utils/serialized-buffer.ts
@@ -1,4 +1,4 @@
-import { isObjectLiteral } from '@/utils';
+import { isObjectLiteral } from './is-object-literal';
 
 /** A nodejs Buffer gone through JSON.stringify */
 export type SerializedBuffer = {
diff --git a/packages/core/test/Credentials.test.ts b/packages/core/test/Credentials.test.ts
deleted file mode 100644
index bf6ba29ca5..0000000000
--- a/packages/core/test/Credentials.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import { Container } from '@n8n/di';
-import { mock } from 'jest-mock-extended';
-import type { CredentialInformation } from 'n8n-workflow';
-
-import { Cipher } from '@/Cipher';
-import { Credentials } from '@/Credentials';
-import type { InstanceSettings } from '@/InstanceSettings';
-
-describe('Credentials', () => {
-	const cipher = new Cipher(mock<InstanceSettings>({ encryptionKey: 'password' }));
-	Container.set(Cipher, cipher);
-
-	const setDataKey = (credentials: Credentials, key: string, data: CredentialInformation) => {
-		let fullData;
-		try {
-			fullData = credentials.getData();
-		} catch (e) {
-			fullData = {};
-		}
-		fullData[key] = data;
-		return credentials.setData(fullData);
-	};
-
-	describe('without nodeType set', () => {
-		test('should be able to set and read key data without initial data set', () => {
-			const credentials = new Credentials({ id: null, name: 'testName' }, 'testType');
-
-			const key = 'key1';
-			const newData = 1234;
-
-			setDataKey(credentials, key, newData);
-
-			expect(credentials.getData()[key]).toEqual(newData);
-		});
-
-		test('should be able to set and read key data with initial data set', () => {
-			const key = 'key2';
-
-			// Saved under "key1"
-			const initialData = 4321;
-			const initialDataEncoded = 'U2FsdGVkX1+0baznXt+Ag/ub8A2kHLyoLxn/rR9h4XQ=';
-
-			const credentials = new Credentials(
-				{ id: null, name: 'testName' },
-				'testType',
-				initialDataEncoded,
-			);
-
-			const newData = 1234;
-
-			// Set and read new data
-			setDataKey(credentials, key, newData);
-			expect(credentials.getData()[key]).toEqual(newData);
-
-			// Read the data which got provided encrypted on init
-			expect(credentials.getData().key1).toEqual(initialData);
-		});
-	});
-});
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/test/NodeExecuteFunctions.test.ts
deleted file mode 100644
index 703e3f9bef..0000000000
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ /dev/null
@@ -1,932 +0,0 @@
-import { Container } from '@n8n/di';
-import FormData from 'form-data';
-import { mkdtempSync, readFileSync } from 'fs';
-import { IncomingMessage } from 'http';
-import type { Agent } from 'https';
-import { mock } from 'jest-mock-extended';
-import type {
-	IBinaryData,
-	IHttpRequestMethods,
-	IHttpRequestOptions,
-	INode,
-	IRequestOptions,
-	ITaskDataConnections,
-	IWorkflowExecuteAdditionalData,
-	Workflow,
-	WorkflowHooks,
-} from 'n8n-workflow';
-import nock from 'nock';
-import { tmpdir } from 'os';
-import { join } from 'path';
-import { Readable } from 'stream';
-import type { SecureContextOptions } from 'tls';
-
-import { BinaryDataService } from '@/BinaryData/BinaryData.service';
-import { InstanceSettings } from '@/InstanceSettings';
-import {
-	binaryToString,
-	copyInputItems,
-	getBinaryDataBuffer,
-	invokeAxios,
-	isFilePathBlocked,
-	parseContentDisposition,
-	parseContentType,
-	parseIncomingMessage,
-	parseRequestObject,
-	proxyRequestToAxios,
-	removeEmptyBody,
-	setBinaryDataBuffer,
-} from '@/NodeExecuteFunctions';
-
-const temporaryDir = mkdtempSync(join(tmpdir(), 'n8n'));
-
-describe('NodeExecuteFunctions', () => {
-	describe('test binary data helper methods', () => {
-		test("test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'default' mode", async () => {
-			// Setup a 'default' binary data manager instance
-			Container.set(BinaryDataService, new BinaryDataService());
-
-			await Container.get(BinaryDataService).init({
-				mode: 'default',
-				availableModes: ['default'],
-				localStoragePath: temporaryDir,
-			});
-
-			// Set our binary data buffer
-			const inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
-			const setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
-				{
-					mimeType: 'txt',
-					data: 'This should be overwritten by the actual payload in the response',
-				},
-				inputData,
-				'workflowId',
-				'executionId',
-			);
-
-			// Expect our return object to contain the base64 encoding of the input data, as it should be stored in memory.
-			expect(setBinaryDataBufferResponse.data).toEqual(inputData.toString('base64'));
-
-			// Now, re-fetch our data.
-			// An ITaskDataConnections object is used to share data between nodes. The top level property, 'main', represents the successful output object from a previous node.
-			const taskDataConnectionsInput: ITaskDataConnections = {
-				main: [],
-			};
-
-			// We add an input set, with one item at index 0, to this input. It contains an empty json payload and our binary data.
-			taskDataConnectionsInput.main.push([
-				{
-					json: {},
-					binary: {
-						data: setBinaryDataBufferResponse,
-					},
-				},
-			]);
-
-			// Now, lets fetch our data! The item will be item index 0.
-			const getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
-				taskDataConnectionsInput,
-				0,
-				'data',
-				0,
-			);
-
-			expect(getBinaryDataBufferResponse).toEqual(inputData);
-		});
-
-		test("test getBinaryDataBuffer(...) & setBinaryDataBuffer(...) methods in 'filesystem' mode", async () => {
-			Container.set(BinaryDataService, new BinaryDataService());
-
-			// Setup a 'filesystem' binary data manager instance
-			await Container.get(BinaryDataService).init({
-				mode: 'filesystem',
-				availableModes: ['filesystem'],
-				localStoragePath: temporaryDir,
-			});
-
-			// Set our binary data buffer
-			const inputData: Buffer = Buffer.from('This is some binary data', 'utf8');
-			const setBinaryDataBufferResponse: IBinaryData = await setBinaryDataBuffer(
-				{
-					mimeType: 'txt',
-					data: 'This should be overwritten with the name of the configured data manager',
-				},
-				inputData,
-				'workflowId',
-				'executionId',
-			);
-
-			// Expect our return object to contain the name of the configured data manager.
-			expect(setBinaryDataBufferResponse.data).toEqual('filesystem-v2');
-
-			// Ensure that the input data was successfully persisted to disk.
-			expect(
-				readFileSync(
-					`${temporaryDir}/${setBinaryDataBufferResponse.id?.replace('filesystem-v2:', '')}`,
-				),
-			).toEqual(inputData);
-
-			// Now, re-fetch our data.
-			// An ITaskDataConnections object is used to share data between nodes. The top level property, 'main', represents the successful output object from a previous node.
-			const taskDataConnectionsInput: ITaskDataConnections = {
-				main: [],
-			};
-
-			// We add an input set, with one item at index 0, to this input. It contains an empty json payload and our binary data.
-			taskDataConnectionsInput.main.push([
-				{
-					json: {},
-					binary: {
-						data: setBinaryDataBufferResponse,
-					},
-				},
-			]);
-
-			// Now, lets fetch our data! The item will be item index 0.
-			const getBinaryDataBufferResponse: Buffer = await getBinaryDataBuffer(
-				taskDataConnectionsInput,
-				0,
-				'data',
-				0,
-			);
-
-			expect(getBinaryDataBufferResponse).toEqual(inputData);
-		});
-	});
-
-	describe('parseContentType', () => {
-		const testCases = [
-			{
-				input: 'text/plain',
-				expected: {
-					type: 'text/plain',
-					parameters: {
-						charset: 'utf-8',
-					},
-				},
-				description: 'should parse basic content type',
-			},
-			{
-				input: 'TEXT/PLAIN',
-				expected: {
-					type: 'text/plain',
-					parameters: {
-						charset: 'utf-8',
-					},
-				},
-				description: 'should convert type to lowercase',
-			},
-			{
-				input: 'text/html; charset=iso-8859-1',
-				expected: {
-					type: 'text/html',
-					parameters: {
-						charset: 'iso-8859-1',
-					},
-				},
-				description: 'should parse content type with charset',
-			},
-			{
-				input: 'application/json; charset=utf-8; boundary=---123',
-				expected: {
-					type: 'application/json',
-					parameters: {
-						charset: 'utf-8',
-						boundary: '---123',
-					},
-				},
-				description: 'should parse content type with multiple parameters',
-			},
-			{
-				input: 'text/plain; charset="utf-8"; filename="test.txt"',
-				expected: {
-					type: 'text/plain',
-					parameters: {
-						charset: 'utf-8',
-						filename: 'test.txt',
-					},
-				},
-				description: 'should handle quoted parameter values',
-			},
-			{
-				input: 'text/plain; filename=%22test%20file.txt%22',
-				expected: {
-					type: 'text/plain',
-					parameters: {
-						charset: 'utf-8',
-						filename: 'test file.txt',
-					},
-				},
-				description: 'should handle encoded parameter values',
-			},
-			{
-				input: undefined,
-				expected: null,
-				description: 'should return null for undefined input',
-			},
-			{
-				input: '',
-				expected: null,
-				description: 'should return null for empty string',
-			},
-		];
-
-		test.each(testCases)('$description', ({ input, expected }) => {
-			expect(parseContentType(input)).toEqual(expected);
-		});
-	});
-
-	describe('parseContentDisposition', () => {
-		const testCases = [
-			{
-				input: 'attachment; filename="file.txt"',
-				expected: { type: 'attachment', filename: 'file.txt' },
-				description: 'should parse basic content disposition',
-			},
-			{
-				input: 'attachment; filename=file.txt',
-				expected: { type: 'attachment', filename: 'file.txt' },
-				description: 'should parse filename without quotes',
-			},
-			{
-				input: 'inline; filename="image.jpg"',
-				expected: { type: 'inline', filename: 'image.jpg' },
-				description: 'should parse inline disposition',
-			},
-			{
-				input: 'attachment; filename="my file.pdf"',
-				expected: { type: 'attachment', filename: 'my file.pdf' },
-				description: 'should parse filename with spaces',
-			},
-			{
-				input: "attachment; filename*=UTF-8''my%20file.txt",
-				expected: { type: 'attachment', filename: 'my file.txt' },
-				description: 'should parse filename* parameter (RFC 5987)',
-			},
-			{
-				input: 'filename="test.txt"',
-				expected: { type: 'attachment', filename: 'test.txt' },
-				description: 'should handle invalid syntax but with filename',
-			},
-			{
-				input: 'filename=test.txt',
-				expected: { type: 'attachment', filename: 'test.txt' },
-				description: 'should handle invalid syntax with only filename parameter',
-			},
-			{
-				input: undefined,
-				expected: null,
-				description: 'should return null for undefined input',
-			},
-			{
-				input: '',
-				expected: null,
-				description: 'should return null for empty string',
-			},
-			{
-				input: 'attachment; filename="%F0%9F%98%80.txt"',
-				expected: { type: 'attachment', filename: '😀.txt' },
-				description: 'should handle encoded filenames',
-			},
-			{
-				input: 'attachment; size=123; filename="test.txt"; creation-date="Thu, 1 Jan 2020"',
-				expected: { type: 'attachment', filename: 'test.txt' },
-				description: 'should handle multiple parameters',
-			},
-		];
-
-		test.each(testCases)('$description', ({ input, expected }) => {
-			expect(parseContentDisposition(input)).toEqual(expected);
-		});
-	});
-
-	describe('parseIncomingMessage', () => {
-		it('parses valid content-type header', () => {
-			const message = mock<IncomingMessage>({
-				headers: { 'content-type': 'application/json', 'content-disposition': undefined },
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentType).toEqual('application/json');
-		});
-
-		it('parses valid content-type header with parameters', () => {
-			const message = mock<IncomingMessage>({
-				headers: {
-					'content-type': 'application/json; charset=utf-8',
-					'content-disposition': undefined,
-				},
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentType).toEqual('application/json');
-			expect(message.encoding).toEqual('utf-8');
-		});
-
-		it('parses valid content-type header with encoding wrapped in quotes', () => {
-			const message = mock<IncomingMessage>({
-				headers: {
-					'content-type': 'application/json; charset="utf-8"',
-					'content-disposition': undefined,
-				},
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentType).toEqual('application/json');
-			expect(message.encoding).toEqual('utf-8');
-		});
-
-		it('parses valid content-disposition header with filename*', () => {
-			const message = mock<IncomingMessage>({
-				headers: {
-					'content-type': undefined,
-					'content-disposition':
-						'attachment; filename="screenshot%20(1).png"; filename*=UTF-8\'\'screenshot%20(1).png',
-				},
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentDisposition).toEqual({
-				filename: 'screenshot (1).png',
-				type: 'attachment',
-			});
-		});
-
-		it('parses valid content-disposition header with filename* (quoted)', () => {
-			const message = mock<IncomingMessage>({
-				headers: {
-					'content-type': undefined,
-					'content-disposition': ' attachment;filename*="utf-8\' \'test-unsplash.jpg"',
-				},
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentDisposition).toEqual({
-				filename: 'test-unsplash.jpg',
-				type: 'attachment',
-			});
-		});
-
-		it('parses valid content-disposition header with filename and trailing ";"', () => {
-			const message = mock<IncomingMessage>({
-				headers: {
-					'content-type': undefined,
-					'content-disposition': 'inline; filename="screenshot%20(1).png";',
-				},
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentDisposition).toEqual({
-				filename: 'screenshot (1).png',
-				type: 'inline',
-			});
-		});
-
-		it('parses non standard content-disposition with missing type', () => {
-			const message = mock<IncomingMessage>({
-				headers: {
-					'content-type': undefined,
-					'content-disposition': 'filename="screenshot%20(1).png";',
-				},
-			});
-			parseIncomingMessage(message);
-
-			expect(message.contentDisposition).toEqual({
-				filename: 'screenshot (1).png',
-				type: 'attachment',
-			});
-		});
-	});
-
-	describe('proxyRequestToAxios', () => {
-		const baseUrl = 'http://example.de';
-		const workflow = mock<Workflow>();
-		const hooks = mock<WorkflowHooks>();
-		const additionalData = mock<IWorkflowExecuteAdditionalData>({ hooks });
-		const node = mock<INode>();
-
-		beforeEach(() => {
-			hooks.executeHookFunctions.mockClear();
-		});
-
-		test('should rethrow an error with `status` property', async () => {
-			nock(baseUrl).get('/test').reply(400);
-
-			try {
-				await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
-			} catch (error) {
-				expect(error.status).toEqual(400);
-			}
-		});
-
-		test('should not throw if the response status is 200', async () => {
-			nock(baseUrl).get('/test').reply(200);
-			await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
-			expect(hooks.executeHookFunctions).toHaveBeenCalledWith('nodeFetchedData', [
-				workflow.id,
-				node,
-			]);
-		});
-
-		test('should throw if the response status is 403', async () => {
-			const headers = { 'content-type': 'text/plain' };
-			nock(baseUrl).get('/test').reply(403, 'Forbidden', headers);
-			try {
-				await proxyRequestToAxios(workflow, additionalData, node, `${baseUrl}/test`);
-			} catch (error) {
-				expect(error.statusCode).toEqual(403);
-				expect(error.request).toBeUndefined();
-				expect(error.response).toMatchObject({ headers, status: 403 });
-				expect(error.options).toMatchObject({
-					headers: { Accept: '*/*' },
-					method: 'get',
-					url: 'http://example.de/test',
-				});
-				expect(error.config).toBeUndefined();
-				expect(error.message).toEqual('403 - "Forbidden"');
-			}
-			expect(hooks.executeHookFunctions).not.toHaveBeenCalled();
-		});
-
-		test('should not throw if the response status is 404, but `simple` option is set to `false`', async () => {
-			nock(baseUrl).get('/test').reply(404, 'Not Found');
-			const response = await proxyRequestToAxios(workflow, additionalData, node, {
-				url: `${baseUrl}/test`,
-				simple: false,
-			});
-
-			expect(response).toEqual('Not Found');
-			expect(hooks.executeHookFunctions).toHaveBeenCalledWith('nodeFetchedData', [
-				workflow.id,
-				node,
-			]);
-		});
-
-		test('should return full response when `resolveWithFullResponse` is set to true', async () => {
-			nock(baseUrl).get('/test').reply(404, 'Not Found');
-			const response = await proxyRequestToAxios(workflow, additionalData, node, {
-				url: `${baseUrl}/test`,
-				resolveWithFullResponse: true,
-				simple: false,
-			});
-
-			expect(response).toMatchObject({
-				body: 'Not Found',
-				headers: {},
-				statusCode: 404,
-				statusMessage: null,
-			});
-			expect(hooks.executeHookFunctions).toHaveBeenCalledWith('nodeFetchedData', [
-				workflow.id,
-				node,
-			]);
-		});
-
-		describe('redirects', () => {
-			test('should forward authorization header', async () => {
-				nock(baseUrl).get('/redirect').reply(301, '', { Location: 'https://otherdomain.com/test' });
-				nock('https://otherdomain.com')
-					.get('/test')
-					.reply(200, function () {
-						return this.req.headers;
-					});
-
-				const response = await proxyRequestToAxios(workflow, additionalData, node, {
-					url: `${baseUrl}/redirect`,
-					auth: {
-						username: 'testuser',
-						password: 'testpassword',
-					},
-					headers: {
-						'X-Other-Header': 'otherHeaderContent',
-					},
-					resolveWithFullResponse: true,
-				});
-
-				expect(response.statusCode).toBe(200);
-				const forwardedHeaders = JSON.parse(response.body);
-				expect(forwardedHeaders.authorization).toBe('Basic dGVzdHVzZXI6dGVzdHBhc3N3b3Jk');
-				expect(forwardedHeaders['x-other-header']).toBe('otherHeaderContent');
-			});
-
-			test('should follow redirects by default', async () => {
-				nock(baseUrl)
-					.get('/redirect')
-					.reply(301, '', { Location: `${baseUrl}/test` });
-				nock(baseUrl).get('/test').reply(200, 'Redirected');
-
-				const response = await proxyRequestToAxios(workflow, additionalData, node, {
-					url: `${baseUrl}/redirect`,
-					resolveWithFullResponse: true,
-				});
-
-				expect(response).toMatchObject({
-					body: 'Redirected',
-					headers: {},
-					statusCode: 200,
-				});
-			});
-
-			test('should not follow redirects when configured', async () => {
-				nock(baseUrl)
-					.get('/redirect')
-					.reply(301, '', { Location: `${baseUrl}/test` });
-				nock(baseUrl).get('/test').reply(200, 'Redirected');
-
-				await expect(
-					proxyRequestToAxios(workflow, additionalData, node, {
-						url: `${baseUrl}/redirect`,
-						resolveWithFullResponse: true,
-						followRedirect: false,
-					}),
-				).rejects.toThrowError(expect.objectContaining({ statusCode: 301 }));
-			});
-		});
-	});
-
-	describe('parseRequestObject', () => {
-		test('should handle basic request options', async () => {
-			const axiosOptions = await parseRequestObject({
-				url: 'https://example.com',
-				method: 'POST',
-				headers: { 'content-type': 'application/json' },
-				body: { key: 'value' },
-			});
-
-			expect(axiosOptions).toEqual(
-				expect.objectContaining({
-					url: 'https://example.com',
-					method: 'POST',
-					headers: { accept: '*/*', 'content-type': 'application/json' },
-					data: { key: 'value' },
-					maxRedirects: 0,
-				}),
-			);
-		});
-
-		test('should set correct headers for FormData', async () => {
-			const formData = new FormData();
-			formData.append('key', 'value');
-
-			const axiosOptions = await parseRequestObject({
-				url: 'https://example.com',
-				formData,
-				headers: {
-					'content-type': 'multipart/form-data',
-				},
-			});
-
-			expect(axiosOptions.headers).toMatchObject({
-				accept: '*/*',
-				'content-length': 163,
-				'content-type': expect.stringMatching(/^multipart\/form-data; boundary=/),
-			});
-
-			expect(axiosOptions.data).toBeInstanceOf(FormData);
-		});
-
-		test('should not use Host header for SNI', async () => {
-			const axiosOptions = await parseRequestObject({
-				url: 'https://example.de/foo/bar',
-				headers: { Host: 'other.host.com' },
-			});
-			expect((axiosOptions.httpsAgent as Agent).options.servername).toEqual('example.de');
-		});
-
-		describe('should set SSL certificates', () => {
-			const agentOptions: SecureContextOptions = {
-				ca: '-----BEGIN CERTIFICATE-----\nTEST\n-----END CERTIFICATE-----',
-			};
-			const requestObject: IRequestOptions = {
-				method: 'GET',
-				uri: 'https://example.de',
-				agentOptions,
-			};
-
-			test('on regular requests', async () => {
-				const axiosOptions = await parseRequestObject(requestObject);
-				expect((axiosOptions.httpsAgent as Agent).options).toEqual({
-					servername: 'example.de',
-					...agentOptions,
-					noDelay: true,
-					path: null,
-				});
-			});
-
-			test('on redirected requests', async () => {
-				const axiosOptions = await parseRequestObject(requestObject);
-				expect(axiosOptions.beforeRedirect).toBeDefined;
-				// eslint-disable-next-line @typescript-eslint/no-explicit-any
-				const redirectOptions: Record<string, any> = { agents: {}, hostname: 'example.de' };
-				axiosOptions.beforeRedirect!(redirectOptions, mock());
-				expect(redirectOptions.agent).toEqual(redirectOptions.agents.https);
-				expect((redirectOptions.agent as Agent).options).toEqual({
-					servername: 'example.de',
-					...agentOptions,
-					noDelay: true,
-					path: null,
-				});
-			});
-		});
-
-		describe('when followRedirect is true', () => {
-			test.each(['GET', 'HEAD'] as IHttpRequestMethods[])(
-				'should set maxRedirects on %s ',
-				async (method) => {
-					const axiosOptions = await parseRequestObject({
-						method,
-						followRedirect: true,
-						maxRedirects: 1234,
-					});
-					expect(axiosOptions.maxRedirects).toEqual(1234);
-				},
-			);
-
-			test.each(['POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
-				'should not set maxRedirects on %s ',
-				async (method) => {
-					const axiosOptions = await parseRequestObject({
-						method,
-						followRedirect: true,
-						maxRedirects: 1234,
-					});
-					expect(axiosOptions.maxRedirects).toEqual(0);
-				},
-			);
-		});
-
-		describe('when followAllRedirects is true', () => {
-			test.each(['GET', 'HEAD', 'POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
-				'should set maxRedirects on %s ',
-				async (method) => {
-					const axiosOptions = await parseRequestObject({
-						method,
-						followAllRedirects: true,
-						maxRedirects: 1234,
-					});
-					expect(axiosOptions.maxRedirects).toEqual(1234);
-				},
-			);
-		});
-	});
-
-	describe('invokeAxios', () => {
-		const baseUrl = 'http://example.de';
-
-		beforeEach(() => {
-			nock.cleanAll();
-			jest.clearAllMocks();
-		});
-
-		it('should throw error for non-401 status codes', async () => {
-			nock(baseUrl).get('/test').reply(500, {});
-
-			await expect(invokeAxios({ url: `${baseUrl}/test` })).rejects.toThrow(
-				'Request failed with status code 500',
-			);
-		});
-
-		it('should throw error on 401 without digest auth challenge', async () => {
-			nock(baseUrl).get('/test').reply(401, {});
-
-			await expect(
-				invokeAxios(
-					{
-						url: `${baseUrl}/test`,
-					},
-					{ sendImmediately: false },
-				),
-			).rejects.toThrow('Request failed with status code 401');
-		});
-
-		it('should make successful requests', async () => {
-			nock(baseUrl).get('/test').reply(200, { success: true });
-
-			const response = await invokeAxios({
-				url: `${baseUrl}/test`,
-			});
-
-			expect(response.status).toBe(200);
-			expect(response.data).toEqual({ success: true });
-		});
-
-		it('should handle digest auth when receiving 401 with nonce', async () => {
-			nock(baseUrl)
-				.get('/test')
-				.matchHeader('authorization', 'Basic dXNlcjpwYXNz')
-				.once()
-				.reply(401, {}, { 'www-authenticate': 'Digest realm="test", nonce="abc123", qop="auth"' });
-
-			nock(baseUrl)
-				.get('/test')
-				.matchHeader(
-					'authorization',
-					/^Digest username="user",realm="test",nonce="abc123",uri="\/test",qop="auth",algorithm="MD5",response="[0-9a-f]{32}"/,
-				)
-				.reply(200, { success: true });
-
-			const response = await invokeAxios(
-				{
-					url: `${baseUrl}/test`,
-					auth: {
-						username: 'user',
-						password: 'pass',
-					},
-				},
-				{ sendImmediately: false },
-			);
-
-			expect(response.status).toBe(200);
-			expect(response.data).toEqual({ success: true });
-		});
-	});
-
-	describe('copyInputItems', () => {
-		it('should pick only selected properties', () => {
-			const output = copyInputItems(
-				[
-					{
-						json: {
-							a: 1,
-							b: true,
-							c: {},
-						},
-					},
-				],
-				['a'],
-			);
-			expect(output).toEqual([{ a: 1 }]);
-		});
-
-		it('should convert undefined to null', () => {
-			const output = copyInputItems(
-				[
-					{
-						json: {
-							a: undefined,
-						},
-					},
-				],
-				['a'],
-			);
-			expect(output).toEqual([{ a: null }]);
-		});
-
-		it('should clone objects', () => {
-			const input = {
-				a: { b: 5 },
-			};
-			const output = copyInputItems(
-				[
-					{
-						json: input,
-					},
-				],
-				['a'],
-			);
-			expect(output[0].a).toEqual(input.a);
-			expect(output[0].a === input.a).toEqual(false);
-		});
-	});
-
-	describe('removeEmptyBody', () => {
-		test.each(['GET', 'HEAD', 'OPTIONS'] as IHttpRequestMethods[])(
-			'Should remove empty body for %s',
-			async (method) => {
-				const requestOptions = {
-					method,
-					body: {},
-				} as IHttpRequestOptions | IRequestOptions;
-				removeEmptyBody(requestOptions);
-				expect(requestOptions.body).toEqual(undefined);
-			},
-		);
-
-		test.each(['GET', 'HEAD', 'OPTIONS'] as IHttpRequestMethods[])(
-			'Should not remove non-empty body for %s',
-			async (method) => {
-				const requestOptions = {
-					method,
-					body: { test: true },
-				} as IHttpRequestOptions | IRequestOptions;
-				removeEmptyBody(requestOptions);
-				expect(requestOptions.body).toEqual({ test: true });
-			},
-		);
-
-		test.each(['POST', 'PUT', 'PATCH', 'DELETE'] as IHttpRequestMethods[])(
-			'Should not remove empty body for %s',
-			async (method) => {
-				const requestOptions = {
-					method,
-					body: {},
-				} as IHttpRequestOptions | IRequestOptions;
-				removeEmptyBody(requestOptions);
-				expect(requestOptions.body).toEqual({});
-			},
-		);
-	});
-
-	describe('binaryToString', () => {
-		const ENCODING_SAMPLES = {
-			utf8: {
-				text: 'Hello, 世界! τεστ мир ⚡️ é à ü ñ',
-				buffer: Buffer.from([
-					0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0xe4, 0xb8, 0x96, 0xe7, 0x95, 0x8c, 0x21, 0x20,
-					0xcf, 0x84, 0xce, 0xb5, 0xcf, 0x83, 0xcf, 0x84, 0x20, 0xd0, 0xbc, 0xd0, 0xb8, 0xd1, 0x80,
-					0x20, 0xe2, 0x9a, 0xa1, 0xef, 0xb8, 0x8f, 0x20, 0xc3, 0xa9, 0x20, 0xc3, 0xa0, 0x20, 0xc3,
-					0xbc, 0x20, 0xc3, 0xb1,
-				]),
-			},
-
-			'iso-8859-15': {
-				text: 'Café € personnalité',
-				buffer: Buffer.from([
-					0x43, 0x61, 0x66, 0xe9, 0x20, 0xa4, 0x20, 0x70, 0x65, 0x72, 0x73, 0x6f, 0x6e, 0x6e, 0x61,
-					0x6c, 0x69, 0x74, 0xe9,
-				]),
-			},
-
-			latin1: {
-				text: 'señor année déjà',
-				buffer: Buffer.from([
-					0x73, 0x65, 0xf1, 0x6f, 0x72, 0x20, 0x61, 0x6e, 0x6e, 0xe9, 0x65, 0x20, 0x64, 0xe9, 0x6a,
-					0xe0,
-				]),
-			},
-
-			ascii: {
-				text: 'Hello, World! 123',
-				buffer: Buffer.from([
-					0x48, 0x65, 0x6c, 0x6c, 0x6f, 0x2c, 0x20, 0x57, 0x6f, 0x72, 0x6c, 0x64, 0x21, 0x20, 0x31,
-					0x32, 0x33,
-				]),
-			},
-
-			'windows-1252': {
-				text: '€ Smart "quotes" • bullet',
-				buffer: Buffer.from([
-					0x80, 0x20, 0x53, 0x6d, 0x61, 0x72, 0x74, 0x20, 0x22, 0x71, 0x75, 0x6f, 0x74, 0x65, 0x73,
-					0x22, 0x20, 0x95, 0x20, 0x62, 0x75, 0x6c, 0x6c, 0x65, 0x74,
-				]),
-			},
-
-			'shift-jis': {
-				text: 'こんにちは世界',
-				buffer: Buffer.from([
-					0x82, 0xb1, 0x82, 0xf1, 0x82, 0xc9, 0x82, 0xbf, 0x82, 0xcd, 0x90, 0xa2, 0x8a, 0x45,
-				]),
-			},
-
-			big5: {
-				text: '哈囉世界',
-				buffer: Buffer.from([0xab, 0xa2, 0xc5, 0x6f, 0xa5, 0x40, 0xac, 0xc9]),
-			},
-
-			'koi8-r': {
-				text: 'Привет мир',
-				buffer: Buffer.from([0xf0, 0xd2, 0xc9, 0xd7, 0xc5, 0xd4, 0x20, 0xcd, 0xc9, 0xd2]),
-			},
-		};
-
-		describe('should handle Buffer', () => {
-			for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
-				test(`with ${encoding}`, async () => {
-					const data = await binaryToString(buffer, encoding);
-					expect(data).toBe(text);
-				});
-			}
-		});
-
-		describe('should handle streams', () => {
-			for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
-				test(`with ${encoding}`, async () => {
-					const stream = Readable.from(buffer);
-					const data = await binaryToString(stream, encoding);
-					expect(data).toBe(text);
-				});
-			}
-		});
-
-		describe('should handle IncomingMessage', () => {
-			for (const [encoding, { text, buffer }] of Object.entries(ENCODING_SAMPLES)) {
-				test(`with ${encoding}`, async () => {
-					const response = Readable.from(buffer) as IncomingMessage;
-					response.headers = { 'content-type': `application/json;charset=${encoding}` };
-					// @ts-expect-error need this hack to fake `instanceof IncomingMessage` checks
-					response.__proto__ = IncomingMessage.prototype;
-					const data = await binaryToString(response);
-					expect(data).toBe(text);
-				});
-			}
-		});
-	});
-});
-
-describe('isFilePathBlocked', () => {
-	test('should return true for static cache dir', () => {
-		const filePath = Container.get(InstanceSettings).staticCacheDir;
-
-		expect(isFilePathBlocked(filePath)).toBe(true);
-	});
-});
diff --git a/packages/core/test/helpers/index.ts b/packages/core/test/helpers/index.ts
index 14f19789b0..27008b177a 100644
--- a/packages/core/test/helpers/index.ts
+++ b/packages/core/test/helpers/index.ts
@@ -6,7 +6,6 @@ import type {
 	INodeType,
 	INodeTypes,
 	IRun,
-	ITaskData,
 	IVersionedNodeType,
 	IWorkflowBase,
 	IWorkflowExecuteAdditionalData,
@@ -14,10 +13,11 @@ import type {
 	WorkflowTestData,
 	INodeTypeData,
 } from 'n8n-workflow';
-import { ApplicationError, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
+import { ApplicationError, NodeHelpers } from 'n8n-workflow';
 import path from 'path';
 
 import { UnrecognizedNodeTypeError } from '@/errors';
+import { ExecutionLifecycleHooks } from '@/execution-engine/execution-lifecycle-hooks';
 
 import { predefinedNodesTypes } from './constants';
 
@@ -53,22 +53,12 @@ export function WorkflowExecuteAdditionalData(
 	waitPromise: IDeferredPromise<IRun>,
 	nodeExecutionOrder: string[],
 ): IWorkflowExecuteAdditionalData {
-	const hookFunctions = {
-		nodeExecuteAfter: [
-			async (nodeName: string, _data: ITaskData): Promise<void> => {
-				nodeExecutionOrder.push(nodeName);
-			},
-		],
-		workflowExecuteAfter: [
-			async (fullRunData: IRun): Promise<void> => {
-				waitPromise.resolve(fullRunData);
-			},
-		],
-	};
-
-	return mock<IWorkflowExecuteAdditionalData>({
-		hooks: new WorkflowHooks(hookFunctions, 'trigger', '1', mock()),
+	const hooks = new ExecutionLifecycleHooks('trigger', '1', mock());
+	hooks.addHandler('nodeExecuteAfter', (nodeName) => {
+		nodeExecutionOrder.push(nodeName);
 	});
+	hooks.addHandler('workflowExecuteAfter', (fullRunData) => waitPromise.resolve(fullRunData));
+	return mock<IWorkflowExecuteAdditionalData>({ hooks });
 }
 
 const preparePinData = (pinData: IDataObject) => {
@@ -85,8 +75,7 @@ const preparePinData = (pinData: IDataObject) => {
 	return returnData;
 };
 
-const readJsonFileSync = <T>(filePath: string) =>
-	JSON.parse(readFileSync(path.join(BASE_DIR, filePath), 'utf-8')) as T;
+const readJsonFileSync = <T>(filePath: string) => JSON.parse(readFileSync(filePath, 'utf-8')) as T;
 
 export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	if (!Array.isArray(testData)) {
@@ -100,7 +89,7 @@ export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	const nodeNames = nodes.map((n) => n.type);
 
 	const knownNodes = readJsonFileSync<Record<string, NodeLoadingDetails>>(
-		'nodes-base/dist/known/nodes.json',
+		path.join(BASE_DIR, 'nodes-base/dist/known/nodes.json'),
 	);
 
 	for (const nodeName of nodeNames) {
@@ -120,14 +109,14 @@ export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	return nodeTypes;
 }
 
-const getWorkflowFilenames = (dirname: string, testFolder = 'workflows') => {
+const getWorkflowFilepaths = (dirname: string, testFolder = 'workflows') => {
 	const workflows: string[] = [];
 
 	const filenames: string[] = readdirSync(`${dirname}${path.sep}${testFolder}`);
 
 	filenames.forEach((file) => {
 		if (file.endsWith('.json')) {
-			workflows.push(path.join('core', 'test', testFolder, file));
+			workflows.push(path.join(dirname, testFolder, file));
 		}
 	});
 
@@ -135,11 +124,11 @@ const getWorkflowFilenames = (dirname: string, testFolder = 'workflows') => {
 };
 
 export const workflowToTests = (dirname: string, testFolder = 'workflows') => {
-	const workflowFiles: string[] = getWorkflowFilenames(dirname, testFolder);
+	const workflowFilepaths: string[] = getWorkflowFilepaths(dirname, testFolder);
 
 	const testCases: WorkflowTestData[] = [];
 
-	for (const filePath of workflowFiles) {
+	for (const filePath of workflowFilepaths) {
 		const description = filePath.replace('.json', '');
 		const workflowData = readJsonFileSync<IWorkflowBase>(filePath);
 		if (workflowData.pinData === undefined) {
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 111dd828dd..0fbcc8b81a 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -4,7 +4,8 @@
 		"rootDir": ".",
 		"baseUrl": "src",
 		"paths": {
-			"@/*": ["./*"]
+			"@/*": ["./*"],
+			"@test/*": ["../test/*"]
 		},
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
 		"emitDecoratorMetadata": true,
diff --git a/packages/design-system/.eslintrc.js b/packages/design-system/.eslintrc.js
index deece11c63..99d5ff4c6e 100644
--- a/packages/design-system/.eslintrc.js
+++ b/packages/design-system/.eslintrc.js
@@ -1,13 +1,9 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const { createFrontendEslintConfig } = require('@n8n/frontend-eslint-config');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
-module.exports = {
-	extends: ['@n8n_io/eslint-config/frontend'],
-
-	...sharedOptions(__dirname, 'frontend'),
-
+module.exports = createFrontendEslintConfig(__dirname, {
 	rules: {
 		// TODO: Remove these
 		'import/no-default-export': 'warn',
@@ -44,4 +40,4 @@ module.exports = {
 			},
 		},
 	],
-};
+});
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index d35d701825..3ddc30ebbe 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,8 +1,8 @@
 {
   "name": "n8n-design-system",
-  "version": "1.64.0",
-  "main": "src/main.ts",
-  "import": "src/main.ts",
+  "version": "1.68.0",
+  "main": "src/index.ts",
+  "import": "src/index.ts",
   "scripts": {
     "dev": "pnpm run storybook",
     "clean": "rimraf dist .turbo",
@@ -19,9 +19,12 @@
     "lintfix": "eslint src --ext .js,.ts,.vue --fix"
   },
   "devDependencies": {
+    "@n8n/frontend-eslint-config": "workspace:*",
+    "@n8n/frontend-typescript-config": "workspace:*",
+    "@n8n/frontend-vitest-config": "workspace:*",
     "@n8n/storybook": "workspace:*",
-    "@testing-library/jest-dom": "^6.5.0",
-    "@testing-library/user-event": "^14.5.2",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/user-event": "^14.6.0",
     "@testing-library/vue": "^8.1.0",
     "@types/markdown-it": "^13.0.9",
     "@types/markdown-it-emoji": "^2.0.2",
@@ -41,6 +44,7 @@
     "vue-tsc": "catalog:frontend"
   },
   "dependencies": {
+    "@n8n/composables": "workspace:*",
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^3.0.3",
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index 02de38143c..b04ccb1049 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -10,8 +10,8 @@ import N8nText from '../N8nText';
 interface ActionBoxProps {
 	emoji: string;
 	heading: string;
-	buttonText: string;
-	buttonType: ButtonType;
+	buttonText?: string;
+	buttonType?: ButtonType;
 	buttonDisabled?: boolean;
 	buttonIcon?: string;
 	description: string;
diff --git a/packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap b/packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
index c6dd12ec37..323ba7ae4f 100644
--- a/packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
+++ b/packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
@@ -31,25 +31,39 @@ exports[`components > N8nCheckbox > should render with both child and label 1`]
         class="container"
         data-test-id="input-label"
       >
-        <label
-          class="n8n-input-label inputLabel heading medium"
+        <div
+          class="labelRow"
         >
-          <div
-            class="title"
+          <label
+            class="n8n-input-label inputLabel heading medium"
           >
-            <span
-              class="n8n-text size-medium regular"
+            <div
+              class="main-content"
             >
-              
-              Checkbox 
+              <div
+                class="title"
+              >
+                <span
+                  class="n8n-text size-medium regular"
+                >
+                  
+                  Checkbox 
+                  <!--v-if-->
+                  
+                </span>
+              </div>
               <!--v-if-->
-              
-            </span>
-          </div>
+            </div>
+            <div
+              class="trailing-content"
+            >
+              <!--v-if-->
+              <!--v-if-->
+              <!--v-if-->
+            </div>
+          </label>
           <!--v-if-->
-          <!--v-if-->
-          <!--v-if-->
-        </label>
+        </div>
         
         
       </div>
@@ -122,25 +136,39 @@ exports[`components > N8nCheckbox > should render with label 1`] = `
         class="container"
         data-test-id="input-label"
       >
-        <label
-          class="n8n-input-label inputLabel heading medium"
+        <div
+          class="labelRow"
         >
-          <div
-            class="title"
+          <label
+            class="n8n-input-label inputLabel heading medium"
           >
-            <span
-              class="n8n-text size-medium regular"
+            <div
+              class="main-content"
             >
-              
-              Checkbox 
+              <div
+                class="title"
+              >
+                <span
+                  class="n8n-text size-medium regular"
+                >
+                  
+                  Checkbox 
+                  <!--v-if-->
+                  
+                </span>
+              </div>
               <!--v-if-->
-              
-            </span>
-          </div>
+            </div>
+            <div
+              class="trailing-content"
+            >
+              <!--v-if-->
+              <!--v-if-->
+              <!--v-if-->
+            </div>
+          </label>
           <!--v-if-->
-          <!--v-if-->
-          <!--v-if-->
-        </label>
+        </div>
         
         
       </div>
diff --git a/packages/design-system/src/components/N8nDatatable/Datatable.vue b/packages/design-system/src/components/N8nDatatable/Datatable.vue
index 905aef4671..d3447229d1 100644
--- a/packages/design-system/src/components/N8nDatatable/Datatable.vue
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref, useCssModule } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useI18n } from '../../composables/useI18n';
 import type { DatatableColumn, DatatableRow, DatatableRowDataType } from '../../types';
@@ -33,8 +33,6 @@ const emit = defineEmits<{
 const { t } = useI18n();
 const rowsPerPageOptions = ref([1, 10, 25, 50, 100]);
 
-const $style = useCssModule();
-
 const totalPages = computed(() => {
 	return Math.ceil(props.rows.length / props.rowsPerPage);
 });
@@ -52,11 +50,6 @@ const visibleRows = computed(() => {
 	return props.rows.slice(start, end);
 });
 
-const classes = computed(() => ({
-	datatable: true,
-	[$style.datatableWrapper]: true,
-}));
-
 function onUpdateCurrentPage(value: number) {
 	emit('update:currentPage', value);
 }
@@ -87,9 +80,9 @@ function getThStyle(column: DatatableColumn) {
 </script>
 
 <template>
-	<div :class="classes" v-bind="$attrs">
-		<table :class="$style.datatable">
-			<thead :class="$style.datatableHeader">
+	<div class="datatable datatableWrapper" v-bind="$attrs">
+		<table>
+			<thead>
 				<tr>
 					<th
 						v-for="column in columns"
@@ -115,7 +108,7 @@ function getThStyle(column: DatatableColumn) {
 			</tbody>
 		</table>
 
-		<div :class="$style.pagination">
+		<div class="pagination">
 			<N8nPagination
 				v-if="totalPages > 1"
 				background
@@ -127,7 +120,7 @@ function getThStyle(column: DatatableColumn) {
 				@update:current-page="onUpdateCurrentPage"
 			/>
 
-			<div :class="$style.pageSizeSelector">
+			<div class="pageSizeSelector">
 				<N8nSelect
 					size="mini"
 					:model-value="rowsPerPage"
@@ -148,47 +141,75 @@ function getThStyle(column: DatatableColumn) {
 	</div>
 </template>
 
-<style lang="scss" module>
-.datatableWrapper {
-	display: block;
+<style lang="scss" scoped>
+:deep(table) {
+	border: 1px solid var(--color-foreground-base);
+	border-collapse: separate;
+	overflow: hidden;
+	border-spacing: 0;
+	border-radius: 10px;
+	text-align: left;
 	width: 100%;
-}
+	background-color: var(--color-background-xlight);
+	table-layout: fixed;
 
-.datatable {
-	width: 100%;
+	th {
+		font-size: var(--font-size-2xs);
+		font-weight: var(--font-weight-regular);
+		padding: 10px 8px;
+	}
+
+	td {
+		font-size: var(--font-size-s);
+		padding: 3px 8px;
+		height: 47px;
+		width: auto;
+		&:first-child {
+			padding-left: 16px;
+		}
+		&:last-child {
+			padding-right: 16px;
+		}
+	}
+
+	th,
+	td {
+		vertical-align: middle;
+		border-bottom: 1px solid var(--color-foreground-base);
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+
+		&:last-child {
+			border-right: none;
+		}
+	}
 
 	tbody {
 		tr {
-			td {
-				vertical-align: top;
-				color: var(--color-text-base);
-				padding: var(--spacing-s) var(--spacing-2xs);
+			&:hover {
+				background-color: var(--color-background-light);
 			}
 
-			&:nth-of-type(even) {
-				background: var(--color-background-xlight);
-			}
-
-			&:nth-of-type(odd) {
-				background: var(--color-background-light);
+			&:last-child {
+				th,
+				td {
+					border-bottom: none;
+				}
 			}
 		}
 	}
 }
 
-.datatableHeader {
-	background: var(--color-background-base);
-
-	th {
-		text-align: left;
-		padding: var(--spacing-s) var(--spacing-2xs);
-	}
+.datatableWrapper {
+	display: block;
+	width: 100%;
 }
 
 .pagination {
 	width: 100%;
 	display: flex;
-	justify-content: center;
+	justify-content: flex-end;
 	align-items: center;
 	bottom: 0;
 	overflow: visible;
diff --git a/packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap b/packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
index 63c2e64694..5973087b6d 100644
--- a/packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
+++ b/packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
@@ -1,101 +1,101 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`components > N8nDatatable > should render correctly 1`] = `
-"<div class="datatable datatableWrapper">
-  <table class="datatable">
-    <thead class="datatableHeader">
-      <tr>
-        <th class="">ID</th>
-        <th class="">Name</th>
-        <th class="">Age</th>
-        <th class="">Action</th>
+"<div data-v-c73ff18f="" class="datatable datatableWrapper">
+  <table data-v-c73ff18f="">
+    <thead data-v-c73ff18f="">
+      <tr data-v-c73ff18f="">
+        <th data-v-c73ff18f="" class="">ID</th>
+        <th data-v-c73ff18f="" class="">Name</th>
+        <th data-v-c73ff18f="" class="">Age</th>
+        <th data-v-c73ff18f="" class="">Action</th>
       </tr>
     </thead>
-    <tbody>
-      <tr>
-        <td class=""><span>1</span></td>
-        <td class=""><span>Richard Hendricks</span></td>
-        <td class=""><span>29</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+    <tbody data-v-c73ff18f="">
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">1</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Richard Hendricks</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">29</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>2</span></td>
-        <td class=""><span>Bertram Gilfoyle</span></td>
-        <td class=""><span>44</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">2</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Bertram Gilfoyle</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">44</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>3</span></td>
-        <td class=""><span>Dinesh Chugtai</span></td>
-        <td class=""><span>31</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">3</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Dinesh Chugtai</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">31</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>4</span></td>
-        <td class=""><span>Jared Dunn </span></td>
-        <td class=""><span>38</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">4</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Jared Dunn </span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">38</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>5</span></td>
-        <td class=""><span>Richard Hendricks</span></td>
-        <td class=""><span>29</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">5</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Richard Hendricks</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">29</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>6</span></td>
-        <td class=""><span>Bertram Gilfoyle</span></td>
-        <td class=""><span>44</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">6</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Bertram Gilfoyle</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">44</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>7</span></td>
-        <td class=""><span>Dinesh Chugtai</span></td>
-        <td class=""><span>31</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">7</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Dinesh Chugtai</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">31</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>8</span></td>
-        <td class=""><span>Jared Dunn </span></td>
-        <td class=""><span>38</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">8</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Jared Dunn </span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">38</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>9</span></td>
-        <td class=""><span>Richard Hendricks</span></td>
-        <td class=""><span>29</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">9</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Richard Hendricks</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">29</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
-      <tr>
-        <td class=""><span>10</span></td>
-        <td class=""><span>Bertram Gilfoyle</span></td>
-        <td class=""><span>44</span></td>
-        <td class="">
-          <n8n-button-stub block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
+      <tr data-v-c73ff18f="">
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">10</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">Bertram Gilfoyle</span></td>
+        <td data-v-c73ff18f="" class=""><span data-v-c73ff18f="">44</span></td>
+        <td data-v-c73ff18f="" class="">
+          <n8n-button-stub data-v-c73ff18f="" block="false" element="button" label="" square="false" active="false" disabled="false" loading="false" outline="false" size="medium" text="false" type="primary" column="[object Object]"></n8n-button-stub>
         </td>
       </tr>
     </tbody>
   </table>
-  <div class="pagination">
-    <div class="el-pagination is-background is-background"><button type="button" class="btn-prev is-first" disabled="" aria-label="Go to previous page" aria-disabled="true"><i class="el-icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
+  <div data-v-c73ff18f="" class="pagination">
+    <div data-v-c73ff18f="" class="el-pagination is-background is-background"><button type="button" class="btn-prev is-first" disabled="" aria-label="Go to previous page" aria-disabled="true"><i class="el-icon"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024">
             <path fill="currentColor" d="M609.408 149.376 277.76 489.6a32 32 0 0 0 0 44.672l331.648 340.352a29.12 29.12 0 0 0 41.728 0 30.592 30.592 0 0 0 0-42.752L339.264 511.936l311.872-319.872a30.592 30.592 0 0 0 0-42.688 29.12 29.12 0 0 0-41.728 0z"></path>
           </svg></i></button>
       <ul class="el-pager">
@@ -107,8 +107,8 @@ exports[`components > N8nDatatable > should render correctly 1`] = `
             <path fill="currentColor" d="M340.864 149.312a30.592 30.592 0 0 0 0 42.752L652.736 512 340.864 831.872a30.592 30.592 0 0 0 0 42.752 29.12 29.12 0 0 0 41.728 0L714.24 534.336a32 32 0 0 0 0-44.672L382.592 149.376a29.12 29.12 0 0 0-41.728 0z"></path>
           </svg></i></button>
     </div>
-    <div class="pageSizeSelector">
-      <div class="n8n-select container withPrepend">
+    <div data-v-c73ff18f="" class="pageSizeSelector">
+      <div data-v-c73ff18f="" class="n8n-select container withPrepend">
         <div class="prepend">Page size</div>
         <div class="el-select el-select--small" popperappendtobody="false" limitpopperwidth="false">
           <div class="select-trigger el-tooltip__trigger el-tooltip__trigger">
diff --git a/packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap b/packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
index 8138b44b8c..949105aef3 100644
--- a/packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
+++ b/packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
@@ -33,32 +33,46 @@ exports[`FormBox > should render the component 1`] = `
               class="container"
               data-test-id="name"
             >
-              <label
-                class="n8n-input-label inputLabel heading small"
-                for="name"
+              <div
+                class="labelRow"
               >
-                <div
-                  class="title"
+                <label
+                  class="n8n-input-label inputLabel heading small"
+                  for="name"
                 >
-                  <span
-                    class="n8n-text size-small bold"
+                  <div
+                    class="main-content"
                   >
-                    
-                    Name 
-                    <span
-                      class="n8n-text primary size-small bold"
+                    <div
+                      class="title"
                     >
-                      
-                      *
-                      
-                    </span>
-                    
-                  </span>
-                </div>
+                      <span
+                        class="n8n-text size-small bold"
+                      >
+                        
+                        Name 
+                        <span
+                          class="n8n-text primary size-small bold"
+                        >
+                          
+                          *
+                          
+                        </span>
+                        
+                      </span>
+                    </div>
+                    <!--v-if-->
+                  </div>
+                  <div
+                    class="trailing-content"
+                  >
+                    <!--v-if-->
+                    <!--v-if-->
+                    <!--v-if-->
+                  </div>
+                </label>
                 <!--v-if-->
-                <!--v-if-->
-                <!--v-if-->
-              </label>
+              </div>
               
               <div
                 class=""
@@ -105,32 +119,46 @@ exports[`FormBox > should render the component 1`] = `
               class="container"
               data-test-id="email"
             >
-              <label
-                class="n8n-input-label inputLabel heading medium"
-                for="email"
+              <div
+                class="labelRow"
               >
-                <div
-                  class="title"
+                <label
+                  class="n8n-input-label inputLabel heading medium"
+                  for="email"
                 >
-                  <span
-                    class="n8n-text size-medium bold"
+                  <div
+                    class="main-content"
                   >
-                    
-                    Email 
-                    <span
-                      class="n8n-text primary size-medium bold"
+                    <div
+                      class="title"
                     >
-                      
-                      *
-                      
-                    </span>
-                    
-                  </span>
-                </div>
+                      <span
+                        class="n8n-text size-medium bold"
+                      >
+                        
+                        Email 
+                        <span
+                          class="n8n-text primary size-medium bold"
+                        >
+                          
+                          *
+                          
+                        </span>
+                        
+                      </span>
+                    </div>
+                    <!--v-if-->
+                  </div>
+                  <div
+                    class="trailing-content"
+                  >
+                    <!--v-if-->
+                    <!--v-if-->
+                    <!--v-if-->
+                  </div>
+                </label>
                 <!--v-if-->
-                <!--v-if-->
-                <!--v-if-->
-              </label>
+              </div>
               
               <div
                 class=""
@@ -177,32 +205,46 @@ exports[`FormBox > should render the component 1`] = `
               class="container"
               data-test-id="password"
             >
-              <label
-                class="n8n-input-label inputLabel heading medium"
-                for="password"
+              <div
+                class="labelRow"
               >
-                <div
-                  class="title"
+                <label
+                  class="n8n-input-label inputLabel heading medium"
+                  for="password"
                 >
-                  <span
-                    class="n8n-text size-medium bold"
+                  <div
+                    class="main-content"
                   >
-                    
-                    Password 
-                    <span
-                      class="n8n-text primary size-medium bold"
+                    <div
+                      class="title"
                     >
-                      
-                      *
-                      
-                    </span>
-                    
-                  </span>
-                </div>
+                      <span
+                        class="n8n-text size-medium bold"
+                      >
+                        
+                        Password 
+                        <span
+                          class="n8n-text primary size-medium bold"
+                        >
+                          
+                          *
+                          
+                        </span>
+                        
+                      </span>
+                    </div>
+                    <!--v-if-->
+                  </div>
+                  <div
+                    class="trailing-content"
+                  >
+                    <!--v-if-->
+                    <!--v-if-->
+                    <!--v-if-->
+                  </div>
+                </label>
                 <!--v-if-->
-                <!--v-if-->
-                <!--v-if-->
-              </label>
+              </div>
               
               <div
                 class=""
diff --git a/packages/design-system/src/components/N8nFormInput/FormInput.vue b/packages/design-system/src/components/N8nFormInput/FormInput.vue
index b50868a303..adfb24c783 100644
--- a/packages/design-system/src/components/N8nFormInput/FormInput.vue
+++ b/packages/design-system/src/components/N8nFormInput/FormInput.vue
@@ -50,6 +50,7 @@ export interface Props {
 	inactiveColor?: string;
 	teleported?: boolean;
 	tagSize?: 'small' | 'medium' | 'large';
+	autosize?: boolean | { minRows: number; maxRows: number };
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -60,6 +61,7 @@ const props = withDefaults(defineProps<Props>(), {
 	validateOnBlur: true,
 	teleported: true,
 	tagSize: 'large',
+	autosize: false,
 });
 
 const emit = defineEmits<{
@@ -250,6 +252,7 @@ defineExpose({ inputRef });
 				:autocomplete="autocomplete"
 				:disabled="disabled"
 				:size="tagSize"
+				:autosize
 				@update:model-value="onUpdateModelValue"
 				@blur="onBlur"
 				@focus="onFocus"
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.vue b/packages/design-system/src/components/N8nIconPicker/IconPicker.vue
index 318d48c828..7bfc01a9e9 100644
--- a/packages/design-system/src/components/N8nIconPicker/IconPicker.vue
+++ b/packages/design-system/src/components/N8nIconPicker/IconPicker.vue
@@ -3,7 +3,7 @@
 // eslint-disable import/no-extraneous-dependencies
 import { onClickOutside } from '@vueuse/core';
 import { isEmojiSupported } from 'is-emoji-supported';
-import { ref, defineProps, computed } from 'vue';
+import { ref, computed } from 'vue';
 
 import { useI18n } from '../../composables/useI18n';
 import N8nTooltip from '../N8nTooltip';
diff --git a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
index e522579713..2224528c1e 100644
--- a/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.vue
@@ -41,55 +41,75 @@ const addTargetBlank = (html: string) =>
 		v-bind="$attrs"
 		data-test-id="input-label"
 	>
-		<label
-			v-if="label || $slots.options"
-			:for="inputName"
-			:class="{
-				'n8n-input-label': true,
-				[$style.inputLabel]: true,
-				[$style.heading]: !!label,
-				[$style.underline]: underline,
-				[$style[size]]: true,
-				[$style.overflow]: !!$slots.options,
-			}"
-		>
-			<div v-if="label" :class="$style.title">
-				<N8nText
-					:bold="bold"
-					:size="size"
-					:compact="compact"
-					:color="color"
-					:class="{
-						[$style.textEllipses]: showOptions,
-					}"
-				>
-					{{ label }}
-					<N8nText v-if="required" color="primary" :bold="bold" :size="size">*</N8nText>
-				</N8nText>
-			</div>
-			<span
-				v-if="tooltipText && label"
-				:class="[$style.infoIcon, showTooltip ? $style.visible : $style.hidden]"
+		<div :class="$style.labelRow">
+			<label
+				v-if="label || $slots.options"
+				:for="inputName"
+				:class="{
+					'n8n-input-label': true,
+					[$style.inputLabel]: true,
+					[$style.heading]: !!label,
+					[$style.underline]: underline,
+					[$style[size]]: true,
+					[$style.overflow]: !!$slots.options,
+				}"
 			>
-				<N8nTooltip placement="top" :popper-class="$style.tooltipPopper" :show-after="300">
-					<N8nIcon icon="question-circle" size="small" />
-					<template #content>
-						<div v-n8n-html="addTargetBlank(tooltipText)" />
-					</template>
-				</N8nTooltip>
-			</span>
+				<div :class="$style['main-content']">
+					<div v-if="label" :class="$style.title">
+						<N8nText
+							:bold="bold"
+							:size="size"
+							:compact="compact"
+							:color="color"
+							:class="{
+								[$style.textEllipses]: showOptions,
+							}"
+						>
+							{{ label }}
+							<N8nText v-if="required" color="primary" :bold="bold" :size="size">*</N8nText>
+						</N8nText>
+					</div>
+					<span
+						v-if="tooltipText && label"
+						:class="[$style.infoIcon, showTooltip ? $style.visible : $style.hidden]"
+					>
+						<N8nTooltip placement="top" :popper-class="$style.tooltipPopper" :show-after="300">
+							<N8nIcon icon="question-circle" size="small" />
+							<template #content>
+								<div v-n8n-html="addTargetBlank(tooltipText)" />
+							</template>
+						</N8nTooltip>
+					</span>
+				</div>
+				<div :class="$style['trailing-content']">
+					<div
+						v-if="$slots.options && label"
+						:class="{ [$style.overlay]: true, [$style.visible]: showOptions }"
+					/>
+					<div
+						v-if="$slots.options"
+						:class="{ [$style.options]: true, [$style.visible]: showOptions }"
+						:data-test-id="`${inputName}-parameter-input-options-container`"
+					>
+						<slot name="options" />
+					</div>
+					<div
+						v-if="$slots.issues"
+						:class="$style.issues"
+						:data-test-id="`${inputName}-parameter-input-issues-container`"
+					>
+						<slot name="issues" />
+					</div>
+				</div>
+			</label>
 			<div
-				v-if="$slots.options && label"
-				:class="{ [$style.overlay]: true, [$style.visible]: showOptions }"
-			/>
-			<div
-				v-if="$slots.options"
-				:class="{ [$style.options]: true, [$style.visible]: showOptions }"
-				:data-test-id="`${inputName}-parameter-input-options-container`"
+				v-if="$slots.persistentOptions"
+				class="pl-4xs"
+				:data-test-id="`${inputName}-parameter-input-persistent-options-container`"
 			>
-				<slot name="options" />
+				<slot name="persistentOptions" />
 			</div>
-		</label>
+		</div>
 		<slot />
 	</div>
 </template>
@@ -98,20 +118,46 @@ const addTargetBlank = (html: string) =>
 .container {
 	display: flex;
 	flex-direction: column;
+
+	label {
+		display: flex;
+		justify-content: space-between;
+	}
 }
+
+.labelRow {
+	flex-direction: row;
+	display: flex;
+}
+
+.main-content {
+	display: flex;
+	&:hover {
+		.infoIcon {
+			opacity: 1;
+
+			&:hover {
+				color: var(--color-text-base);
+			}
+		}
+	}
+}
+
+.trailing-content {
+	display: flex;
+	gap: var(--spacing-3xs);
+
+	* {
+		align-self: center;
+	}
+}
+
 .inputLabel {
 	display: block;
+	flex-grow: 1;
 }
 .container:hover,
 .inputLabel:hover {
-	.infoIcon {
-		opacity: 1;
-
-		&:hover {
-			color: var(--color-text-base);
-		}
-	}
-
 	.options {
 		opacity: 1;
 		transition: opacity 100ms ease-in; // transition on hover in
@@ -150,10 +196,13 @@ const addTargetBlank = (html: string) =>
 .options {
 	opacity: 0;
 	transition: opacity 250ms cubic-bezier(0.98, -0.06, 0.49, -0.2); // transition on hover out
+	display: flex;
+	align-self: center;
+}
 
-	> * {
-		float: right;
-	}
+.issues {
+	display: flex;
+	align-self: center;
 }
 
 .overlay {
@@ -200,10 +249,10 @@ const addTargetBlank = (html: string) =>
 	display: flex;
 
 	&.small {
-		margin-bottom: var(--spacing-5xs);
+		padding-bottom: var(--spacing-5xs);
 	}
 	&.medium {
-		margin-bottom: var(--spacing-2xs);
+		padding-bottom: var(--spacing-2xs);
 	}
 }
 
diff --git a/packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap b/packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
index b4b61558a4..1c928d5e35 100644
--- a/packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
+++ b/packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
@@ -6,25 +6,39 @@ exports[`component > Text overflow behavior > displays ellipsis with options 1`]
     class="container"
     data-test-id="input-label"
   >
-    <label
-      class="n8n-input-label inputLabel heading medium"
+    <div
+      class="labelRow"
     >
-      <div
-        class="title"
+      <label
+        class="n8n-input-label inputLabel heading medium"
       >
-        <span
-          class="n8n-text size-medium bold textEllipses textEllipses"
+        <div
+          class="main-content"
         >
-          
-          a label 
+          <div
+            class="title"
+          >
+            <span
+              class="n8n-text size-medium bold textEllipses textEllipses"
+            >
+              
+              a label 
+              <!--v-if-->
+              
+            </span>
+          </div>
           <!--v-if-->
-          
-        </span>
-      </div>
+        </div>
+        <div
+          class="trailing-content"
+        >
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+        </div>
+      </label>
       <!--v-if-->
-      <!--v-if-->
-      <!--v-if-->
-    </label>
+    </div>
     
     
   </div>
@@ -37,25 +51,39 @@ exports[`component > Text overflow behavior > displays full text without options
     class="container"
     data-test-id="input-label"
   >
-    <label
-      class="n8n-input-label inputLabel heading medium"
+    <div
+      class="labelRow"
     >
-      <div
-        class="title"
+      <label
+        class="n8n-input-label inputLabel heading medium"
       >
-        <span
-          class="n8n-text size-medium bold"
+        <div
+          class="main-content"
         >
-          
-          a label 
+          <div
+            class="title"
+          >
+            <span
+              class="n8n-text size-medium bold"
+            >
+              
+              a label 
+              <!--v-if-->
+              
+            </span>
+          </div>
           <!--v-if-->
-          
-        </span>
-      </div>
+        </div>
+        <div
+          class="trailing-content"
+        >
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+        </div>
+      </label>
       <!--v-if-->
-      <!--v-if-->
-      <!--v-if-->
-    </label>
+    </div>
     
     
   </div>
diff --git a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
index 77bbc2d8c0..ea237e5531 100644
--- a/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
+++ b/packages/design-system/src/components/N8nKeyboardShortcut/N8nKeyboardShortcut.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { computed } from 'vue';
 
-import { useDeviceSupport } from '../../composables/useDeviceSupport';
 import type { KeyboardShortcut } from '../../types/keyboardshortcut';
 
 const props = defineProps<KeyboardShortcut>();
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
index b5a37da693..f4804a37fc 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useCssModule } from 'vue';
 
 import { directionsCursorMaps, type Direction, type ResizeData } from 'n8n-design-system/types';
 
@@ -32,6 +32,7 @@ interface ResizeProps {
 	scale?: number;
 	gridSize?: number;
 	supportedDirections?: Direction[];
+	outset?: boolean;
 }
 
 const props = withDefaults(defineProps<ResizeProps>(), {
@@ -42,9 +43,12 @@ const props = withDefaults(defineProps<ResizeProps>(), {
 	minWidth: 0,
 	scale: 1,
 	gridSize: 20,
+	outset: false,
 	supportedDirections: () => [],
 });
 
+const $style = useCssModule();
+
 const emit = defineEmits<{
 	resizestart: [];
 	resize: [value: ResizeData];
@@ -70,6 +74,11 @@ const state = {
 	y: ref(0),
 };
 
+const classes = computed(() => ({
+	[$style.resize]: true,
+	[$style.outset]: props.outset,
+}));
+
 const mouseMove = (event: MouseEvent) => {
 	event.preventDefault();
 	event.stopPropagation();
@@ -147,7 +156,7 @@ const resizerMove = (event: MouseEvent) => {
 </script>
 
 <template>
-	<div :class="$style.resize">
+	<div :class="classes">
 		<div
 			v-for="direction in enabledDirections"
 			:key="direction"
@@ -161,6 +170,10 @@ const resizerMove = (event: MouseEvent) => {
 
 <style lang="scss" module>
 .resize {
+	--resizer--size: 12px;
+	--resizer--side-offset: -2px;
+	--resizer--corner-offset: -3px;
+
 	position: relative;
 	width: 100%;
 	height: 100%;
@@ -173,66 +186,71 @@ const resizerMove = (event: MouseEvent) => {
 }
 
 .right {
-	width: 12px;
+	width: var(--resizer--size);
 	height: 100%;
-	top: -2px;
-	right: -2px;
+	top: var(--resizer--side-offset);
+	right: var(--resizer--side-offset);
 	cursor: ew-resize;
 }
 
 .top {
 	width: 100%;
-	height: 12px;
-	top: -2px;
-	left: -2px;
+	height: var(--resizer--size);
+	top: var(--resizer--side-offset);
+	left: var(--resizer--side-offset);
 	cursor: ns-resize;
 }
 
 .bottom {
 	width: 100%;
-	height: 12px;
-	bottom: -2px;
-	left: -2px;
+	height: var(--resizer--size);
+	bottom: var(--resizer--side-offset);
+	left: var(--resizer--side-offset);
 	cursor: ns-resize;
 }
 
 .left {
-	width: 12px;
+	width: var(--resizer--size);
 	height: 100%;
-	top: -2px;
-	left: -2px;
+	top: var(--resizer--side-offset);
+	left: var(--resizer--side-offset);
 	cursor: ew-resize;
 }
 
 .topLeft {
-	width: 12px;
-	height: 12px;
-	top: -3px;
-	left: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	top: var(--resizer--corner-offset);
+	left: var(--resizer--corner-offset);
 	cursor: nw-resize;
 }
 
 .topRight {
-	width: 12px;
-	height: 12px;
-	top: -3px;
-	right: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	top: var(--resizer--corner-offset);
+	right: var(--resizer--corner-offset);
 	cursor: ne-resize;
 }
 
 .bottomLeft {
-	width: 12px;
-	height: 12px;
-	bottom: -3px;
-	left: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	bottom: var(--resizer--corner-offset);
+	left: var(--resizer--corner-offset);
 	cursor: sw-resize;
 }
 
 .bottomRight {
-	width: 12px;
-	height: 12px;
-	bottom: -3px;
-	right: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	bottom: var(--resizer--corner-offset);
+	right: var(--resizer--corner-offset);
 	cursor: se-resize;
 }
+
+.outset {
+	--resizer--side-offset: calc(-1 * var(--resizer--size) + 2px);
+	--resizer--corner-offset: calc(-1 * var(--resizer--size) + 3px);
+}
 </style>
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 80a065d429..28c1fc049a 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -136,6 +136,12 @@ defineExpose({
 			<template v-if="$slots.suffix" #suffix>
 				<slot name="suffix" />
 			</template>
+			<template v-if="$slots.footer" #footer>
+				<slot name="footer" />
+			</template>
+			<template v-if="$slots.empty" #empty>
+				<slot name="empty" />
+			</template>
 			<slot></slot>
 		</ElSelect>
 	</div>
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts b/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
new file mode 100644
index 0000000000..a4f5244143
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
@@ -0,0 +1,45 @@
+import type { StoryFn } from '@storybook/vue3';
+
+import N8nSelectableList from './SelectableList.vue';
+
+export default {
+	title: 'Modules/SelectableList',
+	component: N8nSelectableList,
+	argTypes: {},
+	parameters: {
+		backgrounds: { default: '--color-background-light' },
+	},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({
+		args: { ...args, modelValue: undefined },
+		model: args.modelValue,
+	}),
+	props: Object.keys(argTypes),
+	// Generics make this difficult to type
+	components: N8nSelectableList as never,
+	template:
+		'<n8n-selectable-list v-bind="args" v-model="model"><template #displayItem="{ name }">Slot content for {{name}}</template></n8n-selectable-list>',
+});
+
+export const SelectableList = Template.bind({});
+SelectableList.args = {
+	modelValue: {
+		propC: 'propC pre-existing initial value',
+	},
+	inputs: [
+		{
+			name: 'propC',
+			initialValue: 'propC default',
+		},
+		{
+			name: 'propB',
+			initialValue: 0,
+		},
+		{
+			name: 'propA',
+			initialValue: false,
+		},
+	],
+};
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts b/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts
new file mode 100644
index 0000000000..21f8040699
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts
@@ -0,0 +1,97 @@
+import { fireEvent, render } from '@testing-library/vue';
+
+import N8nSelectableList from './SelectableList.vue';
+
+describe('N8nSelectableList', () => {
+	it('renders when empty', () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {},
+				inputs: [],
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders one clickable element that can be added and removed', async () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {},
+				inputs: [{ name: 'propA', initialValue: '' }],
+			},
+		});
+
+		expect(wrapper.getByTestId('selectable-list-selectable-propA')).toBeInTheDocument();
+
+		await fireEvent.click(wrapper.getByTestId('selectable-list-selectable-propA'));
+
+		expect(wrapper.queryByTestId('selectable-list-selectable-propA')).not.toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propA')).toBeInTheDocument();
+
+		await fireEvent.click(wrapper.getByTestId('selectable-list-remove-slot-propA'));
+
+		expect(wrapper.queryByTestId('selectable-list-slot-propA')).not.toBeInTheDocument();
+	});
+
+	it('renders multiple elements with some pre-selected', () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {
+					propC: false,
+					propA: 'propA value',
+				},
+				inputs: [
+					{ name: 'propD', initialValue: true },
+					{ name: 'propC', initialValue: true },
+					{ name: 'propB', initialValue: 3 },
+					{ name: 'propA', initialValue: '' },
+				],
+			},
+		});
+
+		expect(wrapper.queryByTestId('selectable-list-selectable-propA')).not.toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-selectable-propC')).not.toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propA')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-selectable-propB')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propC')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-selectable-propD')).toBeInTheDocument();
+
+		// This asserts order - specifically that propA appears before propC
+		expect(
+			wrapper
+				.getByTestId('selectable-list-slot-propA')
+				.compareDocumentPosition(wrapper.getByTestId('selectable-list-slot-propC')),
+		).toEqual(4);
+
+		expect(
+			wrapper
+				.getByTestId('selectable-list-selectable-propB')
+				.compareDocumentPosition(wrapper.getByTestId('selectable-list-selectable-propD')),
+		).toEqual(4);
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders disabled collection without selectables', async () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {
+					propB: 'propB value',
+				},
+				disabled: true,
+				inputs: [
+					{ name: 'propA', initialValue: '' },
+					{ name: 'propB', initialValue: '' },
+					{ name: 'propC', initialValue: '' },
+				],
+			},
+		});
+
+		expect(wrapper.queryByTestId('selectable-list-selectable-propA')).not.toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propB')).toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-selectable-propB')).not.toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-selectable-propC')).not.toBeInTheDocument();
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.vue b/packages/design-system/src/components/N8nSelectableList/SelectableList.vue
new file mode 100644
index 0000000000..de0133d2d0
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/SelectableList.vue
@@ -0,0 +1,146 @@
+<script setup lang="ts" generic="Value, Item extends { name: string; initialValue: Value }">
+import { computed } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
+
+const { t } = useI18n();
+
+defineSlots<{
+	// This slot is used to display a selectable item
+	addItem: (props: Item) => unknown;
+	// This slot is used to display a selected item
+	displayItem: (props: Item) => unknown;
+}>();
+
+type SelectableListProps = {
+	inputs: Item[];
+	disabled?: boolean;
+};
+
+const props = withDefaults(defineProps<SelectableListProps>(), {
+	inputs: () => [],
+	disabled: false,
+});
+
+// Record<inputs[k].name, initialValue>
+// Note that only the keys will stay up to date to reflect selected keys
+// Whereas the values will not automatically update if the related slot value is updated
+const selectedItems = defineModel<Record<string, Value>>({ required: true });
+
+const inputMap = computed(() => Object.fromEntries(props.inputs.map((x) => [x.name, x] as const)));
+
+const visibleSelectables = computed(() => {
+	return props.inputs
+		.filter((selectable) => !selectedItems.value.hasOwnProperty(selectable.name))
+		.sort(itemComparator);
+});
+
+const sortedSelectedItems = computed(() => {
+	return Object.entries(selectedItems.value)
+		.map(([name, initialValue]) => ({
+			...inputMap.value[name],
+			initialValue,
+		}))
+		.sort(itemComparator);
+});
+
+function addToSelectedItems(name: string) {
+	selectedItems.value[name] = inputMap.value[name].initialValue;
+}
+
+function removeFromSelectedItems(name: string) {
+	delete selectedItems.value[name];
+}
+
+function itemComparator(a: Item, b: Item) {
+	return a.name.localeCompare(b.name);
+}
+</script>
+
+<template>
+	<div>
+		<div v-if="!disabled" :class="$style.selectableContainer">
+			<span
+				v-for="item in visibleSelectables"
+				:key="item.name"
+				:class="$style.selectableCell"
+				:data-test-id="`selectable-list-selectable-${item.name}`"
+				@click="!props.disabled && addToSelectedItems(item.name)"
+			>
+				<slot name="addItem" v-bind="item">
+					<div :class="$style.selectableTextSize">
+						{{ t('selectableList.addDefault') }} {{ item.name }}
+					</div>
+				</slot>
+			</span>
+		</div>
+		<div
+			v-for="item in sortedSelectedItems"
+			:key="item.name"
+			:class="$style.slotComboContainer"
+			:data-test-id="`selectable-list-slot-${item.name}`"
+		>
+			<N8nIcon
+				:class="$style.slotRemoveIcon"
+				size="xsmall"
+				:icon="disabled ? 'none' : 'trash'"
+				:data-test-id="`selectable-list-remove-slot-${item.name}`"
+				@click="!disabled && removeFromSelectedItems(item.name)"
+			/>
+			<div :class="$style.slotContainer">
+				<slot name="displayItem" v-bind="item" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.slotComboContainer {
+	display: flex;
+	flex-direction: row;
+	flex-grow: 1;
+	gap: var(--spacing-2xs);
+}
+
+.slotContainer {
+	flex-grow: 1;
+}
+
+.selectableContainer {
+	width: 100%;
+	flex-wrap: wrap;
+	display: flex;
+}
+.selectableCell {
+	display: flex;
+	margin-right: var(--spacing-3xs);
+
+	min-width: max-content;
+	border-radius: var(--border-radius-base);
+	font-size: small;
+	background-color: var(--color-ndv-background);
+	color: var(--text-color-dark);
+
+	cursor: pointer;
+
+	:hover {
+		color: var(--text-color-dark);
+	}
+}
+
+.selectableTextSize {
+	font-size: var(--font-size-2xs);
+	line-height: var(--font-line-height-loose);
+}
+
+.slotRemoveIcon {
+	color: var(--color-text-light);
+	height: 10px;
+	width: 10px;
+	margin-top: 3px;
+
+	:hover {
+		cursor: pointer;
+	}
+}
+</style>
diff --git a/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap b/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
new file mode 100644
index 0000000000..63397a468b
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
@@ -0,0 +1,28 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`N8nSelectableList > renders disabled collection without selectables 1`] = `
+"<div>
+  <!--v-if-->
+  <div class="slotComboContainer" data-test-id="selectable-list-slot-propB"><span class="n8n-text compact size-xsmall regular n8n-icon slotRemoveIcon slotRemoveIcon n8n-icon slotRemoveIcon slotRemoveIcon" data-test-id="selectable-list-remove-slot-propB"><!----></span>
+    <div class="slotContainer"></div>
+  </div>
+</div>"
+`;
+
+exports[`N8nSelectableList > renders multiple elements with some pre-selected 1`] = `
+"<div>
+  <div class="selectableContainer"><span class="selectableCell" data-test-id="selectable-list-selectable-propB"><div class="selectableTextSize">+ Add a propB</div></span><span class="selectableCell" data-test-id="selectable-list-selectable-propD"><div class="selectableTextSize">+ Add a propD</div></span></div>
+  <div class="slotComboContainer" data-test-id="selectable-list-slot-propA"><span class="n8n-text compact size-xsmall regular n8n-icon slotRemoveIcon slotRemoveIcon n8n-icon slotRemoveIcon slotRemoveIcon" data-test-id="selectable-list-remove-slot-propA"><!----></span>
+    <div class="slotContainer"></div>
+  </div>
+  <div class="slotComboContainer" data-test-id="selectable-list-slot-propC"><span class="n8n-text compact size-xsmall regular n8n-icon slotRemoveIcon slotRemoveIcon n8n-icon slotRemoveIcon slotRemoveIcon" data-test-id="selectable-list-remove-slot-propC"><!----></span>
+    <div class="slotContainer"></div>
+  </div>
+</div>"
+`;
+
+exports[`N8nSelectableList > renders when empty 1`] = `
+"<div>
+  <div class="selectableContainer"></div>
+</div>"
+`;
diff --git a/packages/design-system/src/components/N8nSelectableList/index.ts b/packages/design-system/src/components/N8nSelectableList/index.ts
new file mode 100644
index 0000000000..6c2d0e1127
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/index.ts
@@ -0,0 +1,3 @@
+import N8nSelectableList from './SelectableList.vue';
+
+export default N8nSelectableList;
diff --git a/packages/design-system/src/components/N8nUserStack/UserStack.test.ts b/packages/design-system/src/components/N8nUserStack/UserStack.test.ts
index 1b5ae600ae..5e2d1e10fa 100644
--- a/packages/design-system/src/components/N8nUserStack/UserStack.test.ts
+++ b/packages/design-system/src/components/N8nUserStack/UserStack.test.ts
@@ -1,8 +1,7 @@
 import { render } from '@testing-library/vue';
 
-import { N8nAvatar, N8nUserInfo } from 'n8n-design-system/main';
-
 import UserStack from './UserStack.vue';
+import { N8nAvatar, N8nUserInfo } from '../index';
 
 describe('UserStack', () => {
 	it('should render flat user list', () => {
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index ce4360fe46..6b584b8e8e 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -33,6 +33,7 @@ export { default as N8nNodeCreatorNode } from './N8nNodeCreatorNode';
 export { default as N8nNodeIcon } from './N8nNodeIcon';
 export { default as N8nNotice } from './N8nNotice';
 export { default as N8nOption } from './N8nOption';
+export { default as N8nSelectableList } from './N8nSelectableList';
 export { default as N8nPopover } from './N8nPopover';
 export { default as N8nPulse } from './N8nPulse';
 export { default as N8nRadioButtons } from './N8nRadioButtons';
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 00eeafb981..051de41601 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -227,6 +227,7 @@
 	--color-notification-background: var(--prim-gray-740);
 
 	// Execution
+	--execution-card-background: var(--color-foreground-light);
 	--execution-card-background-hover: var(--color-foreground-base);
 	--execution-selector-background: var(--prim-gray-740);
 	--execution-selector-text: var(--color-text-base);
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 3b6b7451be..50c98ac2ee 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -37,6 +37,8 @@
 	// Danger
 	--color-danger-shade-1: var(--prim-color-alt-c-shade-100);
 	--color-danger: var(--prim-color-alt-c);
+	--color-danger-light: var(--prim-color-alt-c-tint-150);
+	--color-danger-light-2: var(--prim-color-alt-c-tint-250);
 	--color-danger-tint-1: var(--prim-color-alt-c-tint-400);
 	--color-danger-tint-2: var(--prim-color-alt-c-tint-450);
 
@@ -287,6 +289,7 @@
 	--execution-card-border-waiting: var(--prim-color-secondary-tint-300);
 	--execution-card-border-running: var(--prim-color-alt-b-tint-250);
 	--execution-card-border-unknown: var(--prim-gray-120);
+	--execution-card-background: var(--color-foreground-xlight);
 	--execution-card-background-hover: var(--color-foreground-light);
 	--execution-card-text-waiting: var(--color-secondary);
 	--execution-selector-background: var(--color-background-dark);
diff --git a/packages/design-system/src/main.ts b/packages/design-system/src/index.ts
similarity index 74%
rename from packages/design-system/src/main.ts
rename to packages/design-system/src/index.ts
index dddb89f888..d96d74532f 100644
--- a/packages/design-system/src/main.ts
+++ b/packages/design-system/src/index.ts
@@ -1,6 +1,5 @@
 import * as locale from './locale';
 
-export { useDeviceSupport } from './composables/useDeviceSupport';
 export * from './components';
 export * from './plugin';
 export * from './types';
diff --git a/packages/design-system/src/locale/lang/en.ts b/packages/design-system/src/locale/lang/en.ts
index 35f2fd9f0e..3743bf92c6 100644
--- a/packages/design-system/src/locale/lang/en.ts
+++ b/packages/design-system/src/locale/lang/en.ts
@@ -51,4 +51,5 @@ export default {
 	'iconPicker.button.defaultToolTip': 'Choose icon',
 	'iconPicker.tabs.icons': 'Icons',
 	'iconPicker.tabs.emojis': 'Emojis',
+	'selectableList.addDefault': '+ Add a',
 } as N8nLocale;
diff --git a/packages/design-system/tsconfig.json b/packages/design-system/tsconfig.json
index 1b96b238c1..4a3a72f3fc 100644
--- a/packages/design-system/tsconfig.json
+++ b/packages/design-system/tsconfig.json
@@ -1,16 +1,10 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": "@n8n/frontend-typescript-config",
 	"compilerOptions": {
-		"rootDir": ".",
-		"outDir": "dist",
-		"target": "esnext",
-		"module": "esnext",
-		"importHelpers": true,
-		"allowJs": true,
-		"incremental": false,
-		"allowSyntheticDefaultImports": true,
 		"baseUrl": ".",
-		"types": ["vitest/globals"],
+		"rootDirs": [".", "../../frontend/@n8n/composables/src"],
+		"outDir": "dist",
+		"types": ["vite/client", "vitest/globals"],
 		"typeRoots": [
 			"./node_modules/@testing-library",
 			"./node_modules/@types",
@@ -18,12 +12,9 @@
 			"../../node_modules/@types"
 		],
 		"paths": {
-			"n8n-design-system/*": ["./src/*"]
-		},
-		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
-		// TODO: remove all options below this line
-		"noImplicitAny": false,
-		"noImplicitReturns": false
+			"n8n-design-system*": ["./src*"],
+			"@n8n/composables*": ["../frontend/@n8n/composables/src*"]
+		}
 	},
 	"include": ["src/**/*.ts", "src/**/*.vue"]
 }
diff --git a/packages/design-system/vite.config.mts b/packages/design-system/vite.config.mts
index 783218b793..1a6c504c02 100644
--- a/packages/design-system/vite.config.mts
+++ b/packages/design-system/vite.config.mts
@@ -1,35 +1,12 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
-import { type UserConfig } from 'vitest';
-import { defineConfig as defineVitestConfig } from 'vitest/config';
 import components from 'unplugin-vue-components/vite';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
+import { vitestConfig } from '@n8n/frontend-vitest-config';
 
-export const vitestConfig = defineVitestConfig({
-	test: {
-		silent: true,
-		globals: true,
-		environment: 'jsdom',
-		setupFiles: ['./src/__tests__/setup.ts'],
-		...(process.env.COVERAGE_ENABLED === 'true'
-			? {
-					coverage: {
-						enabled: true,
-						provider: 'v8',
-						reporter: process.env.CI === 'true' ? 'cobertura' : 'text-summary',
-						all: true,
-					},
-				}
-			: {}),
-		css: {
-			modules: {
-				classNameStrategy: 'non-scoped',
-			},
-		},
-	},
-}) as UserConfig;
+const frontendDir = resolve(__dirname, '..', 'frontend');
 
 export default mergeConfig(
 	defineConfig({
@@ -53,12 +30,13 @@ export default mergeConfig(
 			alias: {
 				'@': resolve(__dirname, 'src'),
 				'n8n-design-system': resolve(__dirname, 'src'),
+				'@n8n/composables(.*)': resolve(frontendDir, '@n8n', 'composables', 'src$1'),
 				lodash: 'lodash-es',
 			},
 		},
 		build: {
 			lib: {
-				entry: resolve(__dirname, 'src', 'main.ts'),
+				entry: resolve(__dirname, 'src', 'index.ts'),
 				name: 'N8nDesignSystem',
 				fileName: (format) => `n8n-design-system.${format}.js`,
 			},
diff --git a/packages/editor-ui/.eslintrc.js b/packages/editor-ui/.eslintrc.js
index 96dcf7d915..a32d3a3d62 100644
--- a/packages/editor-ui/.eslintrc.js
+++ b/packages/editor-ui/.eslintrc.js
@@ -1,13 +1,9 @@
-const sharedOptions = require('@n8n_io/eslint-config/shared');
+const { createFrontendEslintConfig } = require('@n8n/frontend-eslint-config');
 
 /**
  * @type {import('@types/eslint').ESLint.ConfigData}
  */
-module.exports = {
-	extends: ['@n8n_io/eslint-config/frontend'],
-
-	...sharedOptions(__dirname, 'frontend'),
-
+module.exports = createFrontendEslintConfig(__dirname, {
 	rules: {
 		'n8n-local-rules/dangerously-use-html-string-missing': 'error',
 
@@ -41,4 +37,4 @@ module.exports = {
 		'@typescript-eslint/no-redundant-type-constituents': 'warn',
 		'@typescript-eslint/no-unsafe-enum-comparison': 'warn',
 	},
-};
+});
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index ed37d52ca5..5978a2e453 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.74.1",
+  "version": "1.78.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
@@ -39,14 +39,15 @@
     "@n8n/chat": "workspace:*",
     "@n8n/codemirror-lang": "workspace:*",
     "@n8n/codemirror-lang-sql": "^1.0.2",
+    "@n8n/composables": "workspace:*",
     "@n8n/permissions": "workspace:*",
     "@replit/codemirror-indentation-markers": "^6.5.3",
-    "@typescript/vfs": "^1.6.0",
     "@sentry/vue": "catalog:frontend",
+    "@typescript/vfs": "^1.6.0",
     "@vue-flow/background": "^1.3.2",
     "@vue-flow/controls": "^1.1.2",
-    "@vue-flow/core": "^1.41.6",
-    "@vue-flow/minimap": "^1.5.0",
+    "@vue-flow/core": "^1.42.1",
+    "@vue-flow/minimap": "^1.5.2",
     "@vue-flow/node-resizer": "^1.4.0",
     "@vueuse/components": "^10.11.0",
     "@vueuse/core": "^10.11.0",
@@ -55,7 +56,9 @@
     "change-case": "^5.4.4",
     "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
+    "curlconverter": "^4.12.0",
     "comlink": "^4.4.1",
+    "core-js": "^3.40.0",
     "dateformat": "^3.0.3",
     "email-providers": "^2.0.1",
     "esprima-next": "5.8.4",
@@ -87,16 +90,21 @@
     "vue-router": "catalog:frontend",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vue3-touch-events": "^4.1.3",
+    "web-tree-sitter": "0.24.3",
     "vuedraggable": "4.1.0",
     "xss": "catalog:"
   },
   "devDependencies": {
+    "@n8n/frontend-eslint-config": "workspace:*",
+    "@n8n/frontend-vitest-config": "workspace:*",
+    "@n8n/frontend-typescript-config": "workspace:*",
     "@faker-js/faker": "^8.0.2",
     "@iconify/json": "^2.2.228",
     "@pinia/testing": "^0.1.6",
     "@types/dateformat": "^3.0.0",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
+    "@types/json-schema": "^7.0.15",
     "@types/jsonpath": "^0.2.0",
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
@@ -109,6 +117,7 @@
     "unplugin-icons": "^0.19.0",
     "unplugin-vue-components": "^0.27.2",
     "vite": "catalog:frontend",
+    "vite-plugin-static-copy": "2.2.0",
     "vite-svg-loader": "5.1.0",
     "vitest": "catalog:frontend",
     "vitest-mock-extended": "catalog:frontend",
diff --git a/packages/editor-ui/public/static/n8n-logo.png b/packages/editor-ui/public/static/n8n-logo.png
new file mode 100644
index 0000000000..2bb6b2d750
Binary files /dev/null and b/packages/editor-ui/public/static/n8n-logo.png differ
diff --git a/packages/editor-ui/public/static/og_image.png b/packages/editor-ui/public/static/og_image.png
new file mode 100644
index 0000000000..b5e13a5424
Binary files /dev/null and b/packages/editor-ui/public/static/og_image.png differ
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 6cdd045703..7f7e445fde 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -54,6 +54,7 @@ import type {
 	REGULAR_NODE_CREATOR_VIEW,
 	AI_OTHERS_NODE_CREATOR_VIEW,
 	ROLE,
+	AI_UNCATEGORIZED_CATEGORY,
 } from '@/constants';
 import type { BulkCommand, Undoable } from '@/models/history';
 
@@ -404,6 +405,7 @@ export interface IExecutionResponse extends IExecutionBase {
 	data?: IRunExecutionData;
 	workflowData: IWorkflowDb;
 	executedNode?: string;
+	triggerNode?: string;
 }
 
 export type ExecutionSummaryWithScopes = ExecutionSummary & { scopes: Scope[] };
@@ -740,6 +742,8 @@ export interface CreateElementBase {
 export interface NodeCreateElement extends CreateElementBase {
 	type: 'node';
 	subcategory: string;
+	resource?: string;
+	operation?: string;
 	properties: SimplifiedNodeType;
 }
 
@@ -886,7 +890,6 @@ export interface RootState {
 	endpointWebhook: string;
 	endpointWebhookTest: string;
 	endpointWebhookWaiting: string;
-	pushConnectionActive: boolean;
 	timezone: string;
 	executionTimeout: number;
 	maxExecutionTimeout: number;
@@ -1010,7 +1013,8 @@ export type NodeFilterType =
 	| typeof REGULAR_NODE_CREATOR_VIEW
 	| typeof TRIGGER_NODE_CREATOR_VIEW
 	| typeof AI_NODE_CREATOR_VIEW
-	| typeof AI_OTHERS_NODE_CREATOR_VIEW;
+	| typeof AI_OTHERS_NODE_CREATOR_VIEW
+	| typeof AI_UNCATEGORIZED_CATEGORY;
 
 export type NodeCreatorOpenSource =
 	| ''
@@ -1484,14 +1488,6 @@ export interface IN8nPromptResponse {
 	updated: boolean;
 }
 
-export type ApiKey = {
-	id: string;
-	label: string;
-	apiKey: string;
-	createdAt: string;
-	updatedAt: string;
-};
-
 export type InputPanel = {
 	nodeName?: string;
 	run?: number;
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
index 46e35a7d17..f1d16ed7e3 100644
--- a/packages/editor-ui/src/__tests__/defaults.ts
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -62,7 +62,13 @@ export const defaultSettings: FrontendSettings = {
 		disableSessionRecording: false,
 		enabled: false,
 	},
-	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
+	publicApi: {
+		apiKeysPerUserLimit: 0,
+		enabled: false,
+		latestVersion: 0,
+		path: '',
+		swaggerUi: { enabled: false },
+	},
 	pushBackend: 'websocket',
 	saveDataErrorExecution: 'all',
 	saveDataSuccessExecution: 'all',
@@ -131,4 +137,8 @@ export const defaultSettings: FrontendSettings = {
 	},
 	betaFeatures: [],
 	easyAIWorkflowOnboarded: false,
+	partialExecution: {
+		version: 1,
+		enforce: false,
+	},
 };
diff --git a/packages/editor-ui/src/__tests__/mocks.ts b/packages/editor-ui/src/__tests__/mocks.ts
index 15688de9ff..f514d809d9 100644
--- a/packages/editor-ui/src/__tests__/mocks.ts
+++ b/packages/editor-ui/src/__tests__/mocks.ts
@@ -54,7 +54,7 @@ export const mockNodeTypeDescription = ({
 	credentials = [],
 	inputs = [NodeConnectionType.Main],
 	outputs = [NodeConnectionType.Main],
-	codex = {},
+	codex = undefined,
 	properties = [],
 }: {
 	name?: INodeTypeDescription['name'];
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/editor-ui/src/__tests__/setup.ts
index 35bfe7aafb..934017e2ba 100644
--- a/packages/editor-ui/src/__tests__/setup.ts
+++ b/packages/editor-ui/src/__tests__/setup.ts
@@ -1,5 +1,6 @@
 import '@testing-library/jest-dom';
 import { configure } from '@testing-library/vue';
+import 'core-js/proposals/set-methods-v2';
 
 configure({ testIdAttribute: 'data-test-id' });
 
@@ -61,3 +62,25 @@ Object.defineProperty(window, 'matchMedia', {
 		dispatchEvent: vi.fn(),
 	})),
 });
+
+class Worker {
+	onmessage: (message: string) => void;
+
+	url: string;
+
+	constructor(url: string) {
+		this.url = url;
+		this.onmessage = () => {};
+	}
+
+	postMessage(message: string) {
+		this.onmessage(message);
+	}
+
+	addEventListener() {}
+}
+
+Object.defineProperty(window, 'Worker', {
+	writable: true,
+	value: Worker,
+});
diff --git a/packages/editor-ui/src/api/ai.ts b/packages/editor-ui/src/api/ai.ts
index 04c08c78f2..a6721d2652 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -1,6 +1,9 @@
+import { useAIAssistantHelpers } from '@/composables/useAIAssistantHelpers';
+import { AI_ASSISTANT_MAX_CONTENT_LENGTH } from '@/constants';
 import type { ICredentialsResponse, IRestApiContext } from '@/Interface';
 import type { AskAiRequest, ChatRequest, ReplaceCodeRequest } from '@/types/assistant.types';
 import { makeRestApiRequest, streamRequest } from '@/utils/apiUtils';
+import { getObjectSizeInKB } from '@/utils/objectUtils';
 import type { IDataObject } from 'n8n-workflow';
 
 export function chatWithAssistant(
@@ -10,6 +13,15 @@ export function chatWithAssistant(
 	onDone: () => void,
 	onError: (e: Error) => void,
 ): void {
+	try {
+		const payloadSize = getObjectSizeInKB(payload.payload);
+		if (payloadSize > AI_ASSISTANT_MAX_CONTENT_LENGTH) {
+			useAIAssistantHelpers().trimPayloadSize(payload);
+		}
+	} catch (e) {
+		onError(e);
+		return;
+	}
 	void streamRequest<ChatRequest.ResponsePayload>(
 		ctx,
 		'/ai/chat',
diff --git a/packages/editor-ui/src/api/api-keys.ts b/packages/editor-ui/src/api/api-keys.ts
index b4b44c8e13..c9af96f136 100644
--- a/packages/editor-ui/src/api/api-keys.ts
+++ b/packages/editor-ui/src/api/api-keys.ts
@@ -1,12 +1,21 @@
-import type { ApiKey, IRestApiContext } from '@/Interface';
+import type { IRestApiContext } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
+import type {
+	CreateApiKeyRequestDto,
+	UpdateApiKeyRequestDto,
+	ApiKey,
+	ApiKeyWithRawValue,
+} from '@n8n/api-types';
 
 export async function getApiKeys(context: IRestApiContext): Promise<ApiKey[]> {
 	return await makeRestApiRequest(context, 'GET', '/api-keys');
 }
 
-export async function createApiKey(context: IRestApiContext): Promise<ApiKey> {
-	return await makeRestApiRequest(context, 'POST', '/api-keys');
+export async function createApiKey(
+	context: IRestApiContext,
+	payload: CreateApiKeyRequestDto,
+): Promise<ApiKeyWithRawValue> {
+	return await makeRestApiRequest(context, 'POST', '/api-keys', payload);
 }
 
 export async function deleteApiKey(
@@ -15,3 +24,11 @@ export async function deleteApiKey(
 ): Promise<{ success: boolean }> {
 	return await makeRestApiRequest(context, 'DELETE', `/api-keys/${id}`);
 }
+
+export async function updateApiKey(
+	context: IRestApiContext,
+	id: string,
+	payload: UpdateApiKeyRequestDto,
+): Promise<{ success: boolean }> {
+	return await makeRestApiRequest(context, 'PATCH', `/api-keys/${id}`, payload);
+}
diff --git a/packages/editor-ui/src/api/credentials.ts b/packages/editor-ui/src/api/credentials.ts
index 6ddb37c16a..18bb7b3f3d 100644
--- a/packages/editor-ui/src/api/credentials.ts
+++ b/packages/editor-ui/src/api/credentials.ts
@@ -32,6 +32,7 @@ export async function getAllCredentials(
 ): Promise<ICredentialsResponse[]> {
 	return await makeRestApiRequest(context, 'GET', '/credentials', {
 		...(includeScopes ? { includeScopes } : {}),
+		includeData: true,
 		...(filter ? { filter } : {}),
 	});
 }
diff --git a/packages/editor-ui/src/api/curlHelper.ts b/packages/editor-ui/src/api/curlHelper.ts
deleted file mode 100644
index 5c09ab0b9a..0000000000
--- a/packages/editor-ui/src/api/curlHelper.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { CurlToJSONResponse, IRestApiContext } from '@/Interface';
-import { makeRestApiRequest } from '@/utils/apiUtils';
-
-export async function getCurlToJson(
-	context: IRestApiContext,
-	curlCommand: string,
-): Promise<CurlToJSONResponse> {
-	return await makeRestApiRequest(context, 'POST', '/curl/to-json', { curlCommand });
-}
diff --git a/packages/editor-ui/src/api/projects.api.ts b/packages/editor-ui/src/api/projects.api.ts
index 325feefc63..28e4f8abf7 100644
--- a/packages/editor-ui/src/api/projects.api.ts
+++ b/packages/editor-ui/src/api/projects.api.ts
@@ -1,21 +1,14 @@
 import type { IRestApiContext } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type {
-	Project,
-	ProjectCreateRequest,
-	ProjectListItem,
-	ProjectUpdateRequest,
-	ProjectsCount,
-} from '@/types/projects.types';
+import type { Project, ProjectListItem, ProjectsCount } from '@/types/projects.types';
+import type { CreateProjectDto, UpdateProjectDto } from '@n8n/api-types';
 
 export const getAllProjects = async (context: IRestApiContext): Promise<ProjectListItem[]> => {
 	return await makeRestApiRequest(context, 'GET', '/projects');
 };
 
 export const getMyProjects = async (context: IRestApiContext): Promise<ProjectListItem[]> => {
-	return await makeRestApiRequest(context, 'GET', '/projects/my-projects', {
-		includeScopes: true,
-	});
+	return await makeRestApiRequest(context, 'GET', '/projects/my-projects');
 };
 
 export const getPersonalProject = async (context: IRestApiContext): Promise<Project> => {
@@ -28,17 +21,17 @@ export const getProject = async (context: IRestApiContext, id: string): Promise<
 
 export const createProject = async (
 	context: IRestApiContext,
-	req: ProjectCreateRequest,
+	payload: CreateProjectDto,
 ): Promise<Project> => {
-	return await makeRestApiRequest(context, 'POST', '/projects', req);
+	return await makeRestApiRequest(context, 'POST', '/projects', payload);
 };
 
 export const updateProject = async (
 	context: IRestApiContext,
-	req: ProjectUpdateRequest,
+	id: Project['id'],
+	payload: UpdateProjectDto,
 ): Promise<void> => {
-	const { id, name, icon, relations } = req;
-	await makeRestApiRequest(context, 'PATCH', `/projects/${id}`, { name, icon, relations });
+	await makeRestApiRequest(context, 'PATCH', `/projects/${id}`, payload);
 };
 
 export const deleteProject = async (
diff --git a/packages/editor-ui/src/api/schemaPreview.ts b/packages/editor-ui/src/api/schemaPreview.ts
new file mode 100644
index 0000000000..9250993929
--- /dev/null
+++ b/packages/editor-ui/src/api/schemaPreview.ts
@@ -0,0 +1,28 @@
+import { request } from '@/utils/apiUtils';
+import type { JSONSchema7 } from 'json-schema';
+
+export type GetSchemaPreviewOptions = {
+	nodeType: string;
+	version: number;
+	resource?: string;
+	operation?: string;
+};
+
+const padVersion = (version: number) => {
+	return version.toString().split('.').concat(['0', '0']).slice(0, 3).join('.');
+};
+
+export const getSchemaPreview = async (
+	baseUrl: string,
+	options: GetSchemaPreviewOptions,
+): Promise<JSONSchema7> => {
+	const { nodeType, version, resource, operation } = options;
+	const versionString = padVersion(version);
+	const path = ['schemas', nodeType, versionString, resource, operation].filter(Boolean).join('/');
+	return await request({
+		method: 'GET',
+		baseURL: baseUrl,
+		endpoint: `${path}.json`,
+		withCredentials: false,
+	});
+};
diff --git a/packages/editor-ui/src/api/sourceControl.ts b/packages/editor-ui/src/api/sourceControl.ts
index c8e4eebcbc..4553856928 100644
--- a/packages/editor-ui/src/api/sourceControl.ts
+++ b/packages/editor-ui/src/api/sourceControl.ts
@@ -1,7 +1,10 @@
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	PullWorkFolderRequestDto,
+	PushWorkFolderRequestDto,
+	SourceControlledFile,
+} from '@n8n/api-types';
 import type { IRestApiContext } from '@/Interface';
 import type {
-	SourceControlAggregatedFile,
 	SourceControlPreferences,
 	SourceControlStatus,
 	SshKeyTypes,
@@ -22,15 +25,15 @@ const createPreferencesRequestFn =
 
 export const pushWorkfolder = async (
 	context: IRestApiContext,
-	data: IDataObject,
+	data: PushWorkFolderRequestDto,
 ): Promise<void> => {
 	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/push-workfolder`, data);
 };
 
 export const pullWorkfolder = async (
 	context: IRestApiContext,
-	data: IDataObject,
-): Promise<void> => {
+	data: PullWorkFolderRequestDto,
+): Promise<SourceControlledFile[]> => {
 	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/pull-workfolder`, data);
 };
 
@@ -60,7 +63,7 @@ export const getAggregatedStatus = async (
 		preferLocalVersion: boolean;
 		verbose: boolean;
 	} = { direction: 'push', preferLocalVersion: true, verbose: false },
-): Promise<SourceControlAggregatedFile[]> => {
+): Promise<SourceControlledFile[]> => {
 	return await makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/get-status`, options);
 };
 
diff --git a/packages/editor-ui/src/api/tags.ts b/packages/editor-ui/src/api/tags.ts
index 0e429b6433..d85f84cb5d 100644
--- a/packages/editor-ui/src/api/tags.ts
+++ b/packages/editor-ui/src/api/tags.ts
@@ -1,29 +1,26 @@
 import type { IRestApiContext, ITag } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { CreateOrUpdateTagRequestDto, RetrieveTagQueryDto } from '@n8n/api-types';
 
 type TagsApiEndpoint = '/tags' | '/annotation-tags';
 
-export interface ITagsApi {
-	getTags: (context: IRestApiContext, withUsageCount?: boolean) => Promise<ITag[]>;
-	createTag: (context: IRestApiContext, params: { name: string }) => Promise<ITag>;
-	updateTag: (context: IRestApiContext, id: string, params: { name: string }) => Promise<ITag>;
-	deleteTag: (context: IRestApiContext, id: string) => Promise<boolean>;
-}
-
-export function createTagsApi(endpoint: TagsApiEndpoint): ITagsApi {
+export function createTagsApi(endpoint: TagsApiEndpoint) {
 	return {
-		getTags: async (context: IRestApiContext, withUsageCount = false): Promise<ITag[]> => {
-			return await makeRestApiRequest(context, 'GET', endpoint, { withUsageCount });
+		getTags: async (context: IRestApiContext, data: RetrieveTagQueryDto): Promise<ITag[]> => {
+			return await makeRestApiRequest(context, 'GET', endpoint, data);
 		},
-		createTag: async (context: IRestApiContext, params: { name: string }): Promise<ITag> => {
-			return await makeRestApiRequest(context, 'POST', endpoint, params);
+		createTag: async (
+			context: IRestApiContext,
+			data: CreateOrUpdateTagRequestDto,
+		): Promise<ITag> => {
+			return await makeRestApiRequest(context, 'POST', endpoint, data);
 		},
 		updateTag: async (
 			context: IRestApiContext,
 			id: string,
-			params: { name: string },
+			data: CreateOrUpdateTagRequestDto,
 		): Promise<ITag> => {
-			return await makeRestApiRequest(context, 'PATCH', `${endpoint}/${id}`, params);
+			return await makeRestApiRequest(context, 'PATCH', `${endpoint}/${id}`, data);
 		},
 		deleteTag: async (context: IRestApiContext, id: string): Promise<boolean> => {
 			return await makeRestApiRequest(context, 'DELETE', `${endpoint}/${id}`);
diff --git a/packages/editor-ui/src/api/testDefinition.ee.ts b/packages/editor-ui/src/api/testDefinition.ee.ts
index c515b7a783..52e344d608 100644
--- a/packages/editor-ui/src/api/testDefinition.ee.ts
+++ b/packages/editor-ui/src/api/testDefinition.ee.ts
@@ -11,7 +11,7 @@ export interface TestDefinitionRecord {
 	updatedAt?: string;
 	createdAt?: string;
 	annotationTag?: string | null;
-	mockedNodes?: Array<{ name: string }>;
+	mockedNodes?: Array<{ name: string; id: string }>;
 }
 
 interface CreateTestDefinitionParams {
@@ -25,7 +25,7 @@ export interface UpdateTestDefinitionParams {
 	evaluationWorkflowId?: string | null;
 	annotationTagId?: string | null;
 	description?: string | null;
-	mockedNodes?: Array<{ name: string }>;
+	mockedNodes?: Array<{ name: string; id: string }>;
 }
 
 export interface UpdateTestResponse {
@@ -43,7 +43,7 @@ export interface UpdateTestResponse {
 export interface TestRunRecord {
 	id: string;
 	testDefinitionId: string;
-	status: 'new' | 'running' | 'completed' | 'error';
+	status: 'new' | 'running' | 'completed' | 'error' | 'cancelled';
 	metrics?: Record<string, number>;
 	createdAt: string;
 	updatedAt: string;
@@ -61,6 +61,21 @@ interface DeleteTestRunParams {
 	runId: string;
 }
 
+export interface TestCaseExecutionRecord {
+	id: string;
+	testRunId: string;
+	executionId: string;
+	pastExecutionId: string;
+	evaluationExecutionId: string;
+	status: 'running' | 'completed' | 'error';
+	createdAt: string;
+	updatedAt: string;
+	runAt: string;
+	metrics?: Record<string, number>;
+	errorCode?: string;
+	errorDetails?: Record<string, unknown>;
+}
+
 const endpoint = '/evaluation/test-definitions';
 const getMetricsEndpoint = (testDefinitionId: string, metricId?: string) =>
 	`${endpoint}/${testDefinitionId}/metrics${metricId ? `/${metricId}` : ''}`;
@@ -221,6 +236,21 @@ export const startTestRun = async (context: IRestApiContext, testDefinitionId: s
 	return response as { success: boolean };
 };
 
+export const cancelTestRun = async (
+	context: IRestApiContext,
+	testDefinitionId: string,
+	testRunId: string,
+) => {
+	const response = await request({
+		method: 'POST',
+		baseURL: context.baseUrl,
+		endpoint: `${endpoint}/${testDefinitionId}/runs/${testRunId}/cancel`,
+		headers: { 'push-ref': context.pushRef },
+	});
+	// CLI is returning the response without wrapping it in `data` key
+	return response as { success: boolean };
+};
+
 // Delete a test run
 export const deleteTestRun = async (context: IRestApiContext, params: DeleteTestRunParams) => {
 	return await makeRestApiRequest<{ success: boolean }>(
@@ -229,3 +259,19 @@ export const deleteTestRun = async (context: IRestApiContext, params: DeleteTest
 		getRunsEndpoint(params.testDefinitionId, params.runId),
 	);
 };
+
+const getRunExecutionsEndpoint = (testDefinitionId: string, runId: string) =>
+	`${endpoint}/${testDefinitionId}/runs/${runId}/cases`;
+
+// Get all test cases of a test run
+export const getTestCaseExecutions = async (
+	context: IRestApiContext,
+	testDefinitionId: string,
+	runId: string,
+) => {
+	return await makeRestApiRequest<TestCaseExecutionRecord[]>(
+		context,
+		'GET',
+		getRunExecutionsEndpoint(testDefinitionId, runId),
+	);
+};
diff --git a/packages/editor-ui/src/components/AiStarsIcon.vue b/packages/editor-ui/src/components/AiStarsIcon.vue
new file mode 100644
index 0000000000..44958d7feb
--- /dev/null
+++ b/packages/editor-ui/src/components/AiStarsIcon.vue
@@ -0,0 +1,37 @@
+<script setup lang="ts">
+withDefaults(
+	defineProps<{
+		size?: 'mini' | 'small' | 'medium' | 'large';
+	}>(),
+	{
+		size: 'medium',
+	},
+);
+
+const sizes = {
+	mini: 8,
+	small: 10,
+	medium: 12,
+	large: 16,
+};
+</script>
+
+<template>
+	<svg
+		:width="sizes[size]"
+		:height="sizes[size]"
+		viewBox="0 0 16 16"
+		fill="none"
+		xmlns="http://www.w3.org/2000/svg"
+	>
+		<g id="NodeIcon">
+			<path
+				id="Union"
+				fill-rule="evenodd"
+				clip-rule="evenodd"
+				d="M15.7982 7.80784L13.92 7.20243C12.7186 6.80602 12.0148 5.83386 11.6844 4.61226L10.8579 0.586096C10.8363 0.506544 10.7837 0.400024 10.6219 0.400024C10.4857 0.400024 10.4075 0.506544 10.386 0.586096L9.55943 4.61361C9.22773 5.83521 8.52525 6.80737 7.32387 7.20378L5.44562 7.80919C5.18 7.89548 5.17595 8.27032 5.44023 8.36066L7.33196 9.01191C8.52929 9.40968 9.22773 10.3805 9.55943 11.5967L10.3873 15.5784C10.4089 15.6579 10.4534 15.8008 10.6233 15.8008C10.7991 15.8008 10.8362 15.6634 10.858 15.5831L10.8592 15.5784L11.6871 11.5967C12.0188 10.3791 12.7173 9.40833 13.9146 9.01191L15.8063 8.36066C16.0679 8.26897 16.0639 7.89413 15.7982 7.80784ZM5.04114 11.3108C3.92815 10.9434 3.81743 10.5296 3.63184 9.83597L3.62672 9.81687L3.15615 8.16649C3.12784 8.05997 2.85008 8.05997 2.82041 8.16649L2.50085 9.69147C2.31074 10.394 1.90623 10.9522 1.21588 11.18L0.11563 11.6574C-0.0367335 11.7072 -0.0394302 11.923 0.112933 11.9742L1.22127 12.3666C1.90893 12.5945 2.31074 13.1527 2.5022 13.8525L2.82176 15.3114C2.85142 15.4179 3.12784 15.4179 3.15615 15.3114L3.53099 13.8592C3.72111 13.1554 4.01235 12.5958 4.94675 12.3666L5.98768 11.9742C6.14004 11.9216 6.13869 11.7059 5.98498 11.656L5.04114 11.3108ZM5.33019 0.812949C5.36674 0.661849 5.58158 0.659434 5.61894 0.811355L5.61899 0.811582L6.02856 2.50239C6.08442 2.69624 6.23624 2.8465 6.43132 2.89951L7.47286 3.18013C7.61383 3.2197 7.61829 3.41714 7.48035 3.46394L7.48015 3.46401L6.38799 3.83076C6.21241 3.88968 6.07619 4.03027 6.02153 4.20719L5.61894 5.77311L5.61884 5.77349C5.58095 5.92613 5.36829 5.91987 5.33166 5.77336L4.94237 4.21215C4.88888 4.03513 4.75378 3.89336 4.57956 3.83328L3.48805 3.4555C3.34919 3.40591 3.36033 3.20859 3.50031 3.17175L3.50054 3.17169L4.53472 2.90337C4.73486 2.85153 4.89134 2.69755 4.94463 2.49805L5.33019 0.812949Z"
+				fill="currentColor"
+			/>
+		</g>
+	</svg>
+</template>
diff --git a/packages/editor-ui/src/components/ApiKeyCard.vue b/packages/editor-ui/src/components/ApiKeyCard.vue
new file mode 100644
index 0000000000..0c3fe82975
--- /dev/null
+++ b/packages/editor-ui/src/components/ApiKeyCard.vue
@@ -0,0 +1,125 @@
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import type { ApiKey } from '@n8n/api-types';
+import { DateTime } from 'luxon';
+
+const API_KEY_ITEM_ACTIONS = {
+	EDIT: 'edit',
+	DELETE: 'delete',
+};
+
+const ACTION_LIST = [
+	{
+		label: 'Edit',
+		value: API_KEY_ITEM_ACTIONS.EDIT,
+	},
+	{
+		label: 'Delete',
+		value: API_KEY_ITEM_ACTIONS.DELETE,
+	},
+];
+
+const i18n = useI18n();
+const cardActions = ref<HTMLDivElement | null>(null);
+
+const props = defineProps<{
+	apiKey: ApiKey;
+}>();
+
+const emit = defineEmits<{
+	edit: [id: string];
+	delete: [id: string];
+}>();
+
+async function onAction(action: string) {
+	if (action === API_KEY_ITEM_ACTIONS.EDIT) {
+		emit('edit', props.apiKey.id);
+	} else if (action === API_KEY_ITEM_ACTIONS.DELETE) {
+		emit('delete', props.apiKey.id);
+	}
+}
+
+const hasApiKeyExpired = (apiKey: ApiKey) => {
+	if (!apiKey.expiresAt) return false;
+	return apiKey.expiresAt <= Date.now() / 1000;
+};
+
+const getExpirationTime = (apiKey: ApiKey): string => {
+	if (!apiKey.expiresAt) return i18n.baseText('settings.api.neverExpires');
+
+	if (hasApiKeyExpired(apiKey)) return i18n.baseText('settings.api.expired');
+
+	const time = DateTime.fromSeconds(apiKey.expiresAt).toFormat('ccc, MMM d yyyy');
+
+	return i18n.baseText('settings.api.expirationTime', { interpolate: { time } });
+};
+</script>
+
+<template>
+	<n8n-card :class="$style.cardLink" data-test-id="api-key-card" @click="onAction('edit')">
+		<template #header>
+			<div>
+				<n8n-heading tag="h2" bold :class="$style.cardHeading">
+					{{ apiKey.label }}
+				</n8n-heading>
+				<div :class="[$style.cardDescription]">
+					<n8n-text :color="!hasApiKeyExpired(apiKey) ? 'text-light' : 'warning'" size="small">
+						<span>{{ getExpirationTime(apiKey) }}</span>
+					</n8n-text>
+				</div>
+			</div>
+			<div v-if="apiKey.apiKey.includes('*')" :class="$style.cardApiKey">
+				<n8n-text color="text-light" size="small"> {{ apiKey.apiKey }}</n8n-text>
+			</div>
+		</template>
+
+		<template #append>
+			<div ref="cardActions" :class="$style.cardActions">
+				<n8n-action-toggle :actions="ACTION_LIST" theme="dark" @action="onAction" />
+			</div>
+		</template>
+	</n8n-card>
+</template>
+
+<style lang="scss" module>
+.cardLink {
+	transition: box-shadow 0.3s ease;
+	cursor: pointer;
+	padding: 0 0 0 var(--spacing-s);
+	align-items: stretch;
+
+	&:hover {
+		box-shadow: 0 2px 8px rgba(#441c17, 0.1);
+	}
+}
+
+.cardHeading {
+	font-size: var(--font-size-s);
+	word-break: word-break;
+	padding: var(--spacing-s) 0 0 var(--spacing-s);
+	width: 200px;
+}
+
+.cardDescription {
+	min-height: 19px;
+	display: flex;
+	align-items: center;
+	padding: 0 0 var(--spacing-s) var(--spacing-s);
+}
+
+.cardActions {
+	display: flex;
+	flex-direction: row;
+	justify-content: center;
+	align-items: center;
+	padding: 0 var(--spacing-s) 0 0;
+	cursor: default;
+}
+
+.cardApiKey {
+	flex-grow: 1;
+	display: flex;
+	justify-content: center;
+}
+</style>
diff --git a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts b/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts
new file mode 100644
index 0000000000..3aac4e2434
--- /dev/null
+++ b/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.test.ts
@@ -0,0 +1,235 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import { API_KEY_CREATE_OR_EDIT_MODAL_KEY, STORES } from '@/constants';
+import { cleanupAppModals, createAppModals, mockedStore, retry } from '@/__tests__/utils';
+import ApiKeyEditModal from './ApiKeyCreateOrEditModal.vue';
+import { fireEvent } from '@testing-library/vue';
+
+import { useApiKeysStore } from '@/stores/apiKeys.store';
+import { DateTime } from 'luxon';
+import type { ApiKeyWithRawValue } from '@n8n/api-types';
+
+const renderComponent = createComponentRenderer(ApiKeyEditModal, {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.UI]: {
+				modalsById: {
+					[API_KEY_CREATE_OR_EDIT_MODAL_KEY]: { open: true },
+				},
+			},
+		},
+	}),
+});
+
+const testApiKey: ApiKeyWithRawValue = {
+	id: '123',
+	label: 'new api key',
+	apiKey: '123456***',
+	createdAt: new Date().toString(),
+	updatedAt: new Date().toString(),
+	rawApiKey: '123456',
+	expiresAt: 0,
+};
+
+const apiKeysStore = mockedStore(useApiKeysStore);
+
+describe('ApiKeyCreateOrEditModal', () => {
+	beforeEach(() => {
+		createAppModals();
+	});
+
+	afterEach(() => {
+		cleanupAppModals();
+		vi.clearAllMocks();
+	});
+
+	test('should allow creating API key with default expiration (30 days)', async () => {
+		apiKeysStore.createApiKey.mockResolvedValue(testApiKey);
+
+		const { getByText, getByPlaceholderText } = renderComponent({
+			props: {
+				mode: 'new',
+			},
+		});
+
+		await retry(() => expect(getByText('Create API Key')).toBeInTheDocument());
+		expect(getByText('Label')).toBeInTheDocument();
+
+		const inputLabel = getByPlaceholderText('e.g Internal Project');
+		const saveButton = getByText('Save');
+
+		expect(inputLabel).toBeInTheDocument();
+		expect(saveButton).toBeInTheDocument();
+
+		await fireEvent.update(inputLabel, 'new label');
+
+		await fireEvent.click(saveButton);
+
+		expect(getByText('API Key Created')).toBeInTheDocument();
+
+		expect(getByText('Done')).toBeInTheDocument();
+
+		expect(
+			getByText('Make sure to copy your API key now as you will not be able to see this again.'),
+		).toBeInTheDocument();
+
+		expect(getByText('You can find more details in')).toBeInTheDocument();
+
+		expect(getByText('the API documentation')).toBeInTheDocument();
+
+		expect(getByText('Click to copy')).toBeInTheDocument();
+
+		expect(getByText('new api key')).toBeInTheDocument();
+	});
+
+	test('should allow creating API key with custom expiration', async () => {
+		apiKeysStore.createApiKey.mockResolvedValue({
+			id: '123',
+			label: 'new api key',
+			apiKey: '123456',
+			createdAt: new Date().toString(),
+			updatedAt: new Date().toString(),
+			rawApiKey: '***456',
+			expiresAt: 0,
+		});
+
+		const { getByText, getByPlaceholderText, getByTestId } = renderComponent({
+			props: {
+				mode: 'new',
+			},
+		});
+
+		await retry(() => expect(getByText('Create API Key')).toBeInTheDocument());
+		expect(getByText('Label')).toBeInTheDocument();
+
+		const inputLabel = getByPlaceholderText('e.g Internal Project');
+		const saveButton = getByText('Save');
+		const expirationSelect = getByTestId('expiration-select');
+
+		expect(inputLabel).toBeInTheDocument();
+		expect(saveButton).toBeInTheDocument();
+		expect(expirationSelect).toBeInTheDocument();
+
+		await fireEvent.update(inputLabel, 'new label');
+
+		await fireEvent.click(expirationSelect);
+
+		const customOption = getByText('Custom');
+
+		expect(customOption).toBeInTheDocument();
+
+		await fireEvent.click(customOption);
+
+		const customExpirationInput = getByPlaceholderText('yyyy-mm-dd');
+
+		expect(customExpirationInput).toBeInTheDocument();
+
+		await fireEvent.input(customExpirationInput, '2029-12-31');
+
+		await fireEvent.click(saveButton);
+
+		expect(getByText('***456')).toBeInTheDocument();
+
+		expect(getByText('API Key Created')).toBeInTheDocument();
+
+		expect(getByText('Done')).toBeInTheDocument();
+
+		expect(
+			getByText('Make sure to copy your API key now as you will not be able to see this again.'),
+		).toBeInTheDocument();
+
+		expect(getByText('You can find more details in')).toBeInTheDocument();
+
+		expect(getByText('the API documentation')).toBeInTheDocument();
+
+		expect(getByText('Click to copy')).toBeInTheDocument();
+
+		expect(getByText('new api key')).toBeInTheDocument();
+	});
+
+	test('should allow creating API key with no expiration', async () => {
+		apiKeysStore.createApiKey.mockResolvedValue(testApiKey);
+
+		const { getByText, getByPlaceholderText, getByTestId } = renderComponent({
+			props: {
+				mode: 'new',
+			},
+		});
+
+		await retry(() => expect(getByText('Create API Key')).toBeInTheDocument());
+		expect(getByText('Label')).toBeInTheDocument();
+
+		const inputLabel = getByPlaceholderText('e.g Internal Project');
+		const saveButton = getByText('Save');
+		const expirationSelect = getByTestId('expiration-select');
+
+		expect(inputLabel).toBeInTheDocument();
+		expect(saveButton).toBeInTheDocument();
+		expect(expirationSelect).toBeInTheDocument();
+
+		await fireEvent.update(inputLabel, 'new label');
+
+		await fireEvent.click(expirationSelect);
+
+		const noExpirationOption = getByText('No Expiration');
+
+		expect(noExpirationOption).toBeInTheDocument();
+
+		await fireEvent.click(noExpirationOption);
+
+		await fireEvent.click(saveButton);
+
+		expect(getByText('API Key Created')).toBeInTheDocument();
+
+		expect(getByText('Done')).toBeInTheDocument();
+
+		expect(
+			getByText('Make sure to copy your API key now as you will not be able to see this again.'),
+		).toBeInTheDocument();
+
+		expect(getByText('You can find more details in')).toBeInTheDocument();
+
+		expect(getByText('the API documentation')).toBeInTheDocument();
+
+		expect(getByText('Click to copy')).toBeInTheDocument();
+
+		expect(getByText('new api key')).toBeInTheDocument();
+	});
+
+	test('should allow editing API key label', async () => {
+		apiKeysStore.apiKeys = [testApiKey];
+
+		apiKeysStore.updateApiKey.mockResolvedValue();
+
+		const { getByText, getByTestId } = renderComponent({
+			props: {
+				mode: 'edit',
+				activeId: '123',
+			},
+		});
+
+		await retry(() => expect(getByText('Edit API Key')).toBeInTheDocument());
+
+		expect(getByText('Label')).toBeInTheDocument();
+
+		const formattedDate = DateTime.fromMillis(Date.parse(testApiKey.createdAt)).toFormat(
+			'ccc, MMM d yyyy',
+		);
+
+		expect(getByText(`API key was created on ${formattedDate}`)).toBeInTheDocument();
+
+		const labelInput = getByTestId('api-key-label');
+
+		expect((labelInput as unknown as HTMLInputElement).value).toBe('new api key');
+
+		await fireEvent.update(labelInput, 'updated api key');
+
+		const editButton = getByText('Edit');
+
+		expect(editButton).toBeInTheDocument();
+
+		await fireEvent.click(editButton);
+
+		expect(apiKeysStore.updateApiKey).toHaveBeenCalledWith('123', { label: 'updated api key' });
+	});
+});
diff --git a/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue b/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
new file mode 100644
index 0000000000..2ce3eb050a
--- /dev/null
+++ b/packages/editor-ui/src/components/ApiKeyCreateOrEditModal.vue
@@ -0,0 +1,389 @@
+<script lang="ts" setup>
+import Modal from '@/components/Modal.vue';
+import { API_KEY_CREATE_OR_EDIT_MODAL_KEY, DOCS_DOMAIN } from '@/constants';
+import { computed, onMounted, ref } from 'vue';
+import { useUIStore } from '@/stores/ui.store';
+import { createEventBus } from 'n8n-design-system/utils';
+import { useI18n } from '@/composables/useI18n';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useRootStore } from '@/stores/root.store';
+import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { useApiKeysStore } from '@/stores/apiKeys.store';
+import { useToast } from '@/composables/useToast';
+import type { BaseTextKey } from '@/plugins/i18n';
+import { N8nText } from 'n8n-design-system';
+import { DateTime } from 'luxon';
+import type { ApiKey, ApiKeyWithRawValue, CreateApiKeyRequestDto } from '@n8n/api-types';
+
+const EXPIRATION_OPTIONS = {
+	'7_DAYS': 7,
+	'30_DAYS': 30,
+	'60_DAYS': 60,
+	'90_DAYS': 90,
+	CUSTOM: 1,
+	NO_EXPIRATION: 0,
+};
+
+const i18n = useI18n();
+const { showError, showMessage } = useToast();
+
+const uiStore = useUIStore();
+const rootStore = useRootStore();
+const settingsStore = useSettingsStore();
+const { isSwaggerUIEnabled, publicApiPath, publicApiLatestVersion } = settingsStore;
+const { createApiKey, updateApiKey, apiKeysById } = useApiKeysStore();
+const { baseUrl } = useRootStore();
+const documentTitle = useDocumentTitle();
+
+const label = ref('');
+const expirationDaysFromNow = ref(EXPIRATION_OPTIONS['30_DAYS']);
+const modalBus = createEventBus();
+const newApiKey = ref<ApiKeyWithRawValue | null>(null);
+const apiDocsURL = ref('');
+const loading = ref(false);
+const rawApiKey = ref('');
+const customExpirationDate = ref('');
+const showExpirationDateSelector = ref(false);
+const apiKeyCreationDate = ref('');
+
+const calculateExpirationDate = (daysFromNow: number) => {
+	const date = DateTime.now()
+		.setZone(rootStore.timezone)
+		.startOf('day')
+		.plus({ days: daysFromNow });
+	return date;
+};
+
+const getExpirationOptionLabel = (value: number) => {
+	if (EXPIRATION_OPTIONS.CUSTOM === value) {
+		return i18n.baseText('settings.api.view.modal.form.expiration.custom');
+	}
+
+	if (EXPIRATION_OPTIONS.NO_EXPIRATION === value) {
+		return i18n.baseText('settings.api.view.modal.form.expiration.none');
+	}
+
+	return i18n.baseText('settings.api.view.modal.form.expiration.days', {
+		interpolate: {
+			numberOfDays: value,
+		},
+	});
+};
+
+const expirationDate = ref(
+	calculateExpirationDate(expirationDaysFromNow.value).toFormat('ccc, MMM d yyyy'),
+);
+
+const inputRef = ref<HTMLTextAreaElement | null>(null);
+
+const props = withDefaults(
+	defineProps<{
+		mode?: 'new' | 'edit';
+		activeId?: string;
+	}>(),
+	{
+		mode: 'new',
+		activeId: '',
+	},
+);
+
+const allFormFieldsAreSet = computed(() => {
+	const isExpirationDateSet =
+		expirationDaysFromNow.value === EXPIRATION_OPTIONS.NO_EXPIRATION ||
+		(expirationDaysFromNow.value === EXPIRATION_OPTIONS.CUSTOM && customExpirationDate.value) ||
+		expirationDate.value;
+
+	return label.value && (props.mode === 'edit' ? true : isExpirationDateSet);
+});
+
+const isCustomDateInThePast = (date: Date) => Date.now() > date.getTime();
+
+onMounted(() => {
+	documentTitle.set(i18n.baseText('settings.api'));
+
+	setTimeout(() => {
+		inputRef.value?.focus();
+	});
+
+	if (props.mode === 'edit') {
+		const apiKey = apiKeysById[props.activeId];
+		label.value = apiKey.label ?? '';
+		apiKeyCreationDate.value = getApiKeyCreationTime(apiKey);
+	}
+
+	apiDocsURL.value = isSwaggerUIEnabled
+		? `${baseUrl}${publicApiPath}/v${publicApiLatestVersion}/docs`
+		: `https://${DOCS_DOMAIN}/api/api-reference/`;
+});
+
+function onInput(value: string): void {
+	label.value = value;
+}
+
+const getApiKeyCreationTime = (apiKey: ApiKey): string => {
+	const time = DateTime.fromMillis(Date.parse(apiKey.createdAt)).toFormat('ccc, MMM d yyyy');
+	return i18n.baseText('settings.api.creationTime', { interpolate: { time } });
+};
+
+async function onEdit() {
+	try {
+		loading.value = true;
+		await updateApiKey(props.activeId, { label: label.value });
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('settings.api.update.toast'),
+		});
+		closeModal();
+	} catch (error) {
+		showError(error, i18n.baseText('settings.api.edit.error'));
+	} finally {
+		loading.value = false;
+	}
+}
+
+function closeModal() {
+	uiStore.closeModal(API_KEY_CREATE_OR_EDIT_MODAL_KEY);
+}
+
+const onSave = async () => {
+	if (!label.value) {
+		return;
+	}
+
+	let expirationUnixTimestamp = null;
+
+	if (expirationDaysFromNow.value === EXPIRATION_OPTIONS.CUSTOM) {
+		expirationUnixTimestamp = parseInt(customExpirationDate.value, 10);
+	} else if (expirationDaysFromNow.value !== EXPIRATION_OPTIONS.NO_EXPIRATION) {
+		expirationUnixTimestamp = calculateExpirationDate(expirationDaysFromNow.value).toUnixInteger();
+	}
+
+	const payload: CreateApiKeyRequestDto = {
+		label: label.value,
+		expiresAt: expirationUnixTimestamp,
+	};
+
+	try {
+		loading.value = true;
+		newApiKey.value = await createApiKey(payload);
+		rawApiKey.value = newApiKey.value.rawApiKey;
+
+		showMessage({
+			type: 'success',
+			title: i18n.baseText('settings.api.create.toast'),
+		});
+	} catch (error) {
+		showError(error, i18n.baseText('settings.api.create.error'));
+	} finally {
+		loading.value = false;
+	}
+};
+
+const modalTitle = computed(() => {
+	let path = 'edit';
+	if (props.mode === 'new') {
+		if (newApiKey.value) {
+			path = 'created';
+		} else {
+			path = 'create';
+		}
+	}
+	return i18n.baseText(`settings.api.view.modal.title.${path}` as BaseTextKey);
+});
+
+const onSelect = (value: number) => {
+	if (value === EXPIRATION_OPTIONS.CUSTOM) {
+		showExpirationDateSelector.value = true;
+		expirationDate.value = '';
+		return;
+	}
+
+	if (value !== EXPIRATION_OPTIONS.NO_EXPIRATION) {
+		expirationDate.value = calculateExpirationDate(value).toFormat('ccc, MMM d yyyy');
+		showExpirationDateSelector.value = false;
+		return;
+	}
+
+	expirationDate.value = '';
+	showExpirationDateSelector.value = false;
+};
+</script>
+
+<template>
+	<Modal
+		:title="modalTitle"
+		:event-bus="modalBus"
+		:name="API_KEY_CREATE_OR_EDIT_MODAL_KEY"
+		width="600px"
+		:lock-scroll="false"
+		:close-on-esc="true"
+		:close-on-click-outside="true"
+		:show-close="true"
+	>
+		<template #content>
+			<div>
+				<p v-if="newApiKey" class="mb-s">
+					<n8n-info-tip :bold="false">
+						<i18n-t keypath="settings.api.view.info" tag="span">
+							<template #apiAction>
+								<a
+									href="https://docs.n8n.io/api"
+									target="_blank"
+									v-text="i18n.baseText('settings.api.view.info.api')"
+								/>
+							</template>
+							<template #webhookAction>
+								<a
+									href="https://docs.n8n.io/integrations/core-nodes/n8n-nodes-base.webhook/"
+									target="_blank"
+									v-text="i18n.baseText('settings.api.view.info.webhook')"
+								/>
+							</template>
+						</i18n-t>
+					</n8n-info-tip>
+				</p>
+				<n8n-card v-if="newApiKey" class="mb-4xs">
+					<CopyInput
+						:label="newApiKey.label"
+						:value="newApiKey.rawApiKey"
+						:redact-value="true"
+						:copy-button-text="i18n.baseText('generic.clickToCopy')"
+						:toast-title="i18n.baseText('settings.api.view.copy.toast')"
+						:hint="i18n.baseText('settings.api.view.copy')"
+					/>
+				</n8n-card>
+
+				<div v-if="newApiKey" :class="$style.hint">
+					<N8nText size="small">
+						{{
+							i18n.baseText(
+								`settings.api.view.${settingsStore.isSwaggerUIEnabled ? 'tryapi' : 'more-details'}`,
+							)
+						}}
+					</N8nText>
+					{{ ' ' }}
+					<n8n-link :to="apiDocsURL" :new-window="true" size="small">
+						{{
+							i18n.baseText(
+								`settings.api.view.${isSwaggerUIEnabled ? 'apiPlayground' : 'external-docs'}`,
+							)
+						}}
+					</n8n-link>
+				</div>
+				<div v-else :class="$style.form">
+					<N8nInputLabel
+						:label="i18n.baseText('settings.api.view.modal.form.label')"
+						color="text-dark"
+					>
+						<N8nInput
+							ref="inputRef"
+							required
+							:model-value="label"
+							size="large"
+							type="text"
+							:placeholder="i18n.baseText('settings.api.view.modal.form.label.placeholder')"
+							:maxlength="50"
+							data-test-id="api-key-label"
+							@update:model-value="onInput"
+						/>
+					</N8nInputLabel>
+					<div v-if="mode === 'new'" :class="$style.expirationSection">
+						<N8nInputLabel
+							:label="i18n.baseText('settings.api.view.modal.form.expiration')"
+							color="text-dark"
+						>
+							<N8nSelect
+								v-model="expirationDaysFromNow"
+								size="large"
+								filterable
+								data-test-id="expiration-select"
+								@update:model-value="onSelect"
+							>
+								<N8nOption
+									v-for="key in Object.keys(EXPIRATION_OPTIONS)"
+									:key="key"
+									:value="EXPIRATION_OPTIONS[key as keyof typeof EXPIRATION_OPTIONS]"
+									:label="
+										getExpirationOptionLabel(
+											EXPIRATION_OPTIONS[key as keyof typeof EXPIRATION_OPTIONS],
+										)
+									"
+								>
+								</N8nOption>
+							</N8nSelect>
+						</N8nInputLabel>
+						<N8nText v-if="expirationDate" class="mb-xs">{{
+							i18n.baseText('settings.api.view.modal.form.expirationText', {
+								interpolate: { expirationDate },
+							})
+						}}</N8nText>
+						<el-date-picker
+							v-if="showExpirationDateSelector"
+							v-model="customExpirationDate"
+							type="date"
+							:teleported="false"
+							placeholder="yyyy-mm-dd"
+							value-format="X"
+							:disabled-date="isCustomDateInThePast"
+						/>
+					</div>
+				</div>
+			</div>
+		</template>
+		<template #footer>
+			<div :class="$style.footer">
+				<N8nButton
+					v-if="mode === 'new' && !newApiKey"
+					:loading="loading"
+					:disabled="!allFormFieldsAreSet"
+					:label="i18n.baseText('settings.api.view.modal.save.button')"
+					@click="onSave"
+				/>
+				<N8nButton
+					v-else-if="mode === 'new'"
+					:label="i18n.baseText('settings.api.view.modal.done.button')"
+					@click="closeModal"
+				/>
+				<N8nButton
+					v-if="mode === 'edit'"
+					:disabled="!allFormFieldsAreSet"
+					:label="i18n.baseText('settings.api.view.modal.edit.button')"
+					@click="onEdit"
+				/>
+				<N8nText v-if="mode === 'edit'" size="small" color="text-light">{{
+					apiKeyCreationDate
+				}}</N8nText>
+			</div>
+		</template>
+	</Modal>
+</template>
+<style module lang="scss">
+.notice {
+	margin: 0;
+}
+
+.hint {
+	color: var(--color-text-light);
+	margin-bottom: var(--spacing-s);
+}
+
+.form {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-xs);
+}
+
+.expirationSection {
+	display: flex;
+	flex-direction: row;
+	align-items: flex-end;
+	gap: var(--spacing-xs);
+}
+
+.footer {
+	display: flex;
+	flex-direction: row-reverse;
+	justify-content: space-between;
+	align-items: center;
+}
+</style>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
index 614ae3f590..1e9c827234 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
+++ b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
@@ -4,14 +4,13 @@ import InputTriple from '@/components/InputTriple/InputTriple.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ParameterInputHint from '@/components/ParameterInputHint.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
-import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { isExpression, stringifyExpressionResult } from '@/utils/expressions';
-import type { AssignmentValue, INodeProperties, Result } from 'n8n-workflow';
+import { useResolvedExpression } from '@/composables/useResolvedExpression';
+import useEnvironmentsStore from '@/stores/environments.ee.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import type { AssignmentValue, INodeProperties } from 'n8n-workflow';
 import { computed, ref } from 'vue';
 import TypeSelect from './TypeSelect.vue';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useRouter } from 'vue-router';
+import { N8nIconButton } from 'n8n-design-system';
 
 interface Props {
 	path: string;
@@ -32,8 +31,7 @@ const emit = defineEmits<{
 }>();
 
 const ndvStore = useNDVStore();
-const router = useRouter();
-const { resolveExpression } = useWorkflowHelpers({ router });
+const environmentsStore = useEnvironmentsStore();
 
 const assignmentTypeToNodeProperty = (
 	type: string,
@@ -76,48 +74,21 @@ const valueParameter = computed<INodeProperties>(() => {
 	};
 });
 
-const hint = computed(() => {
-	const { value } = assignment.value;
-	if (typeof value !== 'string' || !value.startsWith('=')) {
-		return '';
-	}
+const value = computed(() => assignment.value.value);
 
-	let result: Result<unknown, Error>;
-	try {
-		const resolvedValue = resolveExpression(
-			value,
-			undefined,
-			ndvStore.isInputParentOfActiveNode
-				? {
-						targetItem: ndvStore.expressionTargetItem ?? undefined,
-						inputNodeName: ndvStore.ndvInputNodeName,
-						inputRunIndex: ndvStore.ndvInputRunIndex,
-						inputBranchIndex: ndvStore.ndvInputBranchIndex,
-					}
-				: {},
-		) as unknown;
-
-		result = { ok: true, result: resolvedValue };
-	} catch (error) {
-		result = { ok: false, error };
-	}
-
-	const hasRunData =
-		!!useWorkflowsStore().workflowExecutionData?.data?.resultData?.runData[
-			ndvStore.activeNode?.name ?? ''
-		];
-
-	return stringifyExpressionResult(result, hasRunData);
+const resolvedAdditionalExpressionData = computed(() => {
+	return { $vars: environmentsStore.variablesAsObject };
 });
 
+const { resolvedExpressionString, isExpression } = useResolvedExpression({
+	expression: value,
+	additionalData: resolvedAdditionalExpressionData,
+});
+
+const hint = computed(() => resolvedExpressionString.value);
+
 const highlightHint = computed(() => Boolean(hint.value && ndvStore.getHoveringItem));
 
-const valueIsExpression = computed(() => {
-	const { value } = assignment.value;
-
-	return typeof value === 'string' && isExpression(value);
-});
-
 const onAssignmentNameChange = (update: IUpdateInformation): void => {
 	assignment.value.name = update.value as string;
 };
@@ -125,7 +96,7 @@ const onAssignmentNameChange = (update: IUpdateInformation): void => {
 const onAssignmentTypeChange = (update: string): void => {
 	assignment.value.type = update;
 
-	if (update === 'boolean' && !valueIsExpression.value) {
+	if (update === 'boolean' && !isExpression.value) {
 		assignment.value.value = false;
 	}
 };
@@ -160,7 +131,7 @@ const onBlur = (): void => {
 			icon="grip-vertical"
 			:class="[$style.iconButton, $style.defaultTopPadding, 'drag-handle']"
 		></N8nIconButton>
-		<n8n-icon-button
+		<N8nIconButton
 			v-if="!isReadOnly"
 			type="tertiary"
 			text
@@ -169,7 +140,7 @@ const onBlur = (): void => {
 			data-test-id="assignment-remove"
 			:class="[$style.iconButton, $style.extraTopPadding]"
 			@click="onRemove"
-		></n8n-icon-button>
+		></N8nIconButton>
 
 		<div :class="$style.inputs">
 			<InputTriple middle-width="100px">
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
index ba5070e335..5264821232 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
@@ -2,7 +2,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { mount } from '@vue/test-utils';
 import { createTestingPinia } from '@pinia/testing';
-import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
+import ButtonParameter, { type Props } from '@/components/ButtonParameter/ButtonParameter.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { usePostHog } from '@/stores/posthog.store';
@@ -20,7 +20,7 @@ vi.mock('@/composables/useI18n');
 vi.mock('@/composables/useToast');
 
 describe('ButtonParameter', () => {
-	const defaultProps = {
+	const defaultProps: Props = {
 		parameter: {
 			name: 'testParam',
 			displayName: 'Test Parameter',
@@ -38,6 +38,7 @@ describe('ButtonParameter', () => {
 			},
 		} as INodeProperties,
 		value: '',
+		isReadOnly: false,
 		path: 'testPath',
 	};
 
@@ -78,9 +79,9 @@ describe('ButtonParameter', () => {
 		} as any);
 	});
 
-	const mountComponent = (props = defaultProps) => {
+	const mountComponent = (props: Partial<Props> = {}) => {
 		return mount(ButtonParameter, {
-			props,
+			props: { ...defaultProps, ...props },
 			global: {
 				plugins: [createTestingPinia()],
 			},
@@ -134,4 +135,10 @@ describe('ButtonParameter', () => {
 
 		expect(useToast().showMessage).toHaveBeenCalled();
 	});
+
+	it('disables input and button when in read only mode', async () => {
+		const wrapper = mountComponent({ isReadOnly: true });
+		expect(wrapper.find('textarea').attributes('disabled')).toBeDefined();
+		expect(wrapper.find('button').attributes('disabled')).toBeDefined();
+	});
 });
diff --git a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
index a28b68d3dd..e10933bd19 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -14,7 +14,6 @@ import {
 	getTextareaCursorPosition,
 } from './utils';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { useUIStore } from '@/stores/ui.store';
 
 import { propertyNameFromExpression } from '../../utils/mappingUtils';
 
@@ -24,11 +23,13 @@ const emit = defineEmits<{
 	valueChanged: [value: IUpdateInformation];
 }>();
 
-const props = defineProps<{
+export type Props = {
 	parameter: INodeProperties;
 	value: string;
 	path: string;
-}>();
+	isReadOnly?: boolean;
+};
+const props = defineProps<Props>();
 
 const { activeNode } = useNDVStore();
 
@@ -48,8 +49,7 @@ const buttonLabel = computed(
 	() => props.parameter.typeOptions?.buttonConfig?.label ?? props.parameter.displayName,
 );
 const isSubmitEnabled = computed(() => {
-	if (!hasExecutionData.value) return false;
-	if (!prompt.value) return false;
+	if (!hasExecutionData.value || !prompt.value || props.isReadOnly) return false;
 
 	const maxlength = inputFieldMaxLength.value;
 	if (maxlength && prompt.value.length > maxlength) return false;
@@ -156,16 +156,6 @@ function onPromptInput(inputValue: string) {
 	});
 }
 
-function useDarkBackdrop(): string {
-	const theme = useUIStore().appliedTheme;
-
-	if (theme === 'light') {
-		return 'background-color: var(--color-background-xlight);';
-	} else {
-		return 'background-color: var(--color-background-light);';
-	}
-}
-
 onMounted(() => {
 	parentNodes.value = getParentNodes();
 });
@@ -213,8 +203,11 @@ async function updateCursorPositionOnMouseMove(event: MouseEvent, activeDrop: bo
 			color="text-dark"
 		>
 		</n8n-input-label>
-		<div :class="$style.inputContainer" :hidden="!hasInputField">
-			<div :class="$style.meta" :style="useDarkBackdrop()">
+		<div
+			:class="[$style.inputContainer, { [$style.disabled]: isReadOnly }]"
+			:hidden="!hasInputField"
+		>
+			<div :class="$style.meta">
 				<span
 					v-if="inputFieldMaxLength"
 					v-show="prompt.length > 1"
@@ -240,6 +233,7 @@ async function updateCursorPositionOnMouseMove(event: MouseEvent, activeDrop: bo
 						:rows="6"
 						:maxlength="inputFieldMaxLength"
 						:placeholder="parameter.placeholder"
+						:disabled="isReadOnly"
 						@input="onPromptInput"
 						@mousemove="updateCursorPositionOnMouseMove($event, activeDrop)"
 						@mouseleave="cleanTextareaRowsData"
@@ -279,12 +273,19 @@ async function updateCursorPositionOnMouseMove(event: MouseEvent, activeDrop: bo
 .input * {
 	border: 1.5px transparent !important;
 }
+
+.input {
+	border-radius: var(--border-radius-base);
+}
+
 .input textarea {
 	font-size: var(--font-size-2xs);
 	padding-bottom: var(--spacing-2xl);
 	font-family: var(--font-family);
 	resize: none;
+	margin: 0;
 }
+
 .intro {
 	font-weight: var(--font-weight-bold);
 	font-size: var(--font-size-2xs);
@@ -300,14 +301,13 @@ async function updateCursorPositionOnMouseMove(event: MouseEvent, activeDrop: bo
 	position: absolute;
 	padding-bottom: var(--spacing-2xs);
 	padding-top: var(--spacing-2xs);
-	margin: 1px;
-	margin-right: var(--spacing-s);
-	bottom: 0;
+	bottom: 2px;
 	left: var(--spacing-xs);
 	right: var(--spacing-xs);
-	gap: 10px;
+	gap: var(--spacing-2xs);
 	align-items: end;
 	z-index: 1;
+	background-color: var(--color-foreground-xlight);
 
 	* {
 		font-size: var(--font-size-2xs);
@@ -334,4 +334,9 @@ async function updateCursorPositionOnMouseMove(event: MouseEvent, activeDrop: bo
 	border: 1.5px solid var(--color-success) !important;
 	cursor: grabbing;
 }
+.disabled {
+	.meta {
+		background-color: var(--fill-disabled);
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/editor-ui/src/components/ButtonParameter/utils.ts
index 1044477bbb..47a4081963 100644
--- a/packages/editor-ui/src/components/ButtonParameter/utils.ts
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.ts
@@ -161,28 +161,24 @@ export function reducePayloadSizeOrThrow(
 	error: Error,
 	averageTokenLength = 4,
 ) {
-	try {
-		let remainingTokensToReduce = calculateRemainingTokens(error);
+	let remainingTokensToReduce = calculateRemainingTokens(error);
 
-		const [remaining, parentNodesTokenCount] = trimParentNodesSchema(
-			payload,
-			remainingTokensToReduce,
-			averageTokenLength,
-		);
+	const [remaining, parentNodesTokenCount] = trimParentNodesSchema(
+		payload,
+		remainingTokensToReduce,
+		averageTokenLength,
+	);
 
-		remainingTokensToReduce = remaining;
+	remainingTokensToReduce = remaining;
 
-		remainingTokensToReduce = trimInputSchemaProperties(
-			payload,
-			remainingTokensToReduce,
-			averageTokenLength,
-			parentNodesTokenCount,
-		);
+	remainingTokensToReduce = trimInputSchemaProperties(
+		payload,
+		remainingTokensToReduce,
+		averageTokenLength,
+		parentNodesTokenCount,
+	);
 
-		if (remainingTokensToReduce > 0) throw error;
-	} catch (e) {
-		throw e;
-	}
+	if (remainingTokensToReduce > 0) throw error;
 }
 
 export async function generateCodeForAiTransform(prompt: string, path: string, retries = 1) {
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts b/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
index 47869583a4..153b7eabb9 100644
--- a/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
+++ b/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
@@ -38,6 +38,13 @@ vi.mock('@/composables/useToast', () => {
 		},
 	};
 });
+
+vi.mock('@/stores/pushConnection.store', () => ({
+	usePushConnectionStore: vi.fn().mockReturnValue({
+		isConnected: true,
+	}),
+}));
+
 // Test data
 const mockNodes: INodeUi[] = [
 	{
@@ -215,6 +222,7 @@ describe('CanvasChat', () => {
 			// Send message
 			const input = await findByTestId('chat-input');
 			await userEvent.type(input, 'Hello AI!');
+
 			await userEvent.keyboard('{Enter}');
 
 			// Verify message and response
@@ -230,28 +238,28 @@ describe('CanvasChat', () => {
 			// Verify workflow execution
 			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith(
 				expect.objectContaining({
-					runData: {
-						'When chat message received': [
-							{
-								data: {
-									main: [
-										[
-											{
-												json: {
-													action: 'sendMessage',
-													chatInput: 'Hello AI!',
-													sessionId: expect.any(String),
-												},
+					runData: undefined,
+					triggerToStartFrom: {
+						name: 'When chat message received',
+						data: {
+							data: {
+								main: [
+									[
+										{
+											json: {
+												action: 'sendMessage',
+												chatInput: 'Hello AI!',
+												sessionId: expect.any(String),
 											},
-										],
+										},
 									],
-								},
-								executionStatus: 'success',
-								executionTime: 0,
-								source: [null],
-								startTime: expect.any(Number),
+								],
 							},
-						],
+							executionStatus: 'success',
+							executionTime: 0,
+							source: [null],
+							startTime: expect.any(Number),
+						},
 					},
 				}),
 			);
@@ -263,14 +271,21 @@ describe('CanvasChat', () => {
 			// Send message
 			const input = await findByTestId('chat-input');
 			await userEvent.type(input, 'Test message');
+
+			// Since runWorkflow resolve is mocked, the isWorkflowRunning will be false from the first run.
+			// This means that the loading state never gets a chance to appear.
+			// We're forcing isWorkflowRunning to be true for the first run.
+			workflowsStore.isWorkflowRunning = true;
 			await userEvent.keyboard('{Enter}');
 
 			await waitFor(() => expect(queryByTestId('chat-message-typing')).toBeInTheDocument());
 
+			workflowsStore.isWorkflowRunning = false;
 			workflowsStore.getWorkflowExecution = {
 				...(mockWorkflowExecution as unknown as IExecutionResponse),
 				status: 'success',
 			};
+
 			await waitFor(() => expect(queryByTestId('chat-message-typing')).not.toBeInTheDocument());
 		});
 
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue b/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
index adfbc8cdd4..97505a0b40 100644
--- a/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
+++ b/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
@@ -175,47 +175,40 @@ const closePanel = () => {
 // This function creates a promise that resolves when the workflow execution completes
 // It's used to handle the loading state while waiting for the workflow to finish
 async function createExecutionPromise() {
-	let resolvePromise: () => void;
-	const promise = new Promise<void>((resolve) => {
-		resolvePromise = resolve;
-	});
-
-	// Watch for changes in the workflow execution status
-	const stopWatch = watch(
-		() => workflowsStore.getWorkflowExecution?.status,
-		(newStatus) => {
-			// If the status is no longer 'running', resolve the promise
-			if (newStatus && newStatus !== 'running') {
-				resolvePromise();
-				// Stop the watcher when the promise is resolved
-				stopWatch();
+	return await new Promise<void>((resolve) => {
+		const resolveIfFinished = (isRunning: boolean) => {
+			if (!isRunning) {
+				unwatch();
+				resolve();
 			}
-		},
-		{ immediate: true }, // Check the status immediately when the watcher is set up
-	);
+		};
 
-	// Return the promise, which will resolve when the workflow execution is complete
-	// This allows the caller to await the execution and handle the loading state appropriately
-	return await promise;
+		// Watch for changes in the workflow execution status
+		const unwatch = watch(() => workflowsStore.isWorkflowRunning, resolveIfFinished);
+		resolveIfFinished(workflowsStore.isWorkflowRunning);
+	});
 }
 
 async function onRunChatWorkflow(payload: RunWorkflowChatPayload) {
-	try {
-		const response = await runWorkflow({
-			triggerNode: payload.triggerNode,
-			nodeData: payload.nodeData,
-			source: payload.source,
-		});
+	const runWorkflowOptions: Parameters<typeof runWorkflow>[0] = {
+		triggerNode: payload.triggerNode,
+		nodeData: payload.nodeData,
+		source: payload.source,
+	};
 
-		if (response) {
-			await createExecutionPromise();
-			workflowsStore.appendChatMessage(payload.message);
-			return response;
-		}
-		return;
-	} catch (error) {
-		throw error;
+	if (workflowsStore.chatPartialExecutionDestinationNode) {
+		runWorkflowOptions.destinationNode = workflowsStore.chatPartialExecutionDestinationNode;
+		workflowsStore.chatPartialExecutionDestinationNode = null;
 	}
+
+	const response = await runWorkflow(runWorkflowOptions);
+
+	if (response) {
+		await createExecutionPromise();
+		workflowsStore.appendChatMessage(payload.message);
+		return response;
+	}
+	return;
 }
 
 // Initialize chat config
diff --git a/packages/editor-ui/src/components/CanvasControls.vue b/packages/editor-ui/src/components/CanvasControls.vue
index 223c1cc8de..e0bced9be0 100644
--- a/packages/editor-ui/src/components/CanvasControls.vue
+++ b/packages/editor-ui/src/components/CanvasControls.vue
@@ -3,7 +3,7 @@ import { onBeforeMount, onBeforeUnmount } from 'vue';
 import { storeToRefs } from 'pinia';
 import { useCanvasStore } from '@/stores/canvas.store';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useI18n } from '@/composables/useI18n';
 
 const canvasStore = useCanvasStore();
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index c17ff804c0..74bbddacc3 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -37,7 +37,7 @@ const props = withDefaults(defineProps<Props>(), {
 	language: 'javaScript',
 	isReadOnly: false,
 	rows: 4,
-	id: crypto.randomUUID(),
+	id: () => crypto.randomUUID(),
 });
 const emit = defineEmits<{
 	'update:modelValue': [value: string];
diff --git a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue b/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
index 0fd54b0a73..2425559e83 100644
--- a/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
+++ b/packages/editor-ui/src/components/ContextMenu/ContextMenu.vue
@@ -29,7 +29,9 @@ function onActionSelect(item: string) {
 }
 
 function closeMenu(event: MouseEvent) {
-	event.preventDefault();
+	if (event.cancelable) {
+		event.preventDefault();
+	}
 	event.stopPropagation();
 	contextMenu.close();
 }
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index db40f0d274..4d4dd131f6 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -29,6 +29,7 @@ const props = withDefaults(
 	defineProps<{
 		data: ICredentialsResponse;
 		readOnly?: boolean;
+		needsSetup?: boolean;
 	}>(),
 	{
 		data: () => ({
@@ -146,6 +147,9 @@ function moveResource() {
 				<N8nBadge v-if="readOnly" class="ml-3xs" theme="tertiary" bold>
 					{{ locale.baseText('credentials.item.readonly') }}
 				</N8nBadge>
+				<N8nBadge v-if="needsSetup" class="ml-3xs" theme="warning">
+					{{ locale.baseText('credentials.item.needsSetup') }}
+				</N8nBadge>
 			</n8n-heading>
 		</template>
 		<div :class="$style.cardDescription">
@@ -195,10 +199,6 @@ function moveResource() {
 .cardHeading {
 	font-size: var(--font-size-s);
 	padding: var(--spacing-s) 0 0;
-
-	span {
-		color: var(--color-text-light);
-	}
 }
 
 .cardDescription {
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts
new file mode 100644
index 0000000000..b23df04547
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.constants.ts
@@ -0,0 +1,276 @@
+import type { ICredentialMap, ICredentialTypeMap } from '@/Interface';
+
+export const TEST_CREDENTIALS: ICredentialMap = {
+	// OpenAI credential in personal
+	1: {
+		createdAt: new Date().toISOString(),
+		updatedAt: new Date().toISOString(),
+		id: '1',
+		name: 'OpenAi account',
+		data: 'test123',
+		type: 'openAiApi',
+		isManaged: false,
+		homeProject: {
+			id: '1',
+			type: 'personal',
+			name: 'Kobi Dog <kobi@n8n.io>',
+			icon: null,
+			createdAt: new Date().toISOString(),
+			updatedAt: new Date().toISOString(),
+		},
+		sharedWithProjects: [
+			{
+				id: '2',
+				type: 'team',
+				name: 'Test Project',
+				icon: { type: 'icon', value: 'exchange-alt' },
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		],
+		scopes: [
+			'credential:create',
+			'credential:delete',
+			'credential:list',
+			'credential:move',
+			'credential:read',
+			'credential:share',
+			'credential:update',
+		],
+	},
+	// Supabase credential in another project
+	2: {
+		createdAt: new Date().toISOString(),
+		updatedAt: new Date().toISOString(),
+		id: '2',
+		name: 'Supabase account',
+		data: 'test123',
+		type: 'supabaseApi',
+		isManaged: false,
+		homeProject: {
+			id: '2',
+			type: 'team',
+			name: 'Test Project',
+			icon: { type: 'icon', value: 'exchange-alt' },
+			createdAt: new Date().toISOString(),
+			updatedAt: new Date().toISOString(),
+		},
+		sharedWithProjects: [],
+		scopes: [
+			'credential:create',
+			'credential:delete',
+			'credential:list',
+			'credential:move',
+			'credential:read',
+			'credential:share',
+			'credential:update',
+		],
+	},
+	// Slack account in personal
+	3: {
+		createdAt: new Date().toISOString(),
+		updatedAt: new Date().toISOString(),
+		id: '3',
+		name: 'Slack account',
+		data: 'test123',
+		type: 'slackOAuth2Api',
+		isManaged: false,
+		homeProject: {
+			id: '1',
+			type: 'personal',
+			name: 'Kobi Dog <kobi@n8n.io>',
+			icon: null,
+			createdAt: new Date().toISOString(),
+			updatedAt: new Date().toISOString(),
+		},
+		sharedWithProjects: [],
+		scopes: [
+			'credential:create',
+			'credential:delete',
+			'credential:list',
+			'credential:move',
+			'credential:read',
+			'credential:share',
+			'credential:update',
+		],
+	},
+	// OpenAI credential in another project
+	4: {
+		createdAt: new Date().toISOString(),
+		updatedAt: new Date().toISOString(),
+		id: '4',
+		name: '[PROJECT] OpenAI Account',
+		data: 'test123',
+		type: 'openAiApi',
+		isManaged: false,
+		homeProject: {
+			id: '2',
+			type: 'team',
+			name: 'Test Project',
+			icon: { type: 'icon', value: 'exchange-alt' },
+			createdAt: new Date().toISOString(),
+			updatedAt: new Date().toISOString(),
+		},
+		sharedWithProjects: [],
+		scopes: [
+			'credential:create',
+			'credential:delete',
+			'credential:list',
+			'credential:move',
+			'credential:read',
+			'credential:share',
+			'credential:update',
+		],
+	},
+};
+
+export const TEST_CREDENTIAL_TYPES: ICredentialTypeMap = {
+	openAiApi: {
+		name: 'openAiApi',
+		displayName: 'OpenAi',
+		documentationUrl: 'openAi',
+		properties: [
+			{
+				displayName: 'API Key',
+				name: 'apiKey',
+				type: 'string',
+				typeOptions: {
+					password: true,
+				},
+				required: true,
+				default: '',
+			},
+			{
+				displayName: 'Base URL',
+				name: 'url',
+				type: 'string',
+				default: 'https://api.openai.com/v1',
+				description: 'Override the base URL for the API',
+			},
+		],
+		authenticate: {
+			type: 'generic',
+			properties: {
+				headers: {
+					Authorization: '=Bearer {{$credentials.apiKey}}',
+				},
+			},
+		},
+		test: {
+			request: {
+				baseURL: '={{$credentials?.url}}',
+				url: '/models',
+			},
+		},
+		iconUrl: {
+			light: 'icons/n8n-nodes-base/dist/nodes/OpenAi/openai.svg',
+			dark: 'icons/n8n-nodes-base/dist/nodes/OpenAi/openai.dark.svg',
+		},
+		supportedNodes: [
+			'n8n-nodes-base.openAi',
+			'@n8n/n8n-nodes-langchain.embeddingsOpenAi',
+			'@n8n/n8n-nodes-langchain.lmChatOpenAi',
+			'@n8n/n8n-nodes-langchain.lmOpenAi',
+		],
+	},
+	supabaseApi: {
+		name: 'supabaseApi',
+		displayName: 'Supabase API',
+		documentationUrl: 'supabase',
+		properties: [
+			{
+				displayName: 'Host',
+				name: 'host',
+				type: 'string',
+				placeholder: 'https://your_account.supabase.co',
+				default: '',
+			},
+			{
+				displayName: 'Service Role Secret',
+				name: 'serviceRole',
+				type: 'string',
+				default: '',
+				typeOptions: {
+					password: true,
+				},
+			},
+		],
+		authenticate: {
+			type: 'generic',
+			properties: {
+				headers: {
+					apikey: '={{$credentials.serviceRole}}',
+					Authorization: '=Bearer {{$credentials.serviceRole}}',
+				},
+			},
+		},
+		test: {
+			request: {
+				baseURL: '={{$credentials.host}}/rest/v1',
+				headers: {
+					Prefer: 'return=representation',
+				},
+				url: '/',
+			},
+		},
+		iconUrl: 'icons/n8n-nodes-base/dist/nodes/Supabase/supabase.svg',
+		supportedNodes: ['n8n-nodes-base.supabase'],
+	},
+	slackOAuth2Api: {
+		name: 'slackOAuth2Api',
+		extends: ['oAuth2Api'],
+		displayName: 'Slack OAuth2 API',
+		documentationUrl: 'slack',
+		properties: [
+			{
+				displayName: 'Grant Type',
+				name: 'grantType',
+				type: 'hidden',
+				default: 'authorizationCode',
+			},
+			{
+				displayName: 'Authorization URL',
+				name: 'authUrl',
+				type: 'hidden',
+				default: 'https://slack.com/oauth/v2/authorize',
+			},
+			{
+				displayName: 'Access Token URL',
+				name: 'accessTokenUrl',
+				type: 'hidden',
+				default: 'https://slack.com/api/oauth.v2.access',
+			},
+			{
+				displayName: 'Scope',
+				name: 'scope',
+				type: 'hidden',
+				default: 'chat:write',
+			},
+			{
+				displayName: 'Auth URI Query Parameters',
+				name: 'authQueryParameters',
+				type: 'hidden',
+				default:
+					'user_scope=channels:read channels:write chat:write files:read files:write groups:read im:read mpim:read reactions:read reactions:write stars:read stars:write usergroups:write usergroups:read users.profile:read users.profile:write users:read',
+			},
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'hidden',
+				default: 'body',
+			},
+			{
+				displayName:
+					'If you get an Invalid Scopes error, make sure you add the correct one <a target="_blank" href="https://docs.n8n.io/integrations/builtin/credentials/slack/#using-oauth">here</a> to your Slack integration',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
+		],
+		iconUrl: 'icons/n8n-nodes-base/dist/nodes/Slack/slack.svg',
+		supportedNodes: ['n8n-nodes-base.slack'],
+	},
+};
+
+export const PERSONAL_OPENAI_CREDENTIAL = TEST_CREDENTIALS[1];
+export const PROJECT_OPENAI_CREDENTIAL = TEST_CREDENTIALS[4];
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts
new file mode 100644
index 0000000000..816b78e818
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.test.ts
@@ -0,0 +1,78 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { createTestingPinia } from '@pinia/testing';
+import CredentialPicker from './CredentialPicker.vue';
+import {
+	PERSONAL_OPENAI_CREDENTIAL,
+	PROJECT_OPENAI_CREDENTIAL,
+	TEST_CREDENTIAL_TYPES,
+	TEST_CREDENTIALS,
+} from './CredentialPicker.test.constants';
+import userEvent from '@testing-library/user-event';
+import { screen } from '@testing-library/vue';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	const resolve = vi.fn().mockReturnValue({ href: 'https://test.com' });
+	return {
+		useRouter: () => ({
+			push,
+			resolve,
+		}),
+		useRoute: () => ({}),
+		RouterLink: vi.fn(),
+	};
+});
+
+let credentialsStore: ReturnType<typeof mockedStore<typeof useCredentialsStore>>;
+
+const renderComponent = createComponentRenderer(CredentialPicker);
+
+describe('CredentialPicker', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		credentialsStore = mockedStore(useCredentialsStore);
+		credentialsStore.state.credentials = TEST_CREDENTIALS;
+		credentialsStore.state.credentialTypes = TEST_CREDENTIAL_TYPES;
+	});
+
+	it('should render', () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					appName: 'OpenAI',
+					credentialType: 'openAiApi',
+					selectedCredentialId: null,
+				},
+			}),
+		).not.toThrowError();
+	});
+
+	it('should only render personal credentials of the specified type', async () => {
+		const TEST_APP_NAME = 'OpenAI';
+		const TEST_CREDENTIAL_TYPE = 'openAiApi';
+		const { getByTestId } = renderComponent({
+			props: {
+				appName: TEST_APP_NAME,
+				credentialType: TEST_CREDENTIAL_TYPE,
+				selectedCredentialId: null,
+			},
+		});
+		expect(getByTestId('credential-dropdown')).toBeInTheDocument();
+		expect(getByTestId('credential-dropdown')).toHaveAttribute(
+			'credential-type',
+			TEST_CREDENTIAL_TYPE,
+		);
+		// Open the dropdown
+		await userEvent.click(getByTestId('credential-dropdown'));
+		// Personal openAI credential should be in the dropdown
+		expect(
+			screen.getByTestId(`node-credentials-select-item-${PERSONAL_OPENAI_CREDENTIAL.id}`),
+		).toBeInTheDocument();
+		// OpenAI credential that belong to other project should not be in the dropdown
+		expect(
+			screen.queryByTestId(`node-credentials-select-item-${PROJECT_OPENAI_CREDENTIAL.id}`),
+		).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
index 24fce63090..8bddeddd85 100644
--- a/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
+++ b/packages/editor-ui/src/components/CredentialPicker/CredentialPicker.vue
@@ -26,7 +26,10 @@ const i18n = useI18n();
 const wasModalOpenedFromHere = ref(false);
 
 const availableCredentials = computed(() => {
-	return credentialsStore.getCredentialsByType(props.credentialType);
+	const credByType = credentialsStore.getCredentialsByType(props.credentialType);
+	// Only show personal credentials since templates are created in personal by default
+	// Here, we don't care about sharing because credentials cannot be shared with personal project
+	return credByType.filter((credential) => credential.homeProject?.type === 'personal');
 });
 
 const credentialOptions = computed(() => {
@@ -98,6 +101,7 @@ listenForModalChanges({
 				:credential-type="props.credentialType"
 				:credential-options="credentialOptions"
 				:selected-credential-id="props.selectedCredentialId"
+				data-test-id="credential-dropdown"
 				@credential-selected="onCredentialSelected"
 				@new-credential="createNewCredential"
 			/>
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index 8706e73991..4217bc12ee 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -55,6 +55,12 @@ const workflowsStore = useWorkflowsStore();
 
 const isDragging = computed(() => ndvStore.isDraggableDragging);
 
+function select() {
+	if (inlineInput.value) {
+		inlineInput.value.selectAll();
+	}
+}
+
 function focus() {
 	if (inlineInput.value) {
 		inlineInput.value.focus();
@@ -162,7 +168,7 @@ watch(isDragging, (newIsDragging) => {
 
 onClickOutside(container, (event) => onBlur(event));
 
-defineExpose({ focus });
+defineExpose({ focus, select });
 </script>
 
 <template>
@@ -220,6 +226,7 @@ defineExpose({ focus });
 <style lang="scss" module>
 .expression-parameter-input {
 	position: relative;
+	flex-grow: 1;
 
 	:global(.cm-editor) {
 		background-color: var(--color-code-background);
diff --git a/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue b/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
index 8d8eec9109..8763c7aca2 100644
--- a/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
+++ b/packages/editor-ui/src/components/ExternalSecretsProviderImage.ee.vue
@@ -5,27 +5,20 @@ import { computed } from 'vue';
 import infisical from '../assets/images/infisical.webp';
 import doppler from '../assets/images/doppler.webp';
 import vault from '../assets/images/hashicorp.webp';
-import awsSecretsManager from '../assets/images/aws-secrets-manager.svg';
-import azureKeyVault from '../assets/images/azure-key-vault.svg';
-import gcpSecretsManager from '../assets/images/gcp-secrets-manager.svg';
+import AwsSecretsManager from '../assets/images/aws-secrets-manager.svg';
+import AzureKeyVault from '../assets/images/azure-key-vault.svg';
+import GcpSecretsManager from '../assets/images/gcp-secrets-manager.svg';
 
-const props = defineProps<{
+const { provider } = defineProps<{
 	provider: ExternalSecretsProvider;
 }>();
 
-const image = computed(
-	() =>
-		({
-			doppler,
-			infisical,
-			vault,
-			awsSecretsManager,
-			azureKeyVault,
-			gcpSecretsManager,
-		})[props.provider.name],
-);
+const image = computed(() => ({ doppler, infisical, vault })[provider.name]);
 </script>
 
 <template>
-	<img :src="image" :alt="provider.displayName" width="28" height="28" />
+	<AwsSecretsManager v-if="provider.name === 'awsSecretsManager'" />
+	<AzureKeyVault v-else-if="provider.name === 'azureKeyVault'" />
+	<GcpSecretsManager v-else-if="provider.name === 'gcpSecretsManager'" />
+	<img v-else :src="image" :alt="provider.displayName" width="28" height="28" />
 </template>
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 59eacfdb10..04f8c9e773 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -18,6 +18,9 @@ import {
 } from 'n8n-design-system';
 import ParameterInputList from './ParameterInputList.vue';
 import Draggable from 'vuedraggable';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { telemetry } from '@/plugins/telemetry';
 
 const locale = useI18n();
 
@@ -44,6 +47,9 @@ const emit = defineEmits<{
 	valueChanged: [value: ValueChangedEvent];
 }>();
 
+const workflowsStore = useWorkflowsStore();
+const ndvStore = useNDVStore();
+
 const getPlaceholderText = computed(() => {
 	const placeholder = locale.nodeText().placeholder(props.parameter, props.path);
 	return placeholder ? placeholder : locale.baseText('fixedCollectionParameter.choose');
@@ -127,6 +133,13 @@ const getOptionProperties = (optionName: string) => {
 	return undefined;
 };
 
+const onAddButtonClick = (optionName: string) => {
+	optionSelected(optionName);
+	if (props.parameter.name === 'workflowInputs') {
+		trackWorkflowInputFieldAdded();
+	}
+};
+
 const optionSelected = (optionName: string) => {
 	const option = getOptionProperties(optionName);
 	if (option === undefined) {
@@ -183,6 +196,9 @@ const optionSelected = (optionName: string) => {
 
 const valueChanged = (parameterData: IUpdateInformation) => {
 	emit('valueChanged', parameterData);
+	if (props.parameter.name === 'workflowInputs') {
+		trackWorkflowInputFieldTypeChange(parameterData);
+	}
 };
 const onDragChange = (optionName: string) => {
 	const parameterData: ValueChangedEvent = {
@@ -193,6 +209,21 @@ const onDragChange = (optionName: string) => {
 
 	emit('valueChanged', parameterData);
 };
+
+const trackWorkflowInputFieldTypeChange = (parameterData: IUpdateInformation) => {
+	telemetry.track('User changed workflow input field type', {
+		type: parameterData.value,
+		workflow_id: workflowsStore.workflow.id,
+		node_id: ndvStore.activeNode?.id,
+	});
+};
+
+const trackWorkflowInputFieldAdded = () => {
+	telemetry.track('User added workflow input field', {
+		workflow_id: workflowsStore.workflow.id,
+		node_id: ndvStore.activeNode?.id,
+	});
+};
 </script>
 
 <template>
@@ -305,7 +336,7 @@ const onDragChange = (optionName: string) => {
 				block
 				data-test-id="fixed-collection-add"
 				:label="getPlaceholderText"
-				@click="optionSelected(parameter.options[0].name)"
+				@click="onAddButtonClick(parameter.options[0].name)"
 			/>
 			<div v-else class="add-option">
 				<N8nSelect
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 91b9b0c35a..c7202ef498 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -83,6 +83,7 @@ const {
 	editor: editorRef,
 	segments,
 	readEditorValue,
+	isDirty,
 } = useExpressionEditor({
 	editorRef: htmlEditor,
 	editorValue,
@@ -230,6 +231,7 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+	if (isDirty.value) emit('update:model-value', readEditorValue());
 	htmlEditorEventBus.off('format-html', formatHtml);
 });
 
@@ -246,7 +248,10 @@ async function onDrop(value: string, event: MouseEvent) {
 			<template #default="{ activeDrop, droppable }">
 				<div
 					ref="htmlEditor"
-					:class="{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable }"
+					:class="[
+						$style.fillHeight,
+						{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable },
+					]"
 					data-test-id="html-editor-container"
 				></div
 			></template>
@@ -264,6 +269,10 @@ async function onDrop(value: string, event: MouseEvent) {
 	}
 }
 
+.fillHeight {
+	height: 100%;
+}
+
 .droppable {
 	:global(.cm-editor) {
 		border-color: var(--color-ndv-droppable-parameter);
diff --git a/packages/editor-ui/src/components/ImportCurlModal.vue b/packages/editor-ui/src/components/ImportCurlModal.vue
index 4a1ff64282..c9b20a74a9 100644
--- a/packages/editor-ui/src/components/ImportCurlModal.vue
+++ b/packages/editor-ui/src/components/ImportCurlModal.vue
@@ -6,7 +6,6 @@ import { useUIStore } from '@/stores/ui.store';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
-import { useImportCurlCommand } from '@/composables/useImportCurlCommand';
 
 const telemetry = useTelemetry();
 const i18n = useI18n();
@@ -18,12 +17,6 @@ const modalBus = createEventBus();
 
 const inputRef = ref<HTMLTextAreaElement | null>(null);
 
-const { importCurlCommand } = useImportCurlCommand({
-	onImportSuccess,
-	onImportFailure,
-	onAfterImport,
-});
-
 onMounted(() => {
 	curlCommand.value = (uiStore.modalsById[IMPORT_CURL_MODAL_KEY].data?.curlCommand as string) ?? '';
 
@@ -71,7 +64,13 @@ function sendTelemetry(
 }
 
 async function onImport() {
-	await importCurlCommand(curlCommand);
+	const { useImportCurlCommand } = await import('@/composables/useImportCurlCommand');
+	const { importCurlCommand } = useImportCurlCommand({
+		onImportSuccess,
+		onImportFailure,
+		onAfterImport,
+	});
+	importCurlCommand(curlCommand);
 }
 </script>
 
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 72c430d24e..2659840f82 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -103,6 +103,11 @@ defineExpose({
 			focus();
 		}
 	},
+	selectAll: () => {
+		editorRef.value?.dispatch({
+			selection: selection.value.extend(0, editorRef.value?.state.doc.length),
+		});
+	},
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/InputPanel.test.ts b/packages/editor-ui/src/components/InputPanel.test.ts
index 0b4734068a..a6c27abe8b 100644
--- a/packages/editor-ui/src/components/InputPanel.test.ts
+++ b/packages/editor-ui/src/components/InputPanel.test.ts
@@ -4,10 +4,15 @@ import InputPanel, { type Props } from '@/components/InputPanel.vue';
 import { STORES } from '@/constants';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createTestingPinia } from '@pinia/testing';
-import { NodeConnectionType, type IConnections, type INodeExecutionData } from 'n8n-workflow';
+import { waitFor } from '@testing-library/vue';
+import {
+	NodeConnectionType,
+	type IConnections,
+	type INodeExecutionData,
+	type IRunData,
+} from 'n8n-workflow';
 import { setActivePinia } from 'pinia';
 import { mockedStore } from '../__tests__/utils';
-import { waitFor } from '@testing-library/vue';
 
 vi.mock('vue-router', () => {
 	return {
@@ -24,7 +29,7 @@ const nodes = [
 	createTestNode({ name: 'Tool' }),
 ];
 
-const render = (props: Partial<Props> = {}, pinData?: INodeExecutionData[]) => {
+const render = (props: Partial<Props> = {}, pinData?: INodeExecutionData[], runData?: IRunData) => {
 	const connections: IConnections = {
 		[nodes[0].name]: {
 			[NodeConnectionType.Main]: [
@@ -50,12 +55,38 @@ const render = (props: Partial<Props> = {}, pinData?: INodeExecutionData[]) => {
 	setActivePinia(pinia);
 
 	const workflow = createTestWorkflow({ nodes, connections });
-	useWorkflowsStore().setWorkflow(workflow);
+	const workflowStore = useWorkflowsStore();
+
+	workflowStore.setWorkflow(workflow);
 
 	if (pinData) {
 		mockedStore(useWorkflowsStore).pinDataByNodeName.mockReturnValue(pinData);
 	}
 
+	if (runData) {
+		workflowStore.setWorkflowExecutionData({
+			id: '',
+			workflowData: {
+				id: '',
+				name: '',
+				active: false,
+				createdAt: '',
+				updatedAt: '',
+				nodes,
+				connections,
+				versionId: '',
+			},
+			finished: false,
+			mode: 'trigger',
+			status: 'success',
+			startedAt: new Date(),
+			createdAt: new Date(),
+			data: {
+				resultData: { runData },
+			},
+		});
+	}
+
 	const workflowObject = createTestWorkflowObject({
 		nodes,
 		connections,
@@ -83,4 +114,27 @@ describe('InputPanel', () => {
 		await waitFor(() => expect(queryByTestId('ndv-data-size-warning')).not.toBeInTheDocument());
 		expect(container).toMatchSnapshot();
 	});
+
+	it("opens mapping tab by default if the node hasn't run yet", async () => {
+		const { findByTestId } = render({ currentNodeName: 'Tool' });
+
+		expect((await findByTestId('radio-button-mapping')).parentNode).toBeChecked();
+		expect((await findByTestId('radio-button-debugging')).parentNode).not.toBeChecked();
+	});
+
+	it('opens debugging tab by default if the node has already run', async () => {
+		const { findByTestId } = render({ currentNodeName: 'Tool' }, undefined, {
+			Tool: [
+				{
+					startTime: 0,
+					executionTime: 0,
+					source: [],
+					data: {},
+				},
+			],
+		});
+
+		expect((await findByTestId('radio-button-mapping')).parentNode).not.toBeChecked();
+		expect((await findByTestId('radio-button-debugging')).parentNode).toBeChecked();
+	});
 });
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 2dab3ea97b..41b85e3389 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -1,27 +1,27 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 import {
 	CRON_NODE_TYPE,
 	INTERVAL_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
 	START_NODE_TYPE,
 } from '@/constants';
-import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { waitingNodeTooltip } from '@/utils/executionUtils';
 import { uniqBy } from 'lodash-es';
+import { N8nRadioButtons, N8nText, N8nTooltip } from 'n8n-design-system';
 import type { INodeInputConfiguration, INodeOutputConfiguration, Workflow } from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import { storeToRefs } from 'pinia';
 import { computed, ref, watch } from 'vue';
+import { useNDVStore } from '../stores/ndv.store';
 import InputNodeSelect from './InputNodeSelect.vue';
 import NodeExecuteButton from './NodeExecuteButton.vue';
 import RunData from './RunData.vue';
 import WireMeUp from './WireMeUp.vue';
-import { useTelemetry } from '@/composables/useTelemetry';
-import { N8nRadioButtons, N8nTooltip, N8nText } from 'n8n-design-system';
-import { storeToRefs } from 'pinia';
 
 type MappingMode = 'debugging' | 'mapping';
 
@@ -71,7 +71,7 @@ const telemetry = useTelemetry();
 
 const showDraggableHintWithDelay = ref(false);
 const draggableHintShown = ref(false);
-const inputMode = ref<MappingMode>('debugging');
+
 const mappedNode = ref<string | null>(null);
 const inputModes = [
 	{ value: 'mapping', label: i18n.baseText('ndv.input.mapping') },
@@ -88,6 +88,27 @@ const {
 	focusedMappableInput,
 	isMappingOnboarded: isUserOnboarded,
 } = storeToRefs(ndvStore);
+
+const rootNode = computed(() => {
+	if (!activeNode.value) return null;
+
+	return props.workflow.getChildNodes(activeNode.value.name, 'ALL').at(0) ?? null;
+});
+
+const hasRootNodeRun = computed(() => {
+	return !!(
+		rootNode.value && workflowsStore.getWorkflowExecution?.data?.resultData.runData[rootNode.value]
+	);
+});
+
+const inputMode = ref<MappingMode>(
+	// Show debugging mode by default only when the node has already run
+	activeNode.value &&
+		workflowsStore.getWorkflowExecution?.data?.resultData.runData[activeNode.value.name]
+		? 'debugging'
+		: 'mapping',
+);
+
 const isMappingMode = computed(() => isActiveNodeConfig.value && inputMode.value === 'mapping');
 const showDraggableHint = computed(() => {
 	const toIgnore = [START_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE, CRON_NODE_TYPE, INTERVAL_NODE_TYPE];
@@ -159,12 +180,6 @@ const isExecutingPrevious = computed(() => {
 });
 const workflowRunning = computed(() => uiStore.isActionActive.workflowRunning);
 
-const rootNode = computed(() => {
-	if (!activeNode.value) return null;
-
-	return props.workflow.getChildNodes(activeNode.value.name, 'ALL').at(0) ?? null;
-});
-
 const rootNodesParents = computed(() => {
 	if (!rootNode.value) return [];
 	return props.workflow.getParentNodesByDepth(rootNode.value);
@@ -404,9 +419,28 @@ function activatePane() {
 				v-if="(isActiveNodeConfig && rootNode) || parentNodes.length"
 				:class="$style.noOutputData"
 			>
-				<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
-					i18n.baseText('ndv.input.noOutputData.title')
-				}}</N8nText>
+				<template v-if="isMappingEnabled || hasRootNodeRun">
+					<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+						i18n.baseText('ndv.input.noOutputData.title')
+					}}</N8nText>
+				</template>
+				<template v-else>
+					<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+						i18n.baseText('ndv.input.rootNodeHasNotRun.title')
+					}}</N8nText>
+					<N8nText tag="div" color="text-dark" size="medium">
+						<i18n-t tag="span" keypath="ndv.input.rootNodeHasNotRun.description">
+							<template #link>
+								<a
+									href="#"
+									data-test-id="switch-to-mapping-mode-link"
+									@click.prevent="onInputModeChange('mapping')"
+									>{{ i18n.baseText('ndv.input.rootNodeHasNotRun.description.link') }}</a
+								>
+							</template>
+						</i18n-t>
+					</N8nText>
+				</template>
 				<N8nTooltip v-if="!readOnly" :visible="showDraggableHint && showDraggableHintWithDelay">
 					<template #content>
 						<div
@@ -423,6 +457,7 @@ function activatePane() {
 						:transparent="true"
 						:node-name="(isActiveNodeConfig ? rootNode : currentNodeName) ?? ''"
 						:label="i18n.baseText('ndv.input.noOutputData.executePrevious')"
+						class="mt-m"
 						telemetry-source="inputs"
 						data-test-id="execute-previous-node"
 						@execute="onNodeExecute"
@@ -494,11 +529,7 @@ function activatePane() {
 	margin-left: auto;
 }
 .noOutputData {
-	max-width: 180px;
-
-	> *:first-child {
-		margin-bottom: var(--spacing-m);
-	}
+	max-width: 250px;
 
 	> * {
 		margin-bottom: var(--spacing-2xs);
diff --git a/packages/editor-ui/src/components/JsonEditor.test.ts b/packages/editor-ui/src/components/JsonEditor.test.ts
index 74f5e17be7..1743a556fc 100644
--- a/packages/editor-ui/src/components/JsonEditor.test.ts
+++ b/packages/editor-ui/src/components/JsonEditor.test.ts
@@ -1,6 +1,8 @@
 import { createTestingPinia } from '@pinia/testing';
 import JsonEditor from '@/components/JsonEditor/JsonEditor.vue';
 import { renderComponent } from '@/__tests__/render';
+import { waitFor } from '@testing-library/vue';
+import { userEvent } from '@testing-library/user-event';
 
 describe('JsonEditor', () => {
 	const renderEditor = (jsonString: string) =>
@@ -13,18 +15,29 @@ describe('JsonEditor', () => {
 
 	it('renders simple json', async () => {
 		const modelValue = '{ "testing": [true, 5] }';
-		const result = renderEditor(modelValue);
-		expect(result.container.querySelector('.cm-content')?.textContent).toEqual(modelValue);
+		const { getByRole } = renderEditor(modelValue);
+		expect(getByRole('textbox').textContent).toEqual(modelValue);
 	});
 
 	it('renders multiline json', async () => {
 		const modelValue = '{\n\t"testing": [true, 5]\n}';
-		const result = renderEditor(modelValue);
-		const gutter = result.container.querySelector('.cm-gutters');
+		const { getByRole, container } = renderEditor(modelValue);
+		const gutter = container.querySelector('.cm-gutters');
 		expect(gutter?.querySelectorAll('.cm-lineNumbers .cm-gutterElement').length).toEqual(4);
 
-		const content = result.container.querySelector('.cm-content');
-		const lines = [...content!.querySelectorAll('.cm-line').values()].map((l) => l.textContent);
+		const content = getByRole('textbox');
+		const lines = [...content.querySelectorAll('.cm-line').values()].map((l) => l.textContent);
 		expect(lines).toEqual(['{', '\t"testing": [true, 5]', '}']);
 	});
+
+	it('emits update:model-value events', async () => {
+		const modelValue = '{ "test": 1 }';
+
+		const { emitted, getByRole } = renderEditor(modelValue);
+
+		const textbox = await waitFor(() => getByRole('textbox'));
+		await userEvent.type(textbox, 'test');
+
+		await waitFor(() => expect(emitted('update:modelValue')).toContainEqual(['test{ "test": 1 }']));
+	});
 });
diff --git a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
index 998430838f..6f5073bfcf 100644
--- a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
+++ b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
@@ -17,7 +17,7 @@ import {
 
 import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { codeEditorTheme } from '../CodeNodeEditor/theme';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 
@@ -77,6 +77,11 @@ onMounted(() => {
 	createEditor();
 });
 
+onBeforeUnmount(() => {
+	if (!editor.value) return;
+	editor.value.destroy();
+});
+
 watch(
 	() => props.modelValue,
 	(newValue: string) => {
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index 7db2b3a478..f9cd40d07a 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -276,6 +276,7 @@ function hideGithubButton() {
 }
 
 .main-header {
+	min-height: var(--navbar--height);
 	background-color: var(--color-background-xlight);
 	width: 100%;
 	box-sizing: border-box;
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
index d7392a149f..06d5555286 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
@@ -11,6 +11,12 @@ vi.mock('vue-router', () => ({
 	RouterLink: vi.fn(),
 }));
 
+vi.mock('@/stores/pushConnection.store', () => ({
+	usePushConnectionStore: vi.fn().mockReturnValue({
+		isConnected: true,
+	}),
+}));
+
 const initialState = {
 	[STORES.SETTINGS]: {
 		settings: {
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 39fc08ceb2..ba357b1a8d 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -3,7 +3,6 @@ import {
 	DUPLICATE_MODAL_KEY,
 	EnterpriseEditionFeature,
 	MAX_WORKFLOW_NAME_LENGTH,
-	MODAL_CLOSE,
 	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
@@ -55,7 +54,6 @@ import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
-import { useNodeViewVersionSwitcher } from '@/composables/useNodeViewVersionSwitcher';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const props = defineProps<{
@@ -102,16 +100,6 @@ const importFileRef = ref<HTMLInputElement | undefined>();
 const tagsEventBus = createEventBus();
 const sourceControlModalEventBus = createEventBus();
 
-const {
-	isNewUser,
-	nodeViewVersion,
-	nodeViewSwitcherDiscovered,
-	isNodeViewDiscoveryTooltipVisible,
-	switchNodeViewVersion,
-	setNodeViewSwitcherDropdownOpened,
-	setNodeViewSwitcherDiscovered,
-} = useNodeViewVersionSwitcher();
-
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
 		return true;
@@ -191,33 +179,6 @@ const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 		disabled: !onWorkflowPage.value || isNewWorkflow.value,
 	});
 
-	if (settingsStore.isCanvasV2Enabled) {
-		actions.push({
-			id: WORKFLOW_MENU_ACTIONS.SWITCH_NODE_VIEW_VERSION,
-			...(nodeViewVersion.value === '2'
-				? nodeViewSwitcherDiscovered.value || isNewUser.value
-					? {}
-					: {
-							badge: locale.baseText('menuActions.badge.new'),
-						}
-				: nodeViewSwitcherDiscovered.value
-					? {
-							badge: locale.baseText('menuActions.badge.beta'),
-							badgeProps: {
-								theme: 'tertiary',
-							},
-						}
-					: {
-							badge: locale.baseText('menuActions.badge.new'),
-						}),
-			label:
-				nodeViewVersion.value === '2'
-					? locale.baseText('menuActions.switchToOldNodeViewVersion')
-					: locale.baseText('menuActions.switchToNewNodeViewVersion'),
-			disabled: !onWorkflowPage.value,
-		});
-	}
-
 	if ((workflowPermissions.value.delete && !props.readOnly) || isNewWorkflow.value) {
 		actions.push({
 			id: WORKFLOW_MENU_ACTIONS.DELETE,
@@ -417,10 +378,6 @@ async function handleFileImport(): Promise<void> {
 	}
 }
 
-function onWorkflowMenuOpen(visible: boolean) {
-	setNodeViewSwitcherDropdownOpened(visible);
-}
-
 async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void> {
 	switch (action) {
 		case WORKFLOW_MENU_ACTIONS.DUPLICATE: {
@@ -520,36 +477,6 @@ async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void
 			uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
 			break;
 		}
-		case WORKFLOW_MENU_ACTIONS.SWITCH_NODE_VIEW_VERSION: {
-			setNodeViewSwitcherDiscovered();
-
-			if (uiStore.stateIsDirty) {
-				const confirmModal = await message.confirm(
-					locale.baseText('generic.unsavedWork.confirmMessage.message'),
-					{
-						title: locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-						type: 'warning',
-						confirmButtonText: locale.baseText(
-							'generic.unsavedWork.confirmMessage.confirmButtonText',
-						),
-						cancelButtonText: locale.baseText(
-							'generic.unsavedWork.confirmMessage.cancelButtonText',
-						),
-						showClose: true,
-					},
-				);
-
-				if (confirmModal === MODAL_CONFIRM) {
-					await onSaveButtonClick();
-				} else if (confirmModal === MODAL_CLOSE) {
-					return;
-				}
-			}
-
-			switchNodeViewVersion();
-
-			break;
-		}
 		case WORKFLOW_MENU_ACTIONS.DELETE: {
 			const deleteConfirmed = await message.confirm(
 				locale.baseText('mainSidebar.confirmMessage.workflowDelete.message', {
@@ -758,28 +685,11 @@ function showCreateWorkflowSuccessToast(id?: string) {
 					data-test-id="workflow-import-input"
 					@change="handleFileImport()"
 				/>
-				<N8nTooltip :visible="isNodeViewDiscoveryTooltipVisible">
-					<N8nActionDropdown
-						:items="workflowMenuItems"
-						data-test-id="workflow-menu"
-						@select="onWorkflowMenuSelect"
-						@visible-change="onWorkflowMenuOpen"
-					/>
-					<template #content>
-						<div class="mb-4xs">
-							<N8nBadge>{{ i18n.baseText('menuActions.badge.beta') }}</N8nBadge>
-						</div>
-						<p>{{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip') }}</p>
-						<N8nText color="text-light" size="small">
-							{{ i18n.baseText('menuActions.nodeViewDiscovery.tooltip.switchBack') }}
-						</N8nText>
-						<N8nIcon
-							:class="$style.closeNodeViewDiscovery"
-							icon="times-circle"
-							@click="setNodeViewSwitcherDiscovered"
-						/>
-					</template>
-				</N8nTooltip>
+				<N8nActionDropdown
+					:items="workflowMenuItems"
+					data-test-id="workflow-menu"
+					@select="onWorkflowMenuSelect"
+				/>
 			</div>
 		</PushConnectionTracker>
 	</div>
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 35f2d71f41..e5fb044a80 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -185,12 +185,9 @@ onMounted(async () => {
 		});
 	}
 
-	await nextTick(() => {
-		uiStore.sidebarMenuCollapsed = window.innerWidth < 900;
-		fullyExpanded.value = !isCollapsed.value;
-	});
-
 	becomeTemplateCreatorStore.startMonitoringCta();
+
+	await nextTick(onResizeEnd);
 });
 
 onBeforeUnmount(() => {
@@ -273,22 +270,21 @@ const handleSelect = (key: string) => {
 	}
 };
 
-const onResize = (event: UIEvent) => {
-	void callDebounced(onResizeEnd, { debounceTime: 100 }, event);
-};
+function onResize() {
+	void callDebounced(onResizeEnd, { debounceTime: 250 });
+}
 
-const onResizeEnd = async (event: UIEvent) => {
-	const browserWidth = (event.target as Window).outerWidth;
-	await checkWidthAndAdjustSidebar(browserWidth);
-};
-
-const checkWidthAndAdjustSidebar = async (width: number) => {
-	if (width < 900) {
+async function onResizeEnd() {
+	if (window.outerWidth < 900) {
 		uiStore.sidebarMenuCollapsed = true;
-		await nextTick();
-		fullyExpanded.value = !isCollapsed.value;
+	} else {
+		uiStore.sidebarMenuCollapsed = uiStore.sidebarMenuCollapsedPreference;
 	}
-};
+
+	void nextTick(() => {
+		fullyExpanded.value = !isCollapsed.value;
+	});
+}
 
 const {
 	menu,
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
index 4c192ffba6..15ed1a103c 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
@@ -3,7 +3,7 @@ import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import { createTestingPinia } from '@pinia/testing';
 import { merge } from 'lodash-es';
-import { SOURCE_CONTROL_PULL_MODAL_KEY, STORES } from '@/constants';
+import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY, STORES } from '@/constants';
 import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
@@ -18,8 +18,9 @@ let rbacStore: ReturnType<typeof useRBACStore>;
 
 const showMessage = vi.fn();
 const showError = vi.fn();
+const showToast = vi.fn();
 vi.mock('@/composables/useToast', () => ({
-	useToast: () => ({ showMessage, showError }),
+	useToast: () => ({ showMessage, showError, showToast }),
 }));
 
 const renderComponent = createComponentRenderer(MainSidebarSourceControl);
@@ -131,5 +132,39 @@ describe('MainSidebarSourceControl', () => {
 				),
 			);
 		});
+
+		it('should open push modal when there are changes', async () => {
+			const status = [
+				{
+					id: '014da93897f146d2b880-baa374b9d02d',
+					name: 'vuelfow2',
+					type: 'workflow' as const,
+					status: 'created' as const,
+					location: 'local' as const,
+					conflict: false,
+					file: '/014da93897f146d2b880-baa374b9d02d.json',
+					updatedAt: '2025-01-09T13:12:24.580Z',
+				},
+			];
+			vi.spyOn(sourceControlStore, 'getAggregatedStatus').mockResolvedValueOnce(status);
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[1]);
+			await waitFor(() =>
+				expect(openModalSpy).toHaveBeenCalledWith(
+					expect.objectContaining({
+						name: SOURCE_CONTROL_PUSH_MODAL_KEY,
+						data: expect.objectContaining({
+							status,
+						}),
+					}),
+				),
+			);
+		});
 	});
 });
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 8dab6c1de8..32c1638f96 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useI18n } from '@/composables/useI18n';
 import { hasPermission } from '@/utils/rbac/permissions';
@@ -8,8 +8,8 @@ import { useLoadingService } from '@/composables/useLoadingService';
 import { useUIStore } from '@/stores/ui.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY } from '@/constants';
-import type { SourceControlAggregatedFile } from '@/types/sourceControl.types';
 import { sourceControlEventBus } from '@/event-bus/source-control';
+import { notifyUserAboutPullWorkFolderOutcome } from '@/utils/sourceControlUtils';
 
 defineProps<{
 	isCollapsed: boolean;
@@ -69,45 +69,10 @@ async function pullWorkfolder() {
 	loadingService.setLoadingText(i18n.baseText('settings.sourceControl.loading.pull'));
 
 	try {
-		const status: SourceControlAggregatedFile[] =
-			((await sourceControlStore.pullWorkfolder(
-				false,
-			)) as unknown as SourceControlAggregatedFile[]) || [];
+		const status = await sourceControlStore.pullWorkfolder(false);
 
-		const statusWithoutLocallyCreatedWorkflows = status.filter((file) => {
-			return !(file.type === 'workflow' && file.status === 'created' && file.location === 'local');
-		});
+		await notifyUserAboutPullWorkFolderOutcome(status, toast);
 
-		if (statusWithoutLocallyCreatedWorkflows.length === 0) {
-			toast.showMessage({
-				title: i18n.baseText('settings.sourceControl.pull.upToDate.title'),
-				message: i18n.baseText('settings.sourceControl.pull.upToDate.description'),
-				type: 'success',
-			});
-		} else {
-			toast.showMessage({
-				title: i18n.baseText('settings.sourceControl.pull.success.title'),
-				type: 'success',
-			});
-
-			const incompleteFileTypes = ['variables', 'credential'];
-			const hasVariablesOrCredentials = (status || []).some((file) => {
-				return incompleteFileTypes.includes(file.type);
-			});
-
-			if (hasVariablesOrCredentials) {
-				void nextTick(() => {
-					toast.showMessage({
-						message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
-						title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
-						type: 'info',
-						duration: 0,
-						showClose: true,
-						offset: 0,
-					});
-				});
-			}
-		}
 		sourceControlEventBus.emit('pull');
 	} catch (error) {
 		const errorResponse = error.response;
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index 3f98e2a023..6fa9bf3994 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -31,6 +31,7 @@ const props = withDefaults(
 		closeOnClickModal?: boolean;
 		closeOnPressEscape?: boolean;
 		appendToBody?: boolean;
+		lockScroll?: boolean;
 	}>(),
 	{
 		title: '',
@@ -46,6 +47,7 @@ const props = withDefaults(
 		closeOnClickModal: true,
 		closeOnPressEscape: true,
 		appendToBody: false,
+		lockScroll: true,
 	},
 );
 
@@ -143,6 +145,7 @@ function getCustomClass() {
 		:close-on-press-escape="closeOnPressEscape"
 		:style="styles"
 		:append-to="appendToBody ? undefined : appModalsId"
+		:lock-scroll="lockScroll"
 		:append-to-body="appendToBody"
 		:data-test-id="`${name}-modal`"
 		:modal-class="center ? $style.center : ''"
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index fc7b2d67f1..10e54b141c 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -7,6 +7,7 @@ import {
 	COMMUNITY_PACKAGE_INSTALL_MODAL_KEY,
 	CONTACT_PROMPT_MODAL_KEY,
 	CREDENTIAL_EDIT_MODAL_KEY,
+	API_KEY_CREATE_OR_EDIT_MODAL_KEY,
 	CREDENTIAL_SELECT_MODAL_KEY,
 	DELETE_USER_MODAL_KEY,
 	DUPLICATE_MODAL_KEY,
@@ -54,6 +55,7 @@ import WorkflowSettings from '@/components/WorkflowSettings.vue';
 import DeleteUserModal from '@/components/DeleteUserModal.vue';
 import ActivationModal from '@/components/ActivationModal.vue';
 import ImportCurlModal from '@/components/ImportCurlModal.vue';
+import ApiKeyCreateOrEditModal from '@/components/ApiKeyCreateOrEditModal.vue';
 import MfaSetupModal from '@/components/MfaSetupModal.vue';
 import WorkflowShareModal from '@/components/WorkflowShareModal.ee.vue';
 import EventDestinationSettingsModal from '@/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue';
@@ -83,6 +85,21 @@ import type { EventBus } from 'n8n-design-system';
 				<CredentialEdit :modal-name="modalName" :mode="mode" :active-id="activeId" />
 			</template>
 		</ModalRoot>
+
+		<ModalRoot :name="API_KEY_CREATE_OR_EDIT_MODAL_KEY">
+			<template
+				#default="{
+					modalName,
+					data: { mode, activeId },
+				}: {
+					modalName: string;
+					data: { mode: 'new' | 'edit'; activeId: string };
+				}"
+			>
+				<ApiKeyCreateOrEditModal :modal-name="modalName" :mode="mode" :active-id="activeId" />
+			</template>
+		</ModalRoot>
+
 		<ModalRoot :name="ABOUT_MODAL_KEY">
 			<AboutModal />
 		</ModalRoot>
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index 07ab0ae294..fe49d1318c 100644
--- a/packages/editor-ui/src/components/NDVDraggablePanels.vue
+++ b/packages/editor-ui/src/components/NDVDraggablePanels.vue
@@ -375,6 +375,7 @@ function onDragEnd() {
 				:min-width="MIN_PANEL_WIDTH"
 				:grid-size="20"
 				:supported-directions="supportedResizeDirections"
+				outset
 				@resize="onResizeThrottle"
 				@resizeend="onResizeEnd"
 			>
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index f20724bd5f..5c2336f4df 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -46,7 +46,8 @@ import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import type { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
 import { get } from 'lodash-es';
-import { N8nIconButton, useDeviceSupport } from 'n8n-design-system';
+import { N8nIconButton } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 
 type Props = {
 	name: string;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index b982e4ecee..904c58133d 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -6,6 +6,7 @@ import {
 	CREDENTIAL_ONLY_NODE_PREFIX,
 	DEFAULT_SUBCATEGORY,
 	DRAG_EVENT_DATA_KEY,
+	HITL_SUBCATEGORY,
 } from '@/constants';
 
 import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
@@ -44,6 +45,9 @@ const draggablePosition = ref({ x: -100, y: -100 });
 const draggableDataTransfer = ref(null as Element | null);
 
 const description = computed<string>(() => {
+	if (isSendAndWaitCategory.value) {
+		return '';
+	}
 	if (
 		props.subcategory === DEFAULT_SUBCATEGORY &&
 		!props.nodeType.name.startsWith(CREDENTIAL_ONLY_NODE_PREFIX)
@@ -56,7 +60,8 @@ const description = computed<string>(() => {
 		fallback: props.nodeType.description,
 	});
 });
-const showActionArrow = computed(() => hasActions.value);
+const showActionArrow = computed(() => hasActions.value && !isSendAndWaitCategory.value);
+const isSendAndWaitCategory = computed(() => activeViewStack.subcategory === HITL_SUBCATEGORY);
 const dataTestId = computed(() =>
 	hasActions.value ? 'node-creator-action-item' : 'node-creator-node-item',
 );
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
index d7ed3d87f0..1cba28c4ed 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
 import { camelCase } from 'lodash-es';
 import { computed } from 'vue';
-import type { INodeCreateElement, NodeCreateElement, NodeFilterType } from '@/Interface';
+import type {
+	ActionTypeDescription,
+	INodeCreateElement,
+	NodeCreateElement,
+	NodeFilterType,
+} from '@/Interface';
 import {
 	TRIGGER_NODE_CREATOR_VIEW,
 	HTTP_REQUEST_NODE_TYPE,
@@ -9,6 +14,7 @@ import {
 	REGULAR_NODE_CREATOR_VIEW,
 	AI_NODE_CREATOR_VIEW,
 	AI_OTHERS_NODE_CREATOR_VIEW,
+	HITL_SUBCATEGORY,
 } from '@/constants';
 
 import type { BaseTextKey } from '@/plugins/i18n';
@@ -26,7 +32,7 @@ import { useI18n } from '@/composables/useI18n';
 import { getNodeIcon, getNodeIconColor, getNodeIconUrl } from '@/utils/nodeTypesUtils';
 import { useUIStore } from '@/stores/ui.store';
 import { useActions } from '../composables/useActions';
-import type { INodeParameters } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeParameters } from 'n8n-workflow';
 
 export interface Props {
 	rootView: 'trigger' | 'action';
@@ -51,12 +57,19 @@ const globalSearchItemsDiff = computed(() => useViewStacks().globalSearchItemsDi
 
 function getFilteredActions(node: NodeCreateElement) {
 	const nodeActions = actions?.[node.key] || [];
+	if (activeViewStack.value.subcategory === HITL_SUBCATEGORY) {
+		return getHumanInTheLoopActions(nodeActions);
+	}
 	if (activeViewStack.value.actionsFilter) {
 		return activeViewStack.value.actionsFilter(nodeActions);
 	}
 	return nodeActions;
 }
 
+function getHumanInTheLoopActions(nodeActions: ActionTypeDescription[]) {
+	return nodeActions.filter((action) => action.actionKey === SEND_AND_WAIT_OPERATION);
+}
+
 function selectNodeType(nodeTypes: string[]) {
 	emit('nodeTypeSelected', nodeTypes);
 }
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
index c451f2c764..bdc2b86816 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
@@ -136,7 +136,7 @@ describe('NodesListPanel', () => {
 
 			await nextTick();
 			expect(screen.getByText('What happens next?')).toBeInTheDocument();
-			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(5);
+			expect(screen.queryAllByTestId('item-iterator-item')).toHaveLength(6);
 
 			screen.getByText('Action in an app').click();
 			await nextTick();
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
index e430ba0ed5..061c6ea244 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -6,6 +6,7 @@ import {
 	AI_NODE_CREATOR_VIEW,
 	REGULAR_NODE_CREATOR_VIEW,
 	TRIGGER_NODE_CREATOR_VIEW,
+	AI_UNCATEGORIZED_CATEGORY,
 } from '@/constants';
 
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
@@ -95,6 +96,7 @@ watch(
 			[REGULAR_NODE_CREATOR_VIEW]: RegularView,
 			[AI_NODE_CREATOR_VIEW]: AIView,
 			[AI_OTHERS_NODE_CREATOR_VIEW]: AINodesView,
+			[AI_UNCATEGORIZED_CATEGORY]: AINodesView,
 		};
 
 		const itemKey = selectedView;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
index c57d7f5464..7ec71cc840 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -313,50 +313,54 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		}
 
 		await nextTick();
-		pushViewStack({
-			title: relatedAIView?.properties.title,
-			...extendedInfo,
-			rootView: AI_OTHERS_NODE_CREATOR_VIEW,
-			mode: 'nodes',
-			items: nodeCreatorStore.allNodeCreatorNodes,
-			nodeIcon: {
-				iconType: 'icon',
-				icon: relatedAIView?.properties.icon,
-				color: relatedAIView?.properties.iconProps?.color,
-			},
-			panelClass: relatedAIView?.properties.panelClass,
-			baseFilter: (i: INodeCreateElement) => {
-				// AI Code node could have any connection type so we don't want to display it
-				// in the compatible connection view as it would be displayed in all of them
-				if (i.key === AI_CODE_NODE_TYPE) return false;
-				const displayNode = nodesByConnectionType[connectionType].includes(i.key);
 
-				// TODO: Filtering works currently fine for displaying compatible node when dropping
-				//       input connections. However, it does not work for output connections.
-				//       For that reason does it currently display nodes that are maybe not compatible
-				//       but then errors once it got selected by the user.
-				if (displayNode && filter?.nodes?.length) {
-					return filter.nodes.includes(i.key);
-				}
+		pushViewStack(
+			{
+				title: relatedAIView?.properties.title,
+				...extendedInfo,
+				rootView: AI_OTHERS_NODE_CREATOR_VIEW,
+				mode: 'nodes',
+				items: nodeCreatorStore.allNodeCreatorNodes,
+				nodeIcon: {
+					iconType: 'icon',
+					icon: relatedAIView?.properties.icon,
+					color: relatedAIView?.properties.iconProps?.color,
+				},
+				panelClass: relatedAIView?.properties.panelClass,
+				baseFilter: (i: INodeCreateElement) => {
+					// AI Code node could have any connection type so we don't want to display it
+					// in the compatible connection view as it would be displayed in all of them
+					if (i.key === AI_CODE_NODE_TYPE) return false;
+					const displayNode = nodesByConnectionType[connectionType].includes(i.key);
 
-				return displayNode;
+					// TODO: Filtering works currently fine for displaying compatible node when dropping
+					//       input connections. However, it does not work for output connections.
+					//       For that reason does it currently display nodes that are maybe not compatible
+					//       but then errors once it got selected by the user.
+					if (displayNode && filter?.nodes?.length) {
+						return filter.nodes.includes(i.key);
+					}
+
+					return displayNode;
+				},
+				itemsMapper(item) {
+					return {
+						...item,
+						subcategory: connectionType,
+					};
+				},
+				actionsFilter: (items: ActionTypeDescription[]) => {
+					// Filter out actions that are not compatible with the connection type
+					if (items.some((item) => item.outputConnectionType)) {
+						return items.filter((item) => item.outputConnectionType === connectionType);
+					}
+					return items;
+				},
+				hideActions: true,
+				preventBack: true,
 			},
-			itemsMapper(item) {
-				return {
-					...item,
-					subcategory: connectionType,
-				};
-			},
-			actionsFilter: (items: ActionTypeDescription[]) => {
-				// Filter out actions that are not compatible with the connection type
-				if (items.some((item) => item.outputConnectionType)) {
-					return items.filter((item) => item.outputConnectionType === connectionType);
-				}
-				return items;
-			},
-			hideActions: true,
-			preventBack: true,
-		});
+			{ resetStacks: true },
+		);
 	}
 
 	function setStackBaselineItems() {
@@ -417,7 +421,11 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		}));
 	}
 
-	function pushViewStack(stack: ViewStack) {
+	function pushViewStack(stack: ViewStack, options: { resetStacks?: boolean } = {}) {
+		if (options.resetStacks) {
+			resetViewStacks();
+		}
+
 		if (activeViewStack.value.uuid) {
 			updateCurrentViewStack({ activeIndex: getActiveItemIndex() });
 		}
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index 1f392b1cce..ffac7aac90 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -13,6 +13,7 @@ import {
 	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
 	DEFAULT_SUBCATEGORY,
+	HUMAN_IN_THE_LOOP_CATEGORY,
 } from '@/constants';
 import { v4 as uuidv4 } from 'uuid';
 
@@ -23,6 +24,7 @@ import { sortBy } from 'lodash-es';
 import * as changeCase from 'change-case';
 
 import { useSettingsStore } from '@/stores/settings.store';
+import { SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
 export function transformNodeType(
 	node: SimplifiedNodeType,
@@ -46,7 +48,11 @@ export function transformNodeType(
 }
 
 export function subcategorizeItems(items: SimplifiedNodeType[]) {
-	const WHITE_LISTED_SUBCATEGORIES = [CORE_NODES_CATEGORY, AI_SUBCATEGORY];
+	const WHITE_LISTED_SUBCATEGORIES = [
+		CORE_NODES_CATEGORY,
+		AI_SUBCATEGORY,
+		HUMAN_IN_THE_LOOP_CATEGORY,
+	];
 	return items.reduce((acc: SubcategorizedNodeTypes, item) => {
 		// Only some subcategories are allowed
 		let subcategories: string[] = [DEFAULT_SUBCATEGORY];
@@ -174,13 +180,21 @@ export function groupItemsInSections(
 
 		return 0;
 	});
-	if (result.length <= 1) {
+	if (!shouldRenderSectionSubtitle(result)) {
 		return items;
 	}
 
 	return result;
 }
 
+const shouldRenderSectionSubtitle = (sections: SectionCreateElement[]) => {
+	if (!sections.length) return false;
+	if (sections.length > 1) return true;
+	if (sections[0].key === SEND_AND_WAIT_OPERATION) return true;
+
+	return false;
+};
+
 export const formatTriggerActionName = (actionPropertyName: string) => {
 	let name = actionPropertyName;
 	if (actionPropertyName.includes('.')) {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index 14d19307c3..1c34520b9f 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -49,12 +49,14 @@ import {
 	SPLIT_IN_BATCHES_NODE_TYPE,
 	HTTP_REQUEST_NODE_TYPE,
 	HELPERS_SUBCATEGORY,
+	HITL_SUBCATEGORY,
 	RSS_READ_NODE_TYPE,
 	EMAIL_SEND_NODE_TYPE,
 	EDIT_IMAGE_NODE_TYPE,
 	COMPRESSION_NODE_TYPE,
 	AI_CODE_TOOL_LANGCHAIN_NODE_TYPE,
 	AI_WORKFLOW_TOOL_LANGCHAIN_NODE_TYPE,
+	HUMAN_IN_THE_LOOP_CATEGORY,
 } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
@@ -141,9 +143,10 @@ export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
 	const chainNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_CHAINS);
 	const agentNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_AGENTS);
 
-	const websiteCategoryURL = templatesStore.websiteTemplateRepositoryParameters;
-
-	websiteCategoryURL.append('utm_user_role', 'AdvancedAI');
+	const websiteCategoryURLParams = templatesStore.websiteTemplateRepositoryParameters;
+	websiteCategoryURLParams.append('utm_user_role', 'AdvancedAI');
+	const websiteCategoryURL =
+		templatesStore.constructTemplateRepositoryURL(websiteCategoryURLParams);
 
 	return {
 		value: AI_NODE_CREATOR_VIEW,
@@ -158,7 +161,7 @@ export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
 					icon: 'box-open',
 					description: i18n.baseText('nodeCreator.aiPanel.linkItem.description'),
 					name: 'ai_templates_root',
-					url: websiteCategoryURL.toString(),
+					url: websiteCategoryURL,
 					tag: {
 						type: 'info',
 						text: i18n.baseText('nodeCreator.triggerHelperPanel.manualTriggerTag'),
@@ -441,6 +444,12 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 		AI_TRANSFORM_NODE_TYPE,
 	];
 
+	const getSendAndWaitNodes = (nodes: SimplifiedNodeType[]) => {
+		return (nodes ?? [])
+			.filter((node) => node.codex?.categories?.includes(HUMAN_IN_THE_LOOP_CATEGORY))
+			.map((node) => node.name);
+	};
+
 	const view: NodeView = {
 		value: REGULAR_NODE_CREATOR_VIEW,
 		title: i18n.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
@@ -531,22 +540,39 @@ export function RegularView(nodes: SimplifiedNodeType[]) {
 					],
 				},
 			},
+			// To add node to this subcategory:
+			// - add "HITL" to the "categories" property of the node's codex
+			// - add "HITL": ["Human in the Loop"] to the "subcategories" property of the node's codex
+			// node has to have the "sendAndWait" operation, if a new operation needs to be included here:
+			// - update getHumanInTheLoopActions in packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+			{
+				type: 'subcategory',
+				key: HITL_SUBCATEGORY,
+				category: HUMAN_IN_THE_LOOP_CATEGORY,
+				properties: {
+					title: HITL_SUBCATEGORY,
+					icon: 'user-check',
+					sections: [
+						{
+							key: 'sendAndWait',
+							title: i18n.baseText('nodeCreator.sectionNames.sendAndWait'),
+							items: getSendAndWaitNodes(nodes),
+						},
+					],
+				},
+			},
 		],
 	};
 
 	const hasAINodes = (nodes ?? []).some((node) => node.codex?.categories?.includes(AI_SUBCATEGORY));
 	if (hasAINodes)
-		view.items.push({
+		view.items.unshift({
 			key: AI_NODE_CREATOR_VIEW,
 			type: 'view',
 			properties: {
 				title: i18n.baseText('nodeCreator.aiPanel.langchainAiNodes'),
 				icon: 'robot',
 				description: i18n.baseText('nodeCreator.aiPanel.nodesForAi'),
-				tag: {
-					type: 'success',
-					text: i18n.baseText('nodeCreator.aiPanel.newTag'),
-				},
 				borderless: true,
 			},
 		} as NodeViewItem);
diff --git a/packages/editor-ui/src/components/NodeCredentials.test.ts b/packages/editor-ui/src/components/NodeCredentials.test.ts
index 2839a75c03..e9a461ebe2 100644
--- a/packages/editor-ui/src/components/NodeCredentials.test.ts
+++ b/packages/editor-ui/src/components/NodeCredentials.test.ts
@@ -1,5 +1,6 @@
 import { describe, it } from 'vitest';
-import { fireEvent, screen } from '@testing-library/vue';
+import { screen } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
 import { createTestingPinia } from '@pinia/testing';
 import NodeCredentials from './NodeCredentials.vue';
 import type { RenderOptions } from '@/__tests__/render';
@@ -8,6 +9,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { mockedStore } from '@/__tests__/utils';
 import type { INodeUi } from '@/Interface';
 import { useNDVStore } from '@/stores/ndv.store';
+import { useUIStore } from '../stores/ui.store';
 
 const httpNode: INodeUi = {
 	parameters: {
@@ -67,6 +69,7 @@ describe('NodeCredentials', () => {
 
 	const credentialsStore = mockedStore(useCredentialsStore);
 	const ndvStore = mockedStore(useNDVStore);
+	const uiStore = mockedStore(useUIStore);
 
 	beforeAll(() => {
 		credentialsStore.state.credentialTypes = {
@@ -120,7 +123,7 @@ describe('NodeCredentials', () => {
 
 		const credentialsSelect = screen.getByTestId('node-credentials-select');
 
-		await fireEvent.click(credentialsSelect);
+		await userEvent.click(credentialsSelect);
 
 		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
 	});
@@ -150,7 +153,7 @@ describe('NodeCredentials', () => {
 
 		const credentialsSelect = screen.getByTestId('node-credentials-select');
 
-		await fireEvent.click(credentialsSelect);
+		await userEvent.click(credentialsSelect);
 
 		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
 		expect(screen.queryByText('OpenAi account 2')).not.toBeInTheDocument();
@@ -188,9 +191,69 @@ describe('NodeCredentials', () => {
 
 		const credentialsSelect = screen.getByTestId('node-credentials-select');
 
-		await fireEvent.click(credentialsSelect);
+		await userEvent.click(credentialsSelect);
 
 		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
 		expect(screen.queryByText('OpenAi account 2')).toBeInTheDocument();
 	});
+
+	it('should filter available credentials in the dropdown', async () => {
+		ndvStore.activeNode = httpNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+			test: {
+				id: 'test',
+				name: 'Test OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent();
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+
+		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
+		expect(screen.queryByText('Test OpenAi account')).toBeInTheDocument();
+
+		const credentialSearch = credentialsSelect.querySelector('input') as HTMLElement;
+		await userEvent.type(credentialSearch, 'test');
+
+		expect(screen.queryByText('OpenAi account')).not.toBeInTheDocument();
+		expect(screen.queryByText('Test OpenAi account')).toBeInTheDocument();
+	});
+
+	it('should open the new credential modal when clicked', async () => {
+		ndvStore.activeNode = httpNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent();
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+		await userEvent.click(screen.getByTestId('node-credentials-select-item-new'));
+
+		expect(uiStore.openNewCredential).toHaveBeenCalledWith('openAiApi', true);
+	});
 });
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 8fe4b15153..22e4c908af 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -2,11 +2,12 @@
 import type { ICredentialsResponse, INodeUi, INodeUpdatePropertiesInformation } from '@/Interface';
 import {
 	HTTP_REQUEST_NODE_TYPE,
+	type ICredentialType,
 	type INodeCredentialDescription,
 	type INodeCredentialsDetails,
 	type NodeParameterValueType,
 } from 'n8n-workflow';
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useToast } from '@/composables/useToast';
@@ -31,6 +32,7 @@ import {
 	updateNodeAuthType,
 } from '@/utils/nodeTypesUtils';
 import {
+	N8nIcon,
 	N8nInput,
 	N8nInputLabel,
 	N8nOption,
@@ -67,7 +69,7 @@ const emit = defineEmits<{
 
 const telemetry = useTelemetry();
 const i18n = useI18n();
-const NEW_CREDENTIALS_TEXT = `- ${i18n.baseText('nodeCredentials.createNew')} -`;
+const NEW_CREDENTIALS_TEXT = i18n.baseText('nodeCredentials.createNew');
 
 const credentialsStore = useCredentialsStore();
 const nodeTypesStore = useNodeTypesStore();
@@ -79,7 +81,9 @@ const nodeHelpers = useNodeHelpers();
 const toast = useToast();
 
 const subscribedToCredentialType = ref('');
+const filter = ref('');
 const listeningForAuthChange = ref(false);
+const selectRefs = ref<Array<InstanceType<typeof N8nSelect>>>([]);
 
 const credentialTypesNode = computed(() =>
 	credentialTypesNodeDescription.value.map(
@@ -344,9 +348,8 @@ function onCredentialSelected(
 	credentialId: string | null | undefined,
 	showAuthOptions = false,
 ) {
-	const newCredentialOptionSelected = credentialId === NEW_CREDENTIALS_TEXT;
-	if (!credentialId || newCredentialOptionSelected) {
-		createNewCredential(credentialType, newCredentialOptionSelected, showAuthOptions);
+	if (!credentialId) {
+		createNewCredential(credentialType, false, showAuthOptions);
 		return;
 	}
 
@@ -501,6 +504,20 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	}
 	return i18n.baseText('nodeCredentials.credentialsLabel');
 }
+
+function setFilter(newFilter = '') {
+	filter.value = newFilter;
+}
+
+function matches(needle: string, haystack: string) {
+	return haystack.toLocaleLowerCase().includes(needle);
+}
+
+async function onClickCreateCredential(type: ICredentialType | INodeCredentialDescription) {
+	selectRefs.value.forEach((select) => select.blur());
+	await nextTick();
+	createNewCredential(type.name, true, showMixedCredentials(type));
+}
 </script>
 
 <template>
@@ -530,16 +547,20 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 					data-test-id="node-credentials-select"
 				>
 					<N8nSelect
+						ref="selectRefs"
 						:model-value="getSelectedId(type.name)"
 						:placeholder="getSelectPlaceholder(type.name, getIssues(type.name))"
 						size="small"
+						filterable
+						:filter-method="setFilter"
+						:popper-class="$style.selectPopper"
 						@update:model-value="
 							(value: string) => onCredentialSelected(type.name, value, showMixedCredentials(type))
 						"
 						@blur="emit('blur', 'credentials')"
 					>
 						<N8nOption
-							v-for="item in options"
+							v-for="item in options.filter((o) => matches(filter, o.name))"
 							:key="item.id"
 							:data-test-id="`node-credentials-select-item-${item.id}`"
 							:label="item.name"
@@ -550,13 +571,17 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 								<N8nText size="small">{{ item.typeDisplayName }}</N8nText>
 							</div>
 						</N8nOption>
-						<N8nOption
-							:key="NEW_CREDENTIALS_TEXT"
-							data-test-id="node-credentials-select-item-new"
-							:value="NEW_CREDENTIALS_TEXT"
-							:label="NEW_CREDENTIALS_TEXT"
-						>
-						</N8nOption>
+						<template #empty> </template>
+						<template #footer>
+							<div
+								data-test-id="node-credentials-select-item-new"
+								:class="['clickable', $style.newCredential]"
+								@click="onClickCreateCredential(type)"
+							>
+								<N8nIcon size="xsmall" icon="plus" />
+								<N8nText bold>{{ NEW_CREDENTIALS_TEXT }}</N8nText>
+							</div>
+						</template>
 					</N8nSelect>
 
 					<div v-if="getIssues(type.name).length && !hideIssues" :class="$style.warning">
@@ -567,7 +592,7 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 									:items="getIssues(type.name)"
 								/>
 							</template>
-							<font-awesome-icon icon="exclamation-triangle" />
+							<N8nIcon icon="exclamation-triangle" />
 						</N8nTooltip>
 					</div>
 
@@ -576,7 +601,7 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 						:class="$style.edit"
 						data-test-id="credential-edit-button"
 					>
-						<font-awesome-icon
+						<N8nIcon
 							icon="pen"
 							class="clickable"
 							:title="i18n.baseText('nodeCredentials.updateCredential')"
@@ -598,10 +623,25 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	}
 }
 
+.selectPopper {
+	:global(.el-select-dropdown__list) {
+		padding: 0;
+	}
+
+	:has(.newCredential:hover) :global(.hover) {
+		background-color: transparent;
+	}
+
+	&:not(:has(li)) .newCredential {
+		border-top: none;
+		box-shadow: none;
+		border-radius: var(--border-radius-base);
+	}
+}
+
 .warning {
-	min-width: 20px;
-	margin-left: 5px;
-	color: #ff8080;
+	margin-left: var(--spacing-4xs);
+	color: var(--color-danger-light);
 	font-size: var(--font-size-s);
 }
 
@@ -610,8 +650,7 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	justify-content: center;
 	align-items: center;
 	color: var(--color-text-base);
-	min-width: 20px;
-	margin-left: 5px;
+	margin-left: var(--spacing-3xs);
 	font-size: var(--font-size-s);
 }
 
@@ -629,4 +668,21 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	display: flex;
 	flex-direction: column;
 }
+
+.newCredential {
+	display: flex;
+	gap: var(--spacing-3xs);
+	align-items: center;
+	font-weight: var(--font-weight-bold);
+	padding: var(--spacing-xs) var(--spacing-m);
+	background-color: var(--color-background-light);
+
+	border-top: var(--border-base);
+	box-shadow: var(--box-shadow-light);
+	clip-path: inset(-12px 0 0 0); // Only show box shadow on top
+
+	&:hover {
+		color: var(--color-primary);
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 212fc4c91e..55807cbcf0 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -28,7 +28,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useMessage } from '@/composables/useMessage';
 import { useExternalHooks } from '@/composables/useExternalHooks';
@@ -628,6 +628,7 @@ watch(
 					);
 
 					telemetry.track('User opened node modal', {
+						node_id: activeNode.value?.id,
 						node_type: activeNodeType.value ? activeNodeType.value?.name : '',
 						workflow_id: workflowsStore.workflowId,
 						push_ref: pushRef.value,
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index b46c6b0a43..8ef10dd1be 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -319,6 +319,7 @@ async function onClick() {
 
 	if (isChatNode.value || (isChatChild.value && ndvStore.isInputPanelEmpty)) {
 		ndvStore.setActiveNodeName(null);
+		workflowsStore.chatPartialExecutionDestinationNode = props.nodeName;
 		nodeViewEventBus.emit('openChat');
 	} else if (isListeningForEvents.value) {
 		await stopWaitingForWebhook();
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index aff304a3cf..ac13a67c95 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -4,7 +4,6 @@ import {
 	NodeConnectionType,
 	type IRunData,
 	type IRunExecutionData,
-	type NodeError,
 	type Workflow,
 } from 'n8n-workflow';
 import RunData from './RunData.vue';
@@ -120,14 +119,17 @@ const hasAiMetadata = computed(() => {
 	return false;
 });
 
+const hasError = computed(() =>
+	Boolean(
+		workflowRunData.value &&
+			node.value &&
+			workflowRunData.value[node.value.name]?.[props.runIndex]?.error,
+	),
+);
+
 // Determine the initial output mode to logs if the node has an error and the logs are available
 const defaultOutputMode = computed<OutputType>(() => {
-	const hasError =
-		workflowRunData.value &&
-		node.value &&
-		(workflowRunData.value[node.value.name]?.[props.runIndex]?.error as NodeError);
-
-	return Boolean(hasError) && hasAiMetadata.value ? OUTPUT_TYPE.LOGS : OUTPUT_TYPE.REGULAR;
+	return hasError.value && hasAiMetadata.value ? OUTPUT_TYPE.LOGS : OUTPUT_TYPE.REGULAR;
 });
 
 const isNodeRunning = computed(() => {
@@ -216,7 +218,7 @@ const canPinData = computed(() => {
 });
 
 const allToolsWereUnusedNotice = computed(() => {
-	if (!node.value || runsCount.value === 0) return undefined;
+	if (!node.value || runsCount.value === 0 || hasError.value) return undefined;
 
 	// With pinned data there's no clear correct answer for whether
 	// we should use historic or current parents, so we don't show the notice,
diff --git a/packages/editor-ui/src/components/ParameterInput.test.ts b/packages/editor-ui/src/components/ParameterInput.test.ts
index 4ee22ec0dd..316622508f 100644
--- a/packages/editor-ui/src/components/ParameterInput.test.ts
+++ b/packages/editor-ui/src/components/ParameterInput.test.ts
@@ -8,6 +8,7 @@ import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
 import type { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
+import { createEventBus } from 'n8n-design-system';
 
 let mockNdvState: Partial<ReturnType<typeof useNDVStore>>;
 let mockNodeTypesState: Partial<ReturnType<typeof useNodeTypesStore>>;
@@ -233,4 +234,88 @@ describe('ParameterInput.vue', () => {
 
 		expect(emitted('update')).toBeUndefined();
 	});
+
+	test('should reset bool on eventBus:removeExpression', async () => {
+		const eventBus = createEventBus();
+		const { emitted } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'aSwitch',
+				parameter: {
+					displayName: 'A Switch',
+					name: 'aSwitch',
+					type: 'boolean',
+					default: true,
+				},
+				modelValue: '={{ }}', // note that this makes a syntax error
+				eventBus,
+			},
+		});
+
+		eventBus.emit('optionSelected', 'removeExpression');
+		expect(emitted('update')).toContainEqual([expect.objectContaining({ value: true })]);
+	});
+
+	test('should reset bool with undefined evaluation on eventBus:removeExpression', async () => {
+		const eventBus = createEventBus();
+		const { emitted } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'aSwitch',
+				parameter: {
+					displayName: 'A Switch',
+					name: 'aSwitch',
+					type: 'boolean',
+					default: true,
+				},
+				modelValue: undefined,
+				eventBus,
+			},
+		});
+
+		eventBus.emit('optionSelected', 'removeExpression');
+		expect(emitted('update')).toContainEqual([expect.objectContaining({ value: true })]);
+	});
+
+	test('should reset number on eventBus:removeExpression', async () => {
+		const eventBus = createEventBus();
+		const { emitted } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'aNum',
+				parameter: {
+					displayName: 'A Num',
+					name: 'aNum',
+					type: 'number',
+					default: 6,
+				},
+				modelValue: '={{ }}', // note that this makes a syntax error
+				eventBus,
+			},
+		});
+
+		eventBus.emit('optionSelected', 'removeExpression');
+		expect(emitted('update')).toContainEqual([expect.objectContaining({ value: 6 })]);
+	});
+
+	test('should reset string on eventBus:removeExpression', async () => {
+		const eventBus = createEventBus();
+		const { emitted } = renderComponent(ParameterInput, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'aStr',
+				parameter: {
+					displayName: 'A Str',
+					name: 'aStr',
+					type: 'string',
+					default: 'some default',
+				},
+				modelValue: '={{ }}', // note that this makes a syntax error
+				eventBus,
+			},
+		});
+
+		eventBus.emit('optionSelected', 'removeExpression');
+		expect(emitted('update')).toContainEqual([expect.objectContaining({ value: '{{ }}' })]);
+	});
 });
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 359a0a6549..809b1edfe4 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -65,6 +65,7 @@ import { N8nIcon, N8nInput, N8nInputNumber, N8nOption, N8nSelect } from 'n8n-des
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useRouter } from 'vue-router';
+import { useElementSize } from '@vueuse/core';
 
 type Picker = { $emit: (arg0: string, arg1: Date) => void };
 
@@ -90,6 +91,7 @@ type Props = {
 	hideIssues?: boolean;
 	errorHighlight?: boolean;
 	isForCredential?: boolean;
+	canBeOverridden?: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -116,7 +118,7 @@ const emit = defineEmits<{
 const externalHooks = useExternalHooks();
 const i18n = useI18n();
 const nodeHelpers = useNodeHelpers();
-const { callDebounced } = useDebounce();
+const { debounce } = useDebounce();
 const router = useRouter();
 const workflowHelpers = useWorkflowHelpers({ router });
 const telemetry = useTelemetry();
@@ -398,6 +400,13 @@ const getIssues = computed<string[]>(() => {
 	return [];
 });
 
+const displayIssues = computed(
+	() =>
+		props.parameter.type !== 'credentialsSelect' &&
+		!isResourceLocatorParameter.value &&
+		getIssues.value.length > 0,
+);
+
 const editorType = computed<EditorType | 'json' | 'code'>(() => {
 	return getArgument<EditorType>('editor');
 });
@@ -421,17 +430,23 @@ const parameterOptions = computed<INodePropertyOptions[] | undefined>(() => {
 	return remoteParameterOptions.value;
 });
 
+const isSwitch = computed(
+	() => props.parameter.type === 'boolean' && !isModelValueExpression.value,
+);
+
+const isTextarea = computed(
+	() => props.parameter.type === 'string' && editorRows.value !== undefined,
+);
+
 const parameterInputClasses = computed(() => {
-	const classes: { [c: string]: boolean } = {
+	const classes: Record<string, boolean> = {
 		droppable: props.droppable,
 		activeDrop: props.activeDrop,
 	};
 
-	const rows = editorRows.value;
-	const isTextarea = props.parameter.type === 'string' && rows !== undefined;
-	const isSwitch = props.parameter.type === 'boolean' && !isModelValueExpression.value;
-
-	if (!isTextarea && !isSwitch) {
+	if (isSwitch.value) {
+		classes['parameter-switch'] = true;
+	} else {
 		classes['parameter-value-container'] = true;
 	}
 
@@ -722,6 +737,15 @@ function onResourceLocatorDrop(data: string) {
 	emit('drop', data);
 }
 
+function selectInput() {
+	const inputRef = inputField.value;
+	if (inputRef) {
+		if ('select' in inputRef) {
+			inputRef.select();
+		}
+	}
+}
+
 async function setFocus() {
 	if (['json'].includes(props.parameter.type) && getArgument('alwaysOpenEditWindow')) {
 		displayEditDialog();
@@ -777,9 +801,9 @@ function onTextInputChange(value: string) {
 
 	emit('textInput', parameterData);
 }
-function valueChangedDebounced(value: NodeParameterValueType | {} | Date) {
-	void callDebounced(valueChanged, { debounceTime: 100 }, value);
-}
+
+const valueChangedDebounced = debounce(valueChanged, { debounceTime: 100 });
+
 function onUpdateTextInput(value: string) {
 	valueChanged(value);
 	onTextInputChange(value);
@@ -837,6 +861,25 @@ function valueChanged(value: NodeParameterValueType | {} | Date) {
 			parameter: props.parameter.name,
 		});
 	}
+	// Track workflow input data mode change
+	const isWorkflowInputParameter =
+		props.parameter.name === 'inputSource' && props.parameter.default === 'workflowInputs';
+	if (isWorkflowInputParameter) {
+		trackWorkflowInputModeEvent(value as string);
+	}
+}
+
+function trackWorkflowInputModeEvent(value: string) {
+	const telemetryValuesMap: Record<string, string> = {
+		workflowInputs: 'fields',
+		jsonExample: 'json',
+		passthrough: 'all',
+	};
+	telemetry.track('User chose input data mode', {
+		option: telemetryValuesMap[value],
+		workflow_id: workflowsStore.workflowId,
+		node_id: node.value?.id,
+	});
 }
 
 async function optionSelected(command: string) {
@@ -889,11 +932,16 @@ async function optionSelected(command: string) {
 		if (isResourceLocatorParameter.value && isResourceLocatorValue(props.modelValue)) {
 			valueChanged({ __rl: true, value, mode: props.modelValue.mode });
 		} else {
-			let newValue = typeof value !== 'undefined' ? value : null;
+			let newValue: NodeParameterValueType | {} = typeof value !== 'undefined' ? value : null;
 
 			if (props.parameter.type === 'string') {
 				// Strip the '=' from the beginning
 				newValue = modelValueString.value ? modelValueString.value.toString().substring(1) : null;
+			} else if (newValue === null) {
+				// Invalid expressions land here
+				if (['number', 'boolean'].includes(props.parameter.type)) {
+					newValue = props.parameter.default;
+				}
 			}
 			valueChanged(newValue);
 		}
@@ -952,7 +1000,39 @@ onMounted(() => {
 	});
 });
 
+const { height } = useElementSize(wrapper);
+
+const isSingleLineInput = computed(() => {
+	if (isTextarea.value && !isModelValueExpression.value) {
+		return false;
+	}
+
+	/**
+	 * There is an awkward edge case here with text boxes that automatically
+	 * adjust their row count based on their content:
+	 *
+	 * If we move the overrideButton to the options row due to going multiline,
+	 * the text area gains more width and might return to single line.
+	 * This then causes the overrideButton to move inline, creating a loop which results in flickering UI.
+	 *
+	 * To avoid this, we treat 2 rows of input as single line if we were already single line.
+	 */
+	if (isSingleLineInput.value) {
+		return height.value <= 70;
+	}
+
+	return height.value <= 35;
+});
+
+defineExpose({
+	isSingleLineInput,
+	displaysIssues: displayIssues.value,
+	focusInput: async () => await setFocus(),
+	selectInput: () => selectInput(),
+});
+
 onBeforeUnmount(() => {
+	valueChangedDebounced.cancel();
 	props.eventBus.off('optionSelected', optionSelected);
 });
 
@@ -1029,7 +1109,16 @@ onUpdated(async () => {
 			@update:model-value="expressionUpdated"
 		></ExpressionEditModal>
 
-		<div class="parameter-input ignore-key-press-canvas" :style="parameterInputWrapperStyle">
+		<div
+			:class="[
+				'parameter-input',
+				'ignore-key-press-canvas',
+				{
+					[$style.noRightCornersInput]: canBeOverridden,
+				},
+			]"
+			:style="parameterInputWrapperStyle"
+		>
 			<ResourceLocator
 				v-if="parameter.type === 'resourceLocator'"
 				ref="resourceLocator"
@@ -1108,7 +1197,7 @@ onUpdated(async () => {
 				>
 					<div class="ignore-key-press-canvas code-edit-dialog">
 						<CodeNodeEditor
-							v-if="editorType === 'codeNodeEditor'"
+							v-if="editorType === 'codeNodeEditor' && codeEditDialogVisible"
 							:id="parameterId"
 							:mode="codeEditorMode"
 							:model-value="modelValueString"
@@ -1119,7 +1208,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<HtmlEditor
-							v-else-if="editorType === 'htmlEditor' && !codeEditDialogVisible"
+							v-else-if="editorType === 'htmlEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1129,7 +1218,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<SqlEditor
-							v-else-if="editorType === 'sqlEditor' && !codeEditDialogVisible"
+							v-else-if="editorType === 'sqlEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:dialect="getArgument('sqlDialect')"
 							:is-read-only="isReadOnly"
@@ -1138,7 +1227,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<JsEditor
-							v-else-if="editorType === 'jsEditor' && !codeEditDialogVisible"
+							v-else-if="editorType === 'jsEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1148,7 +1237,7 @@ onUpdated(async () => {
 						/>
 
 						<JsonEditor
-							v-else-if="parameter.type === 'json' && !codeEditDialogVisible"
+							v-else-if="parameter.type === 'json' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1256,7 +1345,7 @@ onUpdated(async () => {
 				</JsEditor>
 
 				<JsonEditor
-					v-else-if="parameter.type === 'json'"
+					v-else-if="parameter.type === 'json' && !codeEditDialogVisible"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly"
 					:rows="editorRows"
@@ -1505,11 +1594,19 @@ onUpdated(async () => {
 				<InlineExpressionTip />
 			</div>
 		</div>
-
-		<ParameterIssues
-			v-if="parameter.type !== 'credentialsSelect' && !isResourceLocatorParameter"
-			:issues="getIssues"
-		/>
+		<div
+			v-if="$slots.overrideButton"
+			:class="[
+				$style.overrideButton,
+				{
+					[$style.overrideButtonStandalone]: isSwitch,
+					[$style.overrideButtonInline]: !isSwitch,
+				},
+			]"
+		>
+			<slot name="overrideButton" />
+		</div>
+		<ParameterIssues v-if="displayIssues" :issues="getIssues" />
 	</div>
 </template>
 
@@ -1532,6 +1629,13 @@ onUpdated(async () => {
 	align-items: center;
 }
 
+.parameter-switch {
+	display: inline-flex;
+	align-self: flex-start;
+	justify-items: center;
+	gap: var(--spacing-xs);
+}
+
 .parameter-input {
 	display: inline-block;
 	position: relative;
@@ -1706,4 +1810,26 @@ onUpdated(async () => {
 	border-bottom-left-radius: 4px;
 	border-bottom-right-radius: 4px;
 }
+
+.noRightCornersInput > * {
+	--input-border-bottom-right-radius: 0;
+	--input-border-top-right-radius: 0;
+}
+
+.overrideButton {
+	align-self: start;
+}
+
+.overrideButtonStandalone {
+	position: relative;
+	/* This is to balance for the extra margin on the switch */
+	top: -2px;
+}
+
+.overrideButtonInline {
+	> button {
+		border-top-left-radius: 0;
+		border-bottom-left-radius: 0;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/ParameterInputFull.test.ts b/packages/editor-ui/src/components/ParameterInputFull.test.ts
new file mode 100644
index 0000000000..9dfe37fb4f
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterInputFull.test.ts
@@ -0,0 +1,158 @@
+import { renderComponent } from '@/__tests__/render';
+import type { useNDVStore } from '@/stores/ndv.store';
+import { createTestingPinia } from '@pinia/testing';
+import type { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import type { useSettingsStore } from '@/stores/settings.store';
+import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
+import ParameterInputFull from './ParameterInputFull.vue';
+import { FROM_AI_AUTO_GENERATED_MARKER } from 'n8n-workflow';
+
+type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+
+let mockNdvState: Partial<ReturnType<typeof useNDVStore>>;
+let mockNodeTypesState: Writeable<Partial<ReturnType<typeof useNodeTypesStore>>>;
+let mockSettingsState: Writeable<Partial<ReturnType<typeof useSettingsStore>>>;
+
+beforeEach(() => {
+	mockNdvState = {
+		hasInputData: true,
+		activeNode: {
+			id: '123',
+			name: 'myParam',
+			parameters: {},
+			position: [0, 0],
+			type: 'test',
+			typeVersion: 1,
+		},
+		isInputPanelEmpty: false,
+		isOutputPanelEmpty: false,
+	};
+	mockNodeTypesState = {
+		allNodeTypes: [],
+	};
+	mockSettingsState = {
+		settings: {
+			releaseChannel: 'stable',
+		} as never,
+		isEnterpriseFeatureEnabled: { externalSecrets: false } as never,
+	};
+	createAppModals();
+});
+
+vi.mock('@/stores/ndv.store', () => {
+	return {
+		useNDVStore: vi.fn(() => mockNdvState),
+	};
+});
+
+vi.mock('@/stores/nodeTypes.store', () => {
+	return {
+		useNodeTypesStore: vi.fn(() => mockNodeTypesState),
+	};
+});
+
+vi.mock('@/stores/settings.store', () => {
+	return {
+		useSettingsStore: vi.fn(() => mockSettingsState),
+	};
+});
+
+describe('ParameterInputFull.vue', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+		createAppModals();
+	});
+
+	afterEach(() => {
+		cleanupAppModals();
+	});
+
+	it('should render basic parameter', async () => {
+		mockNodeTypesState.getNodeType = vi.fn().mockReturnValue({});
+		const { getByTestId } = renderComponent(ParameterInputFull, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'myParam',
+				parameter: {
+					displayName: 'My Param',
+					name: 'myParam',
+					type: 'string',
+				},
+			},
+		});
+		expect(getByTestId('parameter-input')).toBeInTheDocument();
+	});
+
+	it('should render parameter with override button inline', async () => {
+		mockNodeTypesState.getNodeType = vi.fn().mockReturnValue({
+			codex: {
+				categories: ['AI'],
+				subcategories: { AI: ['Tools'] },
+			},
+		});
+		const { getByTestId } = renderComponent(ParameterInputFull, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'myParam',
+				parameter: {
+					displayName: 'My Param',
+					name: 'myParam',
+					type: 'string',
+				},
+				value: '',
+			},
+		});
+		expect(getByTestId('parameter-input')).toBeInTheDocument();
+		expect(getByTestId('from-ai-override-button')).toBeInTheDocument();
+	});
+
+	it('should render parameter with override button in options', async () => {
+		mockNodeTypesState.getNodeType = vi.fn().mockReturnValue({
+			codex: {
+				categories: ['AI'],
+				subcategories: { AI: ['Tools'] },
+			},
+		});
+		const { getByTestId } = renderComponent(ParameterInputFull, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'myParam',
+				parameter: {
+					displayName: 'My Param',
+					name: 'myParam',
+					type: 'string',
+				},
+				value: `={{
+					'and the air is free'
+
+
+				}}`,
+			},
+		});
+		expect(getByTestId('parameter-input')).toBeInTheDocument();
+		expect(getByTestId('from-ai-override-button')).toBeInTheDocument();
+	});
+
+	it('should render parameter with active override', async () => {
+		mockNodeTypesState.getNodeType = vi.fn().mockReturnValue({
+			codex: {
+				categories: ['AI'],
+				subcategories: { AI: ['Tools'] },
+			},
+		});
+		const { queryByTestId, getByTestId } = renderComponent(ParameterInputFull, {
+			pinia: createTestingPinia(),
+			props: {
+				path: 'myParam',
+				value: `={{ ${FROM_AI_AUTO_GENERATED_MARKER} $fromAI('myParam') }}`,
+				parameter: {
+					displayName: 'My Param',
+					name: 'myParam',
+					type: 'string',
+				},
+			},
+		});
+		expect(getByTestId('fromAI-override-field')).toBeInTheDocument();
+		expect(queryByTestId('override-button')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 332011b9ea..8e2453becf 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -1,10 +1,12 @@
 <script setup lang="ts">
-import { computed, ref, watch } from 'vue';
+import { computed, type ComputedRef, ref, useTemplateRef, watch } from 'vue';
 import type { IUpdateInformation } from '@/Interface';
 
 import DraggableTarget from '@/components/DraggableTarget.vue';
 import ParameterInputWrapper from '@/components/ParameterInputWrapper.vue';
 import ParameterOptions from '@/components/ParameterOptions.vue';
+import FromAiOverrideButton from '@/components/ParameterInputOverrides/FromAiOverrideButton.vue';
+import FromAiOverrideField from '@/components/ParameterInputOverrides/FromAiOverrideField.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -12,8 +14,21 @@ import { getMappedResult } from '@/utils/mappingUtils';
 import { hasExpressionMapping, hasOnlyListMode, isValueExpression } from '@/utils/nodeTypesUtils';
 import { isResourceLocatorValue } from '@/utils/typeGuards';
 import { createEventBus } from 'n8n-design-system/utils';
-import type { INodeProperties, IParameterLabel, NodeParameterValueType } from 'n8n-workflow';
+import {
+	type INodeProperties,
+	type IParameterLabel,
+	type NodeParameterValueType,
+} from 'n8n-workflow';
 import { N8nInputLabel } from 'n8n-design-system';
+import {
+	buildValueFromOverride,
+	type FromAIOverride,
+	isFromAIOverrideValue,
+	makeOverrideValue,
+	updateFromAIOverrideValues,
+} from '../utils/fromAIOverrideUtils';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 type Props = {
 	parameter: INodeProperties;
@@ -54,8 +69,28 @@ const menuExpanded = ref(false);
 const forceShowExpression = ref(false);
 
 const ndvStore = useNDVStore();
+const nodeTypesStore = useNodeTypesStore();
+const telemetry = useTelemetry();
 
 const node = computed(() => ndvStore.activeNode);
+const fromAIOverride = ref<FromAIOverride | null>(
+	makeOverrideValue(
+		props,
+		node.value && nodeTypesStore.getNodeType(node.value.type, node.value.typeVersion),
+	),
+);
+
+const canBeContentOverride = computed(() => {
+	// The resourceLocator handles overrides separately
+	if (!node.value || isResourceLocator.value) return false;
+
+	return fromAIOverride.value !== null;
+});
+
+const isContentOverride = computed(
+	() => canBeContentOverride.value && !!isFromAIOverrideValue(props.value?.toString() ?? ''),
+);
+
 const hint = computed(() => i18n.nodeText().hint(props.parameter, props.path));
 
 const isResourceLocator = computed(
@@ -69,9 +104,21 @@ const isDropDisabled = computed(
 		isExpression.value,
 );
 const isExpression = computed(() => isValueExpression(props.parameter, props.value));
-const showExpressionSelector = computed(() =>
-	isResourceLocator.value ? !hasOnlyListMode(props.parameter) : true,
-);
+const showExpressionSelector = computed(() => {
+	if (isResourceLocator.value) {
+		// The resourceLocator handles overrides itself, so we use this hack to
+		// infer whether it's overridden and we should hide the toggle
+		const value =
+			props.value && typeof props.value === 'object' && 'value' in props.value && props.value.value;
+		if (value && isFromAIOverrideValue(String(value))) {
+			return false;
+		}
+
+		return !hasOnlyListMode(props.parameter);
+	}
+
+	return !isContentOverride.value;
+});
 
 function onFocus() {
 	focused.value = true;
@@ -98,6 +145,9 @@ function onMenuExpanded(expanded: boolean) {
 }
 
 function optionSelected(command: string) {
+	if (isContentOverride.value && command === 'resetValue') {
+		removeOverride(true);
+	}
 	eventBus.value.emit('optionSelected', command);
 }
 
@@ -189,6 +239,10 @@ function onDrop(newParamValue: string) {
 	}, 200);
 }
 
+const showOverrideButton = computed(
+	() => canBeContentOverride.value && !isContentOverride.value && !props.isReadOnly,
+);
+
 // When switching to read-only mode, reset the value to the default value
 watch(
 	() => props.isReadOnly,
@@ -199,10 +253,60 @@ watch(
 		}
 	},
 );
+
+const parameterInputWrapper = useTemplateRef('parameterInputWrapper');
+const isSingleLineInput: ComputedRef<boolean> = computed(
+	() => parameterInputWrapper.value?.isSingleLineInput ?? false,
+);
+
+function applyOverride() {
+	if (!fromAIOverride.value) return;
+
+	telemetry.track(
+		'User turned on fromAI override',
+		{
+			nodeType: node.value?.type,
+			parameter: props.path,
+		},
+		{ withPostHog: true },
+	);
+	updateFromAIOverrideValues(fromAIOverride.value, String(props.value));
+	const value = buildValueFromOverride(fromAIOverride.value, props, true);
+	valueChanged({
+		node: node.value?.name,
+		name: props.path,
+		value,
+	});
+}
+
+function removeOverride(clearField = false) {
+	if (!fromAIOverride.value) return;
+
+	telemetry.track(
+		'User turned off fromAI override',
+		{
+			nodeType: node.value?.type,
+			parameter: props.path,
+		},
+		{ withPostHog: true },
+	);
+	valueChanged({
+		node: node.value?.name,
+		name: props.path,
+		value: clearField
+			? props.parameter.default
+			: buildValueFromOverride(fromAIOverride.value, props, false),
+	});
+	void setTimeout(async () => {
+		await parameterInputWrapper.value?.focusInput();
+		parameterInputWrapper.value?.selectInput();
+	}, 0);
+}
 </script>
 
 <template>
 	<N8nInputLabel
+		ref="inputLabel"
 		:class="[$style.wrapper]"
 		:label="hideLabel ? '' : i18n.nodeText().inputLabelDisplayName(parameter, path)"
 		:tooltip-text="hideLabel ? '' : i18n.nodeText().inputLabelDescription(parameter, path)"
@@ -213,6 +317,21 @@ watch(
 		:size="label.size"
 		color="text-dark"
 	>
+		<template
+			v-if="showOverrideButton && !isSingleLineInput && optionsPosition === 'top'"
+			#persistentOptions
+		>
+			<div
+				:class="[
+					$style.noCornersBottom,
+					$style.overrideButtonInOptions,
+					{ [$style.overrideButtonIssueOffset]: parameterInputWrapper?.displaysIssues },
+				]"
+			>
+				<FromAiOverrideButton @click="applyOverride" />
+			</div>
+		</template>
+
 		<template v-if="displayOptions && optionsPosition === 'top'" #options>
 			<ParameterOptions
 				:parameter="parameter"
@@ -232,28 +351,41 @@ watch(
 			@drop="onDrop"
 		>
 			<template #default="{ droppable, activeDrop }">
-				<ParameterInputWrapper
-					:parameter="parameter"
-					:model-value="value"
-					:path="path"
+				<FromAiOverrideField
+					v-if="fromAIOverride && isContentOverride"
 					:is-read-only="isReadOnly"
-					:is-assignment="isAssignment"
-					:rows="rows"
-					:droppable="droppable"
-					:active-drop="activeDrop"
-					:force-show-expression="forceShowExpression"
-					:hint="hint"
-					:hide-hint="hideHint"
-					:hide-issues="hideIssues"
-					:label="label"
-					:event-bus="eventBus"
-					input-size="small"
-					@update="valueChanged"
-					@text-input="onTextInput"
-					@focus="onFocus"
-					@blur="onBlur"
-					@drop="onDrop"
+					@close="removeOverride"
 				/>
+				<div v-else>
+					<ParameterInputWrapper
+						ref="parameterInputWrapper"
+						:parameter="parameter"
+						:model-value="value"
+						:path="path"
+						:is-read-only="isReadOnly"
+						:is-assignment="isAssignment"
+						:rows="rows"
+						:droppable="droppable"
+						:active-drop="activeDrop"
+						:force-show-expression="forceShowExpression"
+						:hint="hint"
+						:hide-hint="hideHint"
+						:hide-issues="hideIssues"
+						:label="label"
+						:event-bus="eventBus"
+						:can-be-overridden="canBeContentOverride"
+						input-size="small"
+						@update="valueChanged"
+						@text-input="onTextInput"
+						@focus="onFocus"
+						@blur="onBlur"
+						@drop="onDrop"
+					>
+						<template v-if="showOverrideButton && isSingleLineInput" #overrideButton>
+							<FromAiOverrideButton @click="applyOverride" />
+						</template>
+					</ParameterInputWrapper>
+				</div>
 			</template>
 		</DraggableTarget>
 		<div
@@ -273,6 +405,14 @@ watch(
 				@menu-expanded="onMenuExpanded"
 			/>
 		</div>
+		<ParameterOverrideSelectableList
+			v-if="isContentOverride && fromAIOverride"
+			v-model="fromAIOverride"
+			:parameter="parameter"
+			:path="path"
+			:is-read-only="isReadOnly"
+			@update="valueChanged"
+		/>
 	</N8nInputLabel>
 </template>
 
@@ -287,6 +427,23 @@ watch(
 	}
 }
 
+.overrideButtonInOptions {
+	position: relative;
+	// To connect to input panel below the button
+	margin-bottom: -2px;
+}
+
+.overrideButtonIssueOffset {
+	right: 20px;
+	// this is necessary to push the other options to the left
+	margin-left: 20px;
+}
+
+.noCornersBottom > button {
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
 .options {
 	position: absolute;
 	bottom: -22px;
diff --git a/packages/editor-ui/src/components/ParameterInputList.test.constants.ts b/packages/editor-ui/src/components/ParameterInputList.test.constants.ts
new file mode 100644
index 0000000000..4e564aa90d
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterInputList.test.constants.ts
@@ -0,0 +1,70 @@
+import type { INodeUi } from '@/Interface';
+import type { INodeParameters, INodeProperties } from 'n8n-workflow';
+
+export const TEST_PARAMETERS: INodeProperties[] = [
+	{
+		displayName: 'Test Fixed Collection',
+		name: 'fixedCollectionTest',
+		placeholder: 'Test',
+		type: 'fixedCollection',
+		description:
+			'Test fixed collection description. This is a long description that should be wrapped.',
+		typeOptions: { multipleValues: true, sortable: true, minRequiredFields: 1 },
+		displayOptions: {
+			show: { '@version': [{ _cnd: { gte: 1.1 } }] },
+		},
+		default: {},
+		options: [
+			{
+				name: 'values',
+				displayName: 'Values',
+				values: [
+					{
+						displayName: 'Name',
+						name: 'name',
+						type: 'string',
+						default: '',
+						placeholder: 'e.g. fieldName',
+						description: 'A name of the field in the collection',
+						required: true,
+						noDataExpression: true,
+					},
+				],
+			},
+		],
+	},
+];
+
+export const FIXED_COLLECTION_PARAMETERS: INodeProperties[] = TEST_PARAMETERS.filter(
+	(p) => p.type === 'fixedCollection',
+);
+
+export const TEST_NODE_VALUES: INodeParameters = {
+	color: '#ff0000',
+	alwaysOutputData: false,
+	executeOnce: false,
+	notesInFlow: false,
+	onError: 'stopWorkflow',
+	retryOnFail: false,
+	maxTries: 3,
+	waitBetweenTries: 1000,
+	notes: '',
+	parameters: { fixedCollectionTest: {} },
+};
+
+export const TEST_NODE_NO_ISSUES: INodeUi = {
+	id: 'test-123',
+	parameters: { fixedCollectionTest: { values: [{ name: 'firstName' }] } },
+	typeVersion: 1.1,
+	name: 'Test Node',
+	type: 'n8n-nodes-base.executeWorkflowTrigger',
+	position: [260, 340],
+};
+
+export const TEST_ISSUE = 'At least 1 field is required.';
+
+export const TEST_NODE_WITH_ISSUES: INodeUi = {
+	...TEST_NODE_NO_ISSUES,
+	parameters: { fixedCollectionTest: {} },
+	issues: { parameters: { fixedCollectionTest: [TEST_ISSUE] } },
+};
diff --git a/packages/editor-ui/src/components/ParameterInputList.test.ts b/packages/editor-ui/src/components/ParameterInputList.test.ts
new file mode 100644
index 0000000000..aa5f6a941f
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterInputList.test.ts
@@ -0,0 +1,101 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import ParameterInputList from './ParameterInputList.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { mockedStore } from '@/__tests__/utils';
+import { useNDVStore } from '@/stores/ndv.store';
+import {
+	TEST_NODE_NO_ISSUES,
+	TEST_PARAMETERS,
+	TEST_NODE_VALUES,
+	TEST_NODE_WITH_ISSUES,
+	FIXED_COLLECTION_PARAMETERS,
+	TEST_ISSUE,
+} from './ParameterInputList.test.constants';
+
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+	const params = {};
+	const location = {};
+	return {
+		...actual,
+		useRouter: () => ({
+			push: vi.fn(),
+		}),
+		useRoute: () => ({
+			params,
+			location,
+		}),
+	};
+});
+
+let ndvStore: ReturnType<typeof mockedStore<typeof useNDVStore>>;
+
+const renderComponent = createComponentRenderer(ParameterInputList, {
+	props: {
+		hideDelete: true,
+		indent: true,
+		isReadOnly: false,
+	},
+	global: {
+		stubs: {
+			ParameterInputFull: { template: '<div data-test-id="parameter-input"></div>' },
+			Suspense: { template: '<div data-test-id="suspense-stub"><slot></slot></div>' },
+		},
+	},
+});
+
+describe('ParameterInputList', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		ndvStore = mockedStore(useNDVStore);
+	});
+
+	it('renders', () => {
+		ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+		expect(() =>
+			renderComponent({
+				props: {
+					parameters: TEST_PARAMETERS,
+					nodeValues: TEST_NODE_VALUES,
+				},
+			}),
+		).not.toThrow();
+	});
+
+	it('renders fixed collection inputs correctly', () => {
+		ndvStore.activeNode = TEST_NODE_NO_ISSUES;
+		const { getAllByTestId, getByText } = renderComponent({
+			props: {
+				parameters: TEST_PARAMETERS,
+				nodeValues: TEST_NODE_VALUES,
+			},
+		});
+
+		// Should render labels for all parameters
+		TEST_PARAMETERS.forEach((parameter) => {
+			expect(getByText(parameter.displayName)).toBeInTheDocument();
+		});
+		// Should render input placeholders for all fixed collection parameters
+		expect(getAllByTestId('suspense-stub')).toHaveLength(FIXED_COLLECTION_PARAMETERS.length);
+	});
+
+	it('renders fixed collection inputs correctly with issues', () => {
+		ndvStore.activeNode = TEST_NODE_WITH_ISSUES;
+		const { getByText, getByTestId } = renderComponent({
+			props: {
+				parameters: TEST_PARAMETERS,
+				nodeValues: TEST_NODE_VALUES,
+			},
+		});
+
+		// Should render labels for all parameters
+		TEST_PARAMETERS.forEach((parameter) => {
+			expect(getByText(parameter.displayName)).toBeInTheDocument();
+		});
+		// Should render error message for fixed collection parameter
+		expect(
+			getByTestId(`${FIXED_COLLECTION_PARAMETERS[0].name}-parameter-input-issues-container`),
+		).toBeInTheDocument();
+		expect(getByText(TEST_ISSUE)).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 11fe4e1f42..ee74656637 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -5,18 +5,19 @@ import type {
 	NodeParameterValue,
 	NodeParameterValueType,
 } from 'n8n-workflow';
-import { deepCopy, ADD_FORM_NOTICE } from 'n8n-workflow';
-import { computed, defineAsyncComponent, onErrorCaptured, ref, watch } from 'vue';
+import { ADD_FORM_NOTICE, deepCopy, NodeHelpers } from 'n8n-workflow';
+import { computed, defineAsyncComponent, onErrorCaptured, ref, watch, type WatchSource } from 'vue';
 
 import type { IUpdateInformation } from '@/Interface';
 
 import AssignmentCollection from '@/components/AssignmentCollection/AssignmentCollection.vue';
+import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
 import FilterConditions from '@/components/FilterConditions/FilterConditions.vue';
 import ImportCurlParameter from '@/components/ImportCurlParameter.vue';
 import MultipleParameter from '@/components/MultipleParameter.vue';
-import ButtonParameter from '@/components/ButtonParameter/ButtonParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
+import { useI18n } from '@/composables/useI18n';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import {
@@ -32,11 +33,11 @@ import {
 	getNodeAuthFields,
 	isAuthRelatedParameter,
 } from '@/utils/nodeTypesUtils';
-import { get, set } from 'lodash-es';
-import { useRouter } from 'vue-router';
 import { captureException } from '@sentry/vue';
-import { N8nNotice, N8nIconButton, N8nInputLabel, N8nText, N8nIcon } from 'n8n-design-system';
-import { useI18n } from '@/composables/useI18n';
+import { computedWithControl } from '@vueuse/core';
+import { get, set } from 'lodash-es';
+import { N8nIcon, N8nIconButton, N8nInputLabel, N8nNotice, N8nText } from 'n8n-design-system';
+import { useRouter } from 'vue-router';
 
 const LazyFixedCollectionParameter = defineAsyncComponent(
 	async () => await import('./FixedCollectionParameter.vue'),
@@ -45,6 +46,9 @@ const LazyCollectionParameter = defineAsyncComponent(
 	async () => await import('./CollectionParameter.vue'),
 );
 
+// Parameter issues are displayed within the inputs themselves, but some parameters need to show them in the label UI
+const showIssuesInLabelFor = ['fixedCollection'];
+
 type Props = {
 	nodeValues: INodeParameters;
 	parameters: INodeProperties[];
@@ -98,22 +102,29 @@ const nodeType = computed(() => {
 	return null;
 });
 
-const filteredParameters = computed(() => {
-	const parameters = props.parameters.filter((parameter: INodeProperties) =>
-		displayNodeParameter(parameter),
-	);
+const filteredParameters = computedWithControl(
+	[() => props.parameters, () => props.nodeValues] as WatchSource[],
+	() => {
+		const parameters = props.parameters.filter((parameter: INodeProperties) =>
+			displayNodeParameter(parameter),
+		);
 
-	const activeNode = ndvStore.activeNode;
+		const activeNode = ndvStore.activeNode;
 
-	if (activeNode && activeNode.type === FORM_TRIGGER_NODE_TYPE) {
-		return updateFormTriggerParameters(parameters, activeNode.name);
-	}
-	if (activeNode && activeNode.type === WAIT_NODE_TYPE && activeNode.parameters.resume === 'form') {
-		return updateWaitParameters(parameters, activeNode.name);
-	}
+		if (activeNode && activeNode.type === FORM_TRIGGER_NODE_TYPE) {
+			return updateFormTriggerParameters(parameters, activeNode.name);
+		}
+		if (
+			activeNode &&
+			activeNode.type === WAIT_NODE_TYPE &&
+			activeNode.parameters.resume === 'form'
+		) {
+			return updateWaitParameters(parameters, activeNode.name);
+		}
 
-	return parameters;
-});
+		return parameters;
+	},
+);
 
 const filteredParameterNames = computed(() => {
 	return filteredParameters.value.map((parameter) => parameter.name);
@@ -432,6 +443,15 @@ function onNoticeAction(action: string) {
 	}
 }
 
+function getParameterIssues(parameter: INodeProperties): string[] {
+	if (!node.value || !showIssuesInLabelFor.includes(parameter.type)) {
+		return [];
+	}
+	const issues = NodeHelpers.getParameterIssues(parameter, node.value.parameters, '', node.value);
+
+	return issues.parameters?.[parameter.name] ?? [];
+}
+
 /**
  * Handles default node button parameter type actions
  * @param parameter
@@ -536,8 +556,26 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 					:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
 					size="small"
 					:underline="true"
+					:input-name="parameter.name"
 					color="text-dark"
-				/>
+				>
+					<template
+						v-if="
+							showIssuesInLabelFor.includes(parameter.type) &&
+							getParameterIssues(parameter).length > 0
+						"
+						#issues
+					>
+						<N8nTooltip>
+							<template #content>
+								<span v-for="(issue, i) in getParameterIssues(parameter)" :key="i">{{
+									issue
+								}}</span>
+							</template>
+							<N8nIcon icon="exclamation-triangle" size="small" color="danger" />
+						</N8nTooltip>
+					</template>
+				</N8nInputLabel>
 				<Suspense v-if="!asyncLoadingError">
 					<template #default>
 						<LazyCollectionParameter
@@ -610,10 +648,7 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 				:is-read-only="isReadOnly"
 				@value-changed="valueChanged"
 			/>
-			<div
-				v-else-if="displayNodeParameter(parameter) && credentialsParameterIndex !== index"
-				class="parameter-item"
-			>
+			<div v-else-if="credentialsParameterIndex !== index" class="parameter-item">
 				<N8nIconButton
 					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
 					type="tertiary"
diff --git a/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue b/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue
new file mode 100644
index 0000000000..388941569e
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideButton.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+
+const i18n = useI18n();
+
+const emit = defineEmits<{
+	click: [];
+}>();
+</script>
+
+<template>
+	<N8nTooltip>
+		<template #content>
+			<div>{{ i18n.baseText('parameterOverride.applyOverrideButtonTooltip') }}</div>
+		</template>
+
+		<N8nButton
+			:class="[$style.overrideButton]"
+			type="tertiary"
+			data-test-id="from-ai-override-button"
+			@click="emit('click')"
+		>
+			<AiStarsIcon size="large" :class="$style.aiStarsIcon" />
+		</N8nButton>
+	</N8nTooltip>
+</template>
+
+<style lang="scss" module>
+.overrideButton {
+	display: flex;
+	justify-content: center;
+	border: 0px;
+	height: 30px;
+	width: 30px;
+	background-color: var(--color-foreground-base);
+	color: var(--color-foreground-xdark);
+
+	&:hover {
+		color: var(--color-foreground-xdark);
+		background-color: var(--color-secondary);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue b/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue
new file mode 100644
index 0000000000..b5ae6130ca
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterInputOverrides/FromAiOverrideField.vue
@@ -0,0 +1,77 @@
+<script setup lang="ts">
+import { i18n } from '@/plugins/i18n';
+
+defineProps<{
+	isReadOnly?: boolean;
+}>();
+
+const emit = defineEmits<{
+	close: [];
+}>();
+</script>
+
+<template>
+	<div :class="$style.contentOverrideContainer" data-test-id="fromAI-override-field">
+		<div :class="[$style.iconStars, 'el-input-group__prepend', $style.noCornersRight]">
+			<AiStarsIcon :class="$style.aiStarsIcon" />
+		</div>
+		<div :class="$style.overrideInput">
+			<N8nText
+				v-n8n-html="i18n.baseText('parameterOverride.overridePanelText')"
+				color="text-dark"
+				size="small"
+			/>
+		</div>
+		<N8nIconButton
+			v-if="!isReadOnly"
+			type="tertiary"
+			:class="['n8n-input', $style.overrideCloseButton]"
+			outline="false"
+			icon="xmark"
+			size="xsmall"
+			@click="emit('close')"
+		/>
+	</div>
+</template>
+
+<style lang="scss" module>
+.iconStars {
+	align-self: center;
+	padding-left: 8px;
+	width: 22px;
+	text-align: center;
+	border: none;
+	color: var(--color-foreground-xdark);
+	background-color: var(--color-foreground-base);
+}
+
+.noCornersRight {
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+}
+
+.overrideInput {
+	height: 30px;
+	align-content: center;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+.overrideCloseButton {
+	padding: 0px 8px 3px; // the icon used is off-center vertically
+	border: 0px;
+	color: var(--color-text-base);
+	margin-left: auto;
+	--button-hover-background-color: transparent;
+	--button-active-background-color: transparent;
+}
+
+.contentOverrideContainer {
+	display: flex;
+	white-space: nowrap;
+	width: 100%;
+	gap: var(--spacing-4xs);
+	border-radius: var(--border-radius-base);
+	background-color: var(--color-foreground-base);
+}
+</style>
diff --git a/packages/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue b/packages/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
new file mode 100644
index 0000000000..6f77cabbf6
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterInputOverrides/ParameterOverrideSelectableList.vue
@@ -0,0 +1,75 @@
+<script setup lang="ts">
+import type { IUpdateInformation } from '@/Interface';
+
+import { type INodeProperties } from 'n8n-workflow';
+import { buildValueFromOverride, type FromAIOverride } from '../../utils/fromAIOverrideUtils';
+import { computed } from 'vue';
+import { N8nSelectableList } from 'n8n-design-system';
+
+type Props = {
+	parameter: INodeProperties;
+	path: string;
+	isReadOnly?: boolean;
+};
+
+const parameterOverride = defineModel<FromAIOverride>({ required: true });
+
+const props = withDefaults(defineProps<Props>(), {
+	isReadOnly: false,
+});
+
+const inputs = computed(() =>
+	Object.entries(parameterOverride.value.extraProps).map(([name, prop]) => ({
+		name,
+		...prop,
+	})),
+);
+
+function proper(s: string) {
+	return s[0].toUpperCase() + s.slice(1);
+}
+
+const emit = defineEmits<{
+	update: [value: IUpdateInformation];
+}>();
+
+function valueChanged(parameterData: IUpdateInformation) {
+	emit('update', parameterData);
+}
+</script>
+
+<template>
+	<N8nSelectableList
+		v-model="parameterOverride.extraPropValues"
+		class="mt-2xs"
+		:inputs="inputs"
+		:disabled="isReadOnly"
+	>
+		<template #displayItem="{ name, tooltip, initialValue, type, typeOptions }">
+			<ParameterInputFull
+				:parameter="{
+					name,
+					displayName: proper(name),
+					type,
+					default: initialValue,
+					noDataExpression: true,
+					description: tooltip,
+					typeOptions,
+				}"
+				:is-read-only="isReadOnly"
+				:value="parameterOverride?.extraPropValues[name]"
+				:path="`${path}.${name}`"
+				input-size="small"
+				@update="
+					(x: IUpdateInformation) => {
+						parameterOverride.extraPropValues[name] = x.value;
+						valueChanged({
+							name: props.path,
+							value: buildValueFromOverride(parameterOverride, props, true),
+						});
+					}
+				"
+			/>
+		</template>
+	</N8nSelectableList>
+</template>
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.test.ts b/packages/editor-ui/src/components/ParameterInputWrapper.test.ts
index f36c04cbb3..d93249f220 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.test.ts
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.test.ts
@@ -3,6 +3,11 @@ import { createTestingPinia } from '@pinia/testing';
 import ParameterInputWrapper from './ParameterInputWrapper.vue';
 import { STORES } from '@/constants';
 import { cleanupAppModals, createAppModals, SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { waitFor } from '@testing-library/vue';
+
+vi.mock('@/composables/useWorkflowHelpers', () => {
+	return { useWorkflowHelpers: vi.fn(() => ({ resolveExpression: vi.fn(() => 'topSecret') })) };
+});
 
 describe('ParameterInputWrapper.vue', () => {
 	beforeEach(() => {
@@ -12,6 +17,7 @@ describe('ParameterInputWrapper.vue', () => {
 	afterEach(() => {
 		cleanupAppModals();
 	});
+
 	test('should resolve expression', async () => {
 		const { getByTestId } = renderComponent(ParameterInputWrapper, {
 			pinia: createTestingPinia({
@@ -34,9 +40,6 @@ describe('ParameterInputWrapper.vue', () => {
 			},
 			global: {
 				mocks: {
-					$workflowHelpers: {
-						resolveExpression: vi.fn(() => 'topSecret'),
-					},
 					$ndvStore: {
 						activeNode: vi.fn(() => ({ test: 'test' })),
 					},
@@ -44,6 +47,6 @@ describe('ParameterInputWrapper.vue', () => {
 			},
 		});
 
-		expect(getByTestId('parameter-input-hint')).toHaveTextContent('[ERROR: ]');
+		await waitFor(() => expect(getByTestId('parameter-input-hint')).toHaveTextContent('topSecret'));
 	});
 });
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index f0db8cc457..d49c2855ed 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -9,20 +9,16 @@ import {
 	type INodePropertyMode,
 	type IParameterLabel,
 	type NodeParameterValueType,
-	type Result,
 } from 'n8n-workflow';
 
-import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useResolvedExpression } from '@/composables/useResolvedExpression';
 import useEnvironmentsStore from '@/stores/environments.ee.store';
 import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { useNDVStore } from '@/stores/ndv.store';
-import { stringifyExpressionResult } from '@/utils/expressions';
 import { isValueExpression, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
-import { computed } from 'vue';
-import { useRouter } from 'vue-router';
-import { useWorkflowsStore } from '@/stores/workflows.store';
+import { computed, useTemplateRef } from 'vue';
 
 type Props = {
 	parameter: INodeProperties;
@@ -45,6 +41,7 @@ type Props = {
 	eventSource?: string;
 	label?: IParameterLabel;
 	eventBus?: EventBus;
+	canBeOverridden?: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -62,9 +59,6 @@ const emit = defineEmits<{
 	textInput: [value: IUpdateInformation];
 }>();
 
-const router = useRouter();
-const workflowHelpers = useWorkflowHelpers({ router });
-
 const ndvStore = useNDVStore();
 const externalSecretsStore = useExternalSecretsStore();
 const environmentsStore = useEnvironmentsStore();
@@ -73,8 +67,6 @@ const isExpression = computed(() => {
 	return isValueExpression(props.parameter, props.modelValue);
 });
 
-const activeNode = computed(() => ndvStore.activeNode);
-
 const selectedRLMode = computed(() => {
 	if (
 		typeof props.modelValue !== 'object' ||
@@ -107,60 +99,9 @@ const targetItem = computed(() => ndvStore.expressionTargetItem);
 
 const isInputParentOfActiveNode = computed(() => ndvStore.isInputParentOfActiveNode);
 
-const evaluatedExpression = computed<Result<unknown, Error>>(() => {
-	const value = isResourceLocatorValue(props.modelValue)
-		? props.modelValue.value
-		: props.modelValue;
-
-	if (!activeNode.value || !isExpression.value || typeof value !== 'string') {
-		return { ok: false, error: new Error() };
-	}
-
-	try {
-		let opts: Parameters<typeof workflowHelpers.resolveExpression>[2] = {
-			isForCredential: props.isForCredential,
-		};
-		if (ndvStore.isInputParentOfActiveNode) {
-			opts = {
-				...opts,
-				targetItem: targetItem.value ?? undefined,
-				inputNodeName: ndvStore.ndvInputNodeName,
-				inputRunIndex: ndvStore.ndvInputRunIndex,
-				inputBranchIndex: ndvStore.ndvInputBranchIndex,
-				additionalKeys: resolvedAdditionalExpressionData.value,
-			};
-		}
-
-		if (props.isForCredential) opts.additionalKeys = resolvedAdditionalExpressionData.value;
-		const stringifyObject = props.parameter.type !== 'multiOptions';
-		return {
-			ok: true,
-			result: workflowHelpers.resolveExpression(value, undefined, opts, stringifyObject),
-		};
-	} catch (error) {
-		return { ok: false, error };
-	}
-});
-
-const evaluatedExpressionValue = computed(() => {
-	const evaluated = evaluatedExpression.value;
-	return evaluated.ok ? evaluated.result : null;
-});
-
-const evaluatedExpressionString = computed(() => {
-	const hasRunData =
-		!!useWorkflowsStore().workflowExecutionData?.data?.resultData?.runData[
-			ndvStore.activeNode?.name ?? ''
-		];
-	return stringifyExpressionResult(evaluatedExpression.value, hasRunData);
-});
-
-const expressionOutput = computed(() => {
-	if (isExpression.value && evaluatedExpressionString.value) {
-		return evaluatedExpressionString.value;
-	}
-
-	return null;
+const expression = computed(() => {
+	if (!isExpression.value) return '';
+	return isResourceLocatorValue(props.modelValue) ? props.modelValue.value : props.modelValue;
 });
 
 const resolvedAdditionalExpressionData = computed(() => {
@@ -173,6 +114,21 @@ const resolvedAdditionalExpressionData = computed(() => {
 	};
 });
 
+const { resolvedExpression, resolvedExpressionString } = useResolvedExpression({
+	expression,
+	additionalData: resolvedAdditionalExpressionData,
+	isForCredential: props.isForCredential,
+	stringifyObject: props.parameter.type !== 'multiOptions',
+});
+
+const expressionOutput = computed(() => {
+	if (isExpression.value && resolvedExpressionString.value) {
+		return resolvedExpressionString.value;
+	}
+
+	return null;
+});
+
 const parsedParameterName = computed(() => {
 	return parseResourceMapperFieldName(props.parameter?.name ?? '');
 });
@@ -196,6 +152,16 @@ function onValueChanged(parameterData: IUpdateInformation) {
 function onTextInput(parameterData: IUpdateInformation) {
 	emit('textInput', parameterData);
 }
+
+const param = useTemplateRef('param');
+const isSingleLineInput = computed(() => param.value?.isSingleLineInput);
+const displaysIssues = computed(() => param.value?.displaysIssues);
+defineExpose({
+	isSingleLineInput,
+	displaysIssues,
+	focusInput: () => param.value?.focusInput(),
+	selectInput: () => param.value?.selectInput(),
+});
 </script>
 
 <template>
@@ -216,18 +182,23 @@ function onTextInput(parameterData: IUpdateInformation) {
 			:error-highlight="errorHighlight"
 			:is-for-credential="isForCredential"
 			:event-source="eventSource"
-			:expression-evaluated="evaluatedExpressionValue"
+			:expression-evaluated="resolvedExpression"
 			:additional-expression-data="resolvedAdditionalExpressionData"
 			:label="label"
 			:rows="rows"
 			:data-test-id="`parameter-input-${parsedParameterName}`"
 			:event-bus="eventBus"
+			:can-be-overridden="canBeOverridden"
 			@focus="onFocus"
 			@blur="onBlur"
 			@drop="onDrop"
 			@text-input="onTextInput"
 			@update="onValueChanged"
-		/>
+		>
+			<template #overrideButton>
+				<slot v-if="$slots.overrideButton" name="overrideButton" />
+			</template>
+		</ParameterInput>
 		<div v-if="!hideHint && (expressionOutput || parameterHint)" :class="$style.hint">
 			<div>
 				<InputHint
diff --git a/packages/editor-ui/src/components/ParameterIssues.vue b/packages/editor-ui/src/components/ParameterIssues.vue
index 34821c70a6..6c023727d4 100644
--- a/packages/editor-ui/src/components/ParameterIssues.vue
+++ b/packages/editor-ui/src/components/ParameterIssues.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import TitledList from '@/components/TitledList.vue';
 import { useI18n } from '@/composables/useI18n';
+import { N8nTooltip, N8nIcon } from 'n8n-design-system';
 
 defineProps<{
 	issues: string[];
@@ -11,22 +12,21 @@ const i18n = useI18n();
 
 <template>
 	<div v-if="issues.length" :class="$style['parameter-issues']" data-test-id="parameter-issues">
-		<n8n-tooltip placement="top">
+		<N8nTooltip placement="top">
 			<template #content>
 				<TitledList :title="`${i18n.baseText('parameterInput.issues')}:`" :items="issues" />
 			</template>
-			<font-awesome-icon icon="exclamation-triangle" />
-		</n8n-tooltip>
+			<N8nIcon icon="exclamation-triangle" />
+		</N8nTooltip>
 	</div>
 </template>
 
 <style module lang="scss">
 .parameter-issues {
-	width: 20px;
 	text-align: right;
 	float: right;
-	color: #ff8080;
+	color: var(--color-danger-light);
 	font-size: var(--font-size-s);
-	padding-left: var(--spacing-4xs);
+	padding-left: var(--spacing-3xs);
 }
 </style>
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
index 795c38e5e5..5da1d7d050 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
@@ -1,12 +1,16 @@
 import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
 import { createComponentRenderer } from '@/__tests__/render';
+import { createProjectListItem } from '@/__tests__/data/projects';
+import { getDropdownItems, mockedStore } from '@/__tests__/utils';
+import type { MockedStore } from '@/__tests__/utils';
 import { PROJECT_MOVE_RESOURCE_MODAL } from '@/constants';
 import ProjectMoveResourceModal from '@/components/Projects/ProjectMoveResourceModal.vue';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { mockedStore } from '@/__tests__/utils';
 import { useProjectsStore } from '@/stores/projects.store';
 
 const renderComponent = createComponentRenderer(ProjectMoveResourceModal, {
+	pinia: createTestingPinia(),
 	global: {
 		stubs: {
 			Modal: {
@@ -18,28 +22,19 @@ const renderComponent = createComponentRenderer(ProjectMoveResourceModal, {
 });
 
 let telemetry: ReturnType<typeof useTelemetry>;
+let projectsStore: MockedStore<typeof useProjectsStore>;
 
 describe('ProjectMoveResourceModal', () => {
 	beforeEach(() => {
+		vi.clearAllMocks();
 		telemetry = useTelemetry();
+		projectsStore = mockedStore(useProjectsStore);
 	});
 
 	it('should send telemetry when mounted', async () => {
-		const pinia = createTestingPinia();
 		const telemetryTrackSpy = vi.spyOn(telemetry, 'track');
 
-		const projectsStore = mockedStore(useProjectsStore);
-		projectsStore.availableProjects = [
-			{
-				id: '1',
-				name: 'My Project',
-				icon: { type: 'icon', value: 'folder' },
-				type: 'personal',
-				role: 'project:personalOwner',
-				createdAt: '2021-01-01T00:00:00.000Z',
-				updatedAt: '2021-01-01T00:00:00.000Z',
-			},
-		];
+		projectsStore.availableProjects = [createProjectListItem()];
 
 		const props = {
 			modalName: PROJECT_MOVE_RESOURCE_MODAL,
@@ -55,7 +50,7 @@ describe('ProjectMoveResourceModal', () => {
 				},
 			},
 		};
-		renderComponent({ props, pinia });
+		renderComponent({ props });
 		expect(telemetryTrackSpy).toHaveBeenCalledWith(
 			'User clicked to move a workflow',
 			expect.objectContaining({ workflow_id: '1' }),
@@ -63,9 +58,6 @@ describe('ProjectMoveResourceModal', () => {
 	});
 
 	it('should show no available projects message', async () => {
-		const pinia = createTestingPinia();
-
-		const projectsStore = mockedStore(useProjectsStore);
 		projectsStore.availableProjects = [];
 
 		const props = {
@@ -82,7 +74,42 @@ describe('ProjectMoveResourceModal', () => {
 				},
 			},
 		};
-		const { getByText } = renderComponent({ props, pinia });
+		const { getByText } = renderComponent({ props });
 		expect(getByText(/Currently there are not any projects or users available/)).toBeVisible();
 	});
+
+	it('should not hide project select if filter has no result', async () => {
+		const projects = Array.from({ length: 5 }, createProjectListItem);
+		projectsStore.availableProjects = projects;
+
+		const props = {
+			modalName: PROJECT_MOVE_RESOURCE_MODAL,
+			data: {
+				resourceType: 'workflow',
+				resourceTypeLabel: 'Workflow',
+				resource: {
+					id: '1',
+					homeProject: {
+						id: projects[0].id,
+						name: projects[0].name,
+					},
+				},
+			},
+		};
+
+		const { getByTestId, getByRole } = renderComponent({ props });
+
+		const projectSelect = getByTestId('project-move-resource-modal-select');
+		const projectSelectInput: HTMLInputElement = getByRole('combobox');
+		expect(projectSelectInput).toBeVisible();
+		expect(projectSelect).toBeVisible();
+
+		const projectSelectDropdownItems = await getDropdownItems(projectSelect);
+		expect(projectSelectDropdownItems).toHaveLength(projects.length - 1);
+
+		await userEvent.click(projectSelectInput);
+		await userEvent.type(projectSelectInput, 'non-existing project');
+
+		expect(projectSelect).toBeVisible();
+	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
index c4814550cd..2fffdc4c8d 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.vue
@@ -39,12 +39,14 @@ const availableProjects = computed(() =>
 		'name',
 		projectsStore.availableProjects.filter(
 			(p) =>
-				p.name?.toLowerCase().includes(filter.value.toLowerCase()) &&
 				p.id !== props.data.resource.homeProject?.id &&
 				(!p.scopes || getResourcePermissions(p.scopes)[props.data.resourceType].create),
 		),
 	),
 );
+const filteredProjects = computed(() =>
+	availableProjects.value.filter((p) => p.name?.toLowerCase().includes(filter.value.toLowerCase())),
+);
 const selectedProject = computed(() =>
 	availableProjects.value.find((p) => p.id === projectId.value),
 );
@@ -169,7 +171,7 @@ onMounted(() => {
 						<N8nIcon icon="search" />
 					</template>
 					<N8nOption
-						v-for="p in availableProjects"
+						v-for="p in filteredProjects"
 						:key="p.id"
 						:value="p.id"
 						:label="p.name"
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.test.ts b/packages/editor-ui/src/components/PushConnectionTracker.test.ts
new file mode 100644
index 0000000000..5e6c37157c
--- /dev/null
+++ b/packages/editor-ui/src/components/PushConnectionTracker.test.ts
@@ -0,0 +1,58 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+
+let isConnected = true;
+let isConnectionRequested = true;
+
+vi.mock('@/stores/pushConnection.store', () => {
+	return {
+		usePushConnectionStore: vi.fn(() => ({
+			isConnected,
+			isConnectionRequested,
+		})),
+	};
+});
+
+describe('PushConnectionTracker', () => {
+	const render = () => {
+		const pinia = createTestingPinia({
+			stubActions: false,
+			initialState: {
+				[STORES.PUSH]: {
+					isConnected,
+					isConnectionRequested,
+				},
+			},
+		});
+		setActivePinia(pinia);
+
+		return createComponentRenderer(PushConnectionTracker)();
+	};
+
+	it('should not render error when connected and connection requested', () => {
+		isConnected = true;
+		isConnectionRequested = true;
+		const { container } = render();
+
+		expect(container).toMatchSnapshot();
+	});
+
+	it('should render error when disconnected and connection requested', () => {
+		isConnected = false;
+		isConnectionRequested = true;
+		const { container } = render();
+
+		expect(container).toMatchSnapshot();
+	});
+
+	it('should not render error when connected and connection not requested', () => {
+		isConnected = true;
+		isConnectionRequested = false;
+		const { container } = render();
+
+		expect(container).toMatchSnapshot();
+	});
+});
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.vue b/packages/editor-ui/src/components/PushConnectionTracker.vue
index 66175c2af4..0ce23634b0 100644
--- a/packages/editor-ui/src/components/PushConnectionTracker.vue
+++ b/packages/editor-ui/src/components/PushConnectionTracker.vue
@@ -1,16 +1,23 @@
 <script setup lang="ts">
-import { computed } from 'vue';
-import { useRootStore } from '@/stores/root.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
 import { useI18n } from '@/composables/useI18n';
+import { computed } from 'vue';
 
-const rootStore = useRootStore();
-const pushConnectionActive = computed(() => rootStore.pushConnectionActive);
+const pushConnectionStore = usePushConnectionStore();
 const i18n = useI18n();
+
+const showConnectionLostError = computed(() => {
+	// Only show the connection lost error if the connection has been requested
+	// and the connection is not currently connected. This is to prevent the
+	// connection error from being shown e.g. when user navigates directly to
+	// the workflow executions list, which doesn't open the connection.
+	return pushConnectionStore.isConnectionRequested && !pushConnectionStore.isConnected;
+});
 </script>
 
 <template>
 	<span>
-		<div v-if="!pushConnectionActive" class="push-connection-lost primary-color">
+		<div v-if="showConnectionLostError" class="push-connection-lost primary-color">
 			<n8n-tooltip placement="bottom-end">
 				<template #content>
 					<div v-n8n-html="i18n.baseText('pushConnectionTracker.cannotConnectToServer')"></div>
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 5deffba197..37615acd0e 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ResourceLocatorRequestDto } from '@n8n/api-types';
-import type { IResourceLocatorResultExpanded } from '@/Interface';
+import type { IResourceLocatorResultExpanded, IUpdateInformation } from '@/Interface';
 import DraggableTarget from '@/components/DraggableTarget.vue';
 import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
@@ -32,11 +32,27 @@ import type {
 	INodePropertyModeTypeOptions,
 	NodeParameterValue,
 } from 'n8n-workflow';
-import { computed, nextTick, onBeforeUnmount, onMounted, type Ref, ref, watch } from 'vue';
+import {
+	computed,
+	nextTick,
+	onBeforeUnmount,
+	onMounted,
+	type Ref,
+	ref,
+	useCssModule,
+	watch,
+} from 'vue';
 import { useRouter } from 'vue-router';
 import ResourceLocatorDropdown from './ResourceLocatorDropdown.vue';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { onClickOutside, type VueInstance } from '@vueuse/core';
+import {
+	buildValueFromOverride,
+	isFromAIOverrideValue,
+	makeOverrideValue,
+	updateFromAIOverrideValues,
+	type FromAIOverride,
+} from '../../utils/fromAIOverrideUtils';
 
 interface IResourceLocatorQuery {
 	results: INodeListSearchItems[];
@@ -90,6 +106,7 @@ const workflowHelpers = useWorkflowHelpers({ router });
 const { callDebounced } = useDebounce();
 const i18n = useI18n();
 const telemetry = useTelemetry();
+const $style = useCssModule();
 
 const resourceDropdownVisible = ref(false);
 const resourceDropdownHiding = ref(false);
@@ -272,6 +289,32 @@ const requiresSearchFilter = computed(
 	() => !!getPropertyArgument(currentMode.value, 'searchFilterRequired'),
 );
 
+const fromAIOverride = ref<FromAIOverride | null>(
+	makeOverrideValue(
+		{
+			value: props.modelValue?.value ?? '',
+			...props,
+		},
+		props.node && nodeTypesStore.getNodeType(props.node.type, props.node.typeVersion),
+	),
+);
+
+const canBeContentOverride = computed(() => {
+	if (!props.node) return false;
+
+	return fromAIOverride.value !== null;
+});
+
+const isContentOverride = computed(
+	() =>
+		canBeContentOverride.value &&
+		!!isFromAIOverrideValue(props.modelValue?.value?.toString() ?? ''),
+);
+
+const showOverrideButton = computed(
+	() => canBeContentOverride.value && !isContentOverride.value && !props.isReadOnly,
+);
+
 watch(currentQueryError, (curr, prev) => {
 	if (resourceDropdownVisible.value && curr && !prev) {
 		if (inputRef.value) {
@@ -656,12 +699,58 @@ function onListItemSelected(value: NodeParameterValue) {
 	hideResourceDropdown();
 }
 
-function onInputBlur() {
+function onInputBlur(event: FocusEvent) {
+	// Do not blur if focus is within the dropdown
+	const newTarget = event.relatedTarget;
+	if (newTarget instanceof HTMLElement && dropdownRef.value?.isWithinDropdown(newTarget)) {
+		return;
+	}
+
 	if (!isSearchable.value || currentQueryError.value) {
 		hideResourceDropdown();
 	}
 	emit('blur');
 }
+
+function applyOverride() {
+	if (!props.node || !fromAIOverride.value) return;
+
+	telemetry.track(
+		'User turned on fromAI override',
+		{
+			nodeType: props.node.type,
+			parameter: props.path,
+		},
+		{ withPostHog: true },
+	);
+	updateFromAIOverrideValues(fromAIOverride.value, props.modelValue.value?.toString() ?? '');
+
+	emit('update:modelValue', {
+		...props.modelValue,
+		value: buildValueFromOverride(fromAIOverride.value, props, true),
+	});
+}
+
+function removeOverride() {
+	if (!props.node || !fromAIOverride.value) return;
+
+	telemetry.track(
+		'User turned off fromAI override',
+		{
+			nodeType: props.node.type,
+			parameter: props.path,
+		},
+		{ withPostHog: true },
+	);
+	emit('update:modelValue', {
+		...props.modelValue,
+		value: buildValueFromOverride(fromAIOverride.value, props, false),
+	});
+	void setTimeout(() => {
+		inputRef.value?.focus();
+		inputRef.value?.select();
+	}, 0);
+}
 </script>
 
 <template>
@@ -707,9 +796,18 @@ function onInputBlur() {
 				:class="{
 					[$style.resourceLocator]: true,
 					[$style.multipleModes]: hasMultipleModes,
+					[$style.inputContainerInputCorners]:
+						hasMultipleModes && canBeContentOverride && !isContentOverride,
 				}"
 			>
-				<div :class="$style.background"></div>
+				<div
+					:class="[
+						$style.background,
+						{
+							[$style.backgroundOverride]: showOverrideButton,
+						},
+					]"
+				></div>
 				<div v-if="hasMultipleModes" :class="$style.modeSelector">
 					<n8n-select
 						:model-value="selectedMode"
@@ -746,16 +844,26 @@ function onInputBlur() {
 					>
 						<template #default="{ droppable, activeDrop }">
 							<div
-								:class="{
-									[$style.listModeInputContainer]: isListMode,
-									[$style.droppable]: droppable,
-									[$style.activeDrop]: activeDrop,
-								}"
+								:class="[
+									{
+										[$style.listModeInputContainer]: isListMode,
+										[$style.droppable]: droppable,
+										[$style.activeDrop]: activeDrop,
+										[$style.rightNoCorner]: canBeContentOverride && !isContentOverride,
+									},
+								]"
 								@keydown.stop="onKeyDown"
 							>
+								<FromAiOverrideField
+									v-if="fromAIOverride && isContentOverride"
+									:class="[$style.inputField, $style.fromAiOverrideField]"
+									:is-read-only="isReadOnly"
+									@close="removeOverride"
+								/>
 								<ExpressionParameterInput
-									v-if="isValueExpression || forceShowExpression"
+									v-else-if="isValueExpression || forceShowExpression"
 									ref="inputRef"
+									:class="$style.inputField"
 									:model-value="expressionDisplayValue"
 									:path="path"
 									:rows="3"
@@ -765,7 +873,13 @@ function onInputBlur() {
 								<n8n-input
 									v-else
 									ref="inputRef"
-									:class="{ [$style.selectInput]: isListMode }"
+									:class="[
+										$style.inputField,
+										{
+											[$style.selectInput]: isListMode,
+											[$style.rightNoCorner]: canBeContentOverride && !isContentOverride,
+										},
+									]"
 									:size="inputSize"
 									:model-value="valueToDisplay"
 									:disabled="isReadOnly"
@@ -789,6 +903,9 @@ function onInputBlur() {
 										/>
 									</template>
 								</n8n-input>
+								<div v-if="showOverrideButton" :class="$style.overrideButtonInline">
+									<FromAiOverrideButton @click="applyOverride" />
+								</div>
 							</div>
 						</template>
 					</DraggableTarget>
@@ -805,6 +922,14 @@ function onInputBlur() {
 				</div>
 			</div>
 		</ResourceLocatorDropdown>
+		<ParameterOverrideSelectableList
+			v-if="isContentOverride && fromAIOverride"
+			v-model="fromAIOverride"
+			:parameter="parameter"
+			:path="path"
+			:is-read-only="isReadOnly"
+			@update="(x: IUpdateInformation) => onInputChange(x.value?.toString())"
+		/>
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index 8cab61b64a..d726461af9 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -5,7 +5,7 @@ import { N8nLoading } from 'n8n-design-system';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 import type { NodeParameterValue } from 'n8n-workflow';
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, useCssModule, watch } from 'vue';
 
 const SEARCH_BAR_HEIGHT_PX = 40;
 const SCROLL_MARGIN_PX = 10;
@@ -50,6 +50,7 @@ const emit = defineEmits<{
 }>();
 
 const i18n = useI18n();
+const $style = useCssModule();
 
 const hoverIndex = ref(0);
 const showHoverUrl = ref(false);
@@ -198,6 +199,12 @@ function onResultsEnd() {
 		}
 	}
 }
+
+function isWithinDropdown(element: HTMLElement) {
+	return Boolean(element.closest('.' + $style.popover));
+}
+
+defineExpose({ isWithinDropdown });
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/ResourceLocator/resourceLocator.scss b/packages/editor-ui/src/components/ResourceLocator/resourceLocator.scss
index d2ec38a981..9eabb26bb4 100644
--- a/packages/editor-ui/src/components/ResourceLocator/resourceLocator.scss
+++ b/packages/editor-ui/src/components/ResourceLocator/resourceLocator.scss
@@ -4,7 +4,7 @@ $--mode-selector-width: 92px;
 	--input-background-color: initial;
 	--input-font-color: initial;
 	--input-border-color: initial;
-	flex-basis: $--mode-selector-width;
+	width: $--mode-selector-width;
 
 	input {
 		border-radius: var(--border-radius-base) 0 0 var(--border-radius-base);
@@ -21,12 +21,39 @@ $--mode-selector-width: 92px;
 	}
 }
 
+.inputField {
+	flex-grow: 1;
+	position: relative;
+}
+
+.fromAiOverrideField {
+	position: relative;
+
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+
+.overrideButtonInline {
+	> button {
+		border-top-left-radius: 0;
+		border-bottom-left-radius: 0;
+	}
+	position: relative;
+}
+
+.rightNoCorner > * {
+	--input-border-bottom-right-radius: 0;
+	--input-border-top-right-radius: 0;
+}
+
 .resourceLocator {
-	display: flex;
-	flex-wrap: wrap;
+	display: inline-flex;
+	flex-wrap: nowrap;
+	width: 100%;
 	position: relative;
 
 	--input-issues-width: 28px;
+	--input-override-width: 30px;
 
 	.inputContainer {
 		display: flex;
@@ -38,6 +65,10 @@ $--mode-selector-width: 92px;
 
 		> div {
 			width: 100%;
+
+			> div {
+				display: flex;
+			}
 		}
 	}
 
@@ -52,13 +83,19 @@ $--mode-selector-width: 92px;
 		border-radius: var(--border-radius-base);
 	}
 
+	.backgroundOverride {
+		right: var(--input-override-width);
+	}
+
 	&.multipleModes {
 		.inputContainer {
 			display: flex;
 			align-items: center;
-			flex-basis: calc(100% - $--mode-selector-width);
+			width: calc(100% - $--mode-selector-width);
 			flex-grow: 1;
+		}
 
+		.inputContainerInputCorners {
 			input {
 				border-radius: 0 var(--border-radius-base) var(--border-radius-base) 0;
 			}
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index 546e33cdc3..05b3e4b49f 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -310,15 +310,6 @@ defineExpose({
 			color="text-dark"
 		>
 			<template #options>
-				<ParameterOptions
-					:parameter="parameter"
-					:custom-actions="parameterActions"
-					:loading="props.refreshInProgress"
-					:loading-message="fetchingFieldsLabel"
-					:is-read-only="isReadOnly"
-					:value="props.paramValue"
-					@update:model-value="onParameterActionSelected"
-				/>
 				<div v-if="props.isDataStale && !props.refreshInProgress" :class="$style.staleDataWarning">
 					<N8nTooltip>
 						<template #content>
@@ -340,6 +331,15 @@ defineExpose({
 						@click="onParameterActionSelected('refreshFieldList')"
 					/>
 				</div>
+				<ParameterOptions
+					:parameter="parameter"
+					:custom-actions="parameterActions"
+					:loading="props.refreshInProgress"
+					:loading-message="fetchingFieldsLabel"
+					:is-read-only="isReadOnly"
+					:value="props.paramValue"
+					@update:model-value="onParameterActionSelected"
+				/>
 			</template>
 		</N8nInputLabel>
 		<div v-if="orderedFields.length === 0" class="mt-3xs mb-xs">
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
new file mode 100644
index 0000000000..6136da25a4
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.constants.ts
@@ -0,0 +1,291 @@
+import {
+	NodeConnectionType,
+	type INode,
+	type INodeProperties,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+
+export const WORKFLOW_INPUTS_TEST_PARAMETER_PATH = 'parameters.workflowInputs';
+
+export const WORKFLOW_INPUTS_TEST_PARAMETER: INodeProperties = {
+	displayName: 'Workflow Inputs',
+	name: 'workflowInputs',
+	type: 'resourceMapper',
+	noDataExpression: true,
+	default: { mappingMode: 'defineBelow', value: null },
+	required: true,
+	typeOptions: {
+		loadOptionsDependsOn: ['workflowId.value'],
+		resourceMapper: {
+			localResourceMapperMethod: 'loadWorkflowInputMappings',
+			valuesLabel: 'Workflow Inputs',
+			mode: 'map',
+			fieldWords: { singular: 'input', plural: 'inputs' },
+			addAllFields: true,
+			multiKeyMatch: false,
+			supportAutoMap: false,
+			showTypeConversionOptions: false,
+		},
+	},
+};
+
+export const WORKFLOW_INPUTS_TEST_NODE: INode = {
+	parameters: {
+		operation: 'call_workflow',
+		source: 'database',
+		workflowId: {
+			__rl: true,
+			value: 'test123',
+			mode: 'list',
+			cachedResultName: 'Workflow inputs—test',
+		},
+		workflowInputs: {
+			_custom: {
+				type: 'reactive',
+				stateTypeName: 'Reactive',
+				value: {
+					mappingMode: 'defineBelow',
+					value: {},
+					matchingColumns: [],
+					schema: [
+						{
+							id: 'firstName',
+							displayName: 'First Name',
+							required: false,
+							defaultMatch: false,
+							display: true,
+							canBeUsedToMatch: true,
+							type: 'string',
+						},
+						{
+							id: 'lastName',
+							displayName: 'Last Name',
+							required: false,
+							defaultMatch: false,
+							display: true,
+							canBeUsedToMatch: true,
+							type: 'string',
+						},
+					],
+					attemptToConvertTypes: false,
+					convertFieldsToString: true,
+				},
+			},
+		},
+		mode: 'once',
+		options: {},
+	},
+	type: 'n8n-nodes-base.executeWorkflow',
+	typeVersion: 1.2,
+	position: [220, 0],
+	id: 'test-123',
+	name: 'Execute Workflow',
+};
+
+export const EXECUTE_WORKFLOW_NODE_TYPE_TEST: INodeTypeDescription = {
+	displayName: 'Execute Sub-workflow',
+	icon: 'fa:sign-in-alt',
+	iconColor: 'orange-red',
+	group: ['transform'],
+	version: [1, 1.1, 1.2],
+	subtitle: '={{"Workflow: " + $parameter["workflowId"]}}',
+	description: 'Execute another workflow',
+	defaults: { name: 'Execute Workflow', color: '#ff6d5a' },
+	inputs: [NodeConnectionType.Main],
+	outputs: [NodeConnectionType.Main],
+	properties: [
+		{
+			displayName: 'Operation',
+			name: 'operation',
+			type: 'hidden',
+			noDataExpression: true,
+			default: 'call_workflow',
+			options: [{ name: 'Execute a Sub-Workflow', value: 'call_workflow' }],
+		},
+		{
+			displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+			name: 'outdatedVersionWarning',
+			type: 'notice',
+			displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+			default: '',
+		},
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Local File',
+					value: 'localFile',
+					description: 'Load the workflow from a locally saved file',
+				},
+				{
+					name: 'Parameter',
+					value: 'parameter',
+					description: 'Load the workflow from a parameter',
+				},
+				{ name: 'URL', value: 'url', description: 'Load the workflow from an URL' },
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+			displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+		},
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Define Below',
+					value: 'parameter',
+					description: 'Pass the JSON code of a workflow',
+				},
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+			displayOptions: { show: { '@version': [{ _cnd: { gte: 1.2 } }] } },
+		},
+		{
+			displayName: 'Workflow ID',
+			name: 'workflowId',
+			type: 'string',
+			displayOptions: { show: { source: ['database'], '@version': [1] } },
+			default: '',
+			required: true,
+			hint: 'Can be found in the URL of the workflow',
+			description:
+				"Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+		},
+		{
+			displayName: 'Workflow',
+			name: 'workflowId',
+			type: 'workflowSelector',
+			displayOptions: { show: { source: ['database'], '@version': [{ _cnd: { gte: 1.1 } }] } },
+			default: '',
+			required: true,
+			hint: "Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+		},
+		{
+			displayName: 'Workflow Path',
+			name: 'workflowPath',
+			type: 'string',
+			displayOptions: { show: { source: ['localFile'] } },
+			default: '',
+			placeholder: '/data/workflow.json',
+			required: true,
+			description: 'The path to local JSON workflow file to execute',
+		},
+		{
+			displayName: 'Workflow JSON',
+			name: 'workflowJson',
+			type: 'json',
+			typeOptions: { rows: 10 },
+			displayOptions: { show: { source: ['parameter'] } },
+			default: '\n\n\n',
+			required: true,
+			description: 'The workflow JSON code to execute',
+		},
+		{
+			displayName: 'Workflow URL',
+			name: 'workflowUrl',
+			type: 'string',
+			displayOptions: { show: { source: ['url'] } },
+			default: '',
+			placeholder: 'https://example.com/workflow.json',
+			required: true,
+			description: 'The URL from which to load the workflow from',
+		},
+		{
+			displayName:
+				'Any data you pass into this node will be output by the Execute Workflow Trigger. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/" target="_blank">More info</a>',
+			name: 'executeWorkflowNotice',
+			type: 'notice',
+			default: '',
+			displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+		},
+		{
+			displayName: 'Workflow Inputs',
+			name: 'workflowInputs',
+			type: 'resourceMapper',
+			noDataExpression: true,
+			default: { mappingMode: 'defineBelow', value: null },
+			required: true,
+			typeOptions: {
+				loadOptionsDependsOn: ['workflowId.value'],
+				resourceMapper: {
+					localResourceMapperMethod: 'loadWorkflowInputMappings',
+					valuesLabel: 'Workflow Inputs',
+					mode: 'map',
+					fieldWords: { singular: 'input', plural: 'inputs' },
+					addAllFields: true,
+					multiKeyMatch: false,
+					supportAutoMap: false,
+					showTypeConversionOptions: true,
+				},
+			},
+			displayOptions: {
+				show: { source: ['database'], '@version': [{ _cnd: { gte: 1.2 } }] },
+				hide: { workflowId: [''] },
+			},
+		},
+		{
+			displayName: 'Mode',
+			name: 'mode',
+			type: 'options',
+			noDataExpression: true,
+			options: [
+				{
+					name: 'Run once with all items',
+					value: 'once',
+					description: 'Pass all items into a single execution of the sub-workflow',
+				},
+				{
+					name: 'Run once for each item',
+					value: 'each',
+					description: 'Call the sub-workflow individually for each item',
+				},
+			],
+			default: 'once',
+		},
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			default: {},
+			placeholder: 'Add option',
+			options: [
+				{
+					displayName: 'Wait For Sub-Workflow Completion',
+					name: 'waitForSubWorkflow',
+					type: 'boolean',
+					default: true,
+					description:
+						'Whether the main workflow should wait for the sub-workflow to complete its execution before proceeding',
+				},
+			],
+		},
+	],
+	codex: {
+		categories: ['Core Nodes'],
+		subcategories: { 'Core Nodes': ['Helpers', 'Flow'] },
+		alias: ['n8n', 'call', 'sub', 'workflow', 'sub-workflow', 'subworkflow'],
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/',
+				},
+			],
+		},
+	},
+	name: 'n8n-nodes-base.executeWorkflow',
+};
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
new file mode 100644
index 0000000000..1f111eab2c
--- /dev/null
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.test.ts
@@ -0,0 +1,119 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import ResourceMapper from './ResourceMapper.vue';
+import { createTestingPinia } from '@pinia/testing';
+import {
+	WORKFLOW_INPUTS_TEST_PARAMETER,
+	WORKFLOW_INPUTS_TEST_NODE,
+	WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+	EXECUTE_WORKFLOW_NODE_TYPE_TEST,
+} from './ResourceMapper.test.constants';
+import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+	const params = {};
+	const location = {};
+	return {
+		...actual,
+		useRouter: () => ({
+			push: vi.fn(),
+		}),
+		useRoute: () => ({
+			params,
+			location,
+		}),
+	};
+});
+
+let nodeTypesStore: ReturnType<typeof mockedStore<typeof useNodeTypesStore>>;
+
+const renderComponent = createComponentRenderer(ResourceMapper, {
+	props: {
+		inputSize: 'small',
+		labelSize: 'small',
+		dependentParametersValues: '-1',
+		isReadonly: false,
+		teleported: false,
+	},
+	global: {
+		stubs: {
+			ParameterInputFull: { template: '<div data-test-id="field-input"></div>' },
+		},
+	},
+});
+
+describe('ResourceMapper::Workflow Inputs', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		nodeTypesStore = mockedStore(useNodeTypesStore);
+		nodeTypesStore.nodeTypes = {
+			'n8n-nodes-base.executeWorkflow': {
+				1.2: EXECUTE_WORKFLOW_NODE_TYPE_TEST,
+			},
+		};
+	});
+
+	it('renders', async () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					parameter: WORKFLOW_INPUTS_TEST_PARAMETER,
+					node: WORKFLOW_INPUTS_TEST_NODE,
+					path: WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+				},
+			}),
+		).not.toThrow();
+	});
+
+	it('renders workflow inputs list correctly', async () => {
+		nodeTypesStore.getLocalResourceMapperFields.mockResolvedValue({
+			fields: [
+				{
+					id: 'firstName',
+					displayName: 'First Name',
+					type: 'string',
+					required: false,
+					defaultMatch: false,
+					display: true,
+				},
+				{
+					id: 'lastName',
+					displayName: 'Last Name',
+					type: 'string',
+					required: false,
+					defaultMatch: false,
+					display: true,
+				},
+			],
+		});
+		const { getByTestId, getAllByTestId } = renderComponent({
+			props: {
+				parameter: WORKFLOW_INPUTS_TEST_PARAMETER,
+				node: WORKFLOW_INPUTS_TEST_NODE,
+				path: WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+			},
+		});
+		await waitAllPromises();
+		expect(getByTestId('mapping-fields-container')).toBeInTheDocument();
+		expect(getAllByTestId('field-input')).toHaveLength(2);
+	});
+
+	it('renders provided empty fields message', async () => {
+		nodeTypesStore.getLocalResourceMapperFields.mockResolvedValue({
+			fields: [],
+			emptyFieldsNotice: 'Nothing <b>here</b>',
+		});
+		const { queryByTestId, queryAllByTestId, getByTestId } = renderComponent({
+			props: {
+				parameter: WORKFLOW_INPUTS_TEST_PARAMETER,
+				node: WORKFLOW_INPUTS_TEST_NODE,
+				path: WORKFLOW_INPUTS_TEST_PARAMETER_PATH,
+			},
+		});
+		await waitAllPromises();
+		expect(queryByTestId('mapping-fields-container')).not.toBeInTheDocument();
+		expect(queryAllByTestId('field-input')).toHaveLength(0);
+		expect(getByTestId('empty-fields-notice')).toHaveTextContent('Nothing here');
+	});
+});
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index c4ef8d8161..f385842683 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -28,7 +28,7 @@ import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
-import { N8nButton, N8nCallout } from 'n8n-design-system';
+import { N8nButton, N8nCallout, N8nNotice } from 'n8n-design-system';
 
 type Props = {
 	parameter: INodeProperties;
@@ -74,6 +74,7 @@ const state = reactive({
 	refreshInProgress: false, // Shows inline loader when refreshing fields
 	loadingError: false,
 	hasStaleFields: false,
+	emptyFieldsNotice: '',
 });
 
 // Reload fields to map when dependent parameters change
@@ -315,7 +316,7 @@ async function fetchFields(): Promise<ResourceMapperFields | null> {
 	const { resourceMapperMethod, localResourceMapperMethod } =
 		props.parameter.typeOptions?.resourceMapper ?? {};
 
-	let fetchedFields = null;
+	let fetchedFields: ResourceMapperFields | null = null;
 
 	if (typeof resourceMapperMethod === 'string') {
 		const requestParams = createRequestParams(
@@ -329,6 +330,9 @@ async function fetchFields(): Promise<ResourceMapperFields | null> {
 
 		fetchedFields = await nodeTypesStore.getLocalResourceMapperFields(requestParams);
 	}
+	if (fetchedFields?.emptyFieldsNotice) {
+		state.emptyFieldsNotice = fetchedFields.emptyFieldsNotice;
+	}
 	return fetchedFields;
 }
 
@@ -619,6 +623,13 @@ defineExpose({
 			@add-field="addField"
 			@refresh-field-list="initFetching(true)"
 		/>
+		<N8nNotice
+			v-else-if="state.emptyFieldsNotice && !state.hasStaleFields"
+			type="info"
+			data-test-id="empty-fields-notice"
+		>
+			<span v-n8n-html="state.emptyFieldsNotice"></span>
+		</N8nNotice>
 		<N8nCallout v-else-if="state.hasStaleFields" theme="info" :iconless="true">
 			{{ locale.baseText('resourceMapper.staleDataWarning.notice') }}
 			<template #trailingContent>
diff --git a/packages/editor-ui/src/components/RunData.test.ts b/packages/editor-ui/src/components/RunData.test.ts
index 26a58b06ac..fb6dcbcdb3 100644
--- a/packages/editor-ui/src/components/RunData.test.ts
+++ b/packages/editor-ui/src/components/RunData.test.ts
@@ -34,17 +34,6 @@ vi.mock('@/composables/useExecutionHelpers', () => ({
 	}),
 }));
 
-const nodes = [
-	{
-		id: '1',
-		typeVersion: 3,
-		name: 'Test Node',
-		position: [0, 0],
-		type: SET_NODE_TYPE,
-		parameters: {},
-	},
-] as INodeUi[];
-
 describe('RunData', () => {
 	beforeAll(() => {
 		resolveRelatedExecutionUrl.mockReturnValue('execution.url/123');
@@ -398,8 +387,146 @@ describe('RunData', () => {
 		expect(trackOpeningRelatedExecution).toHaveBeenCalledWith(metadata, 'json');
 	});
 
+	it('should render input selector when input node has error', async () => {
+		const testNodes = [
+			{
+				id: '1',
+				name: 'When clicking ‘Test workflow’',
+				type: 'n8n-nodes-base.manualTrigger',
+				typeVersion: 1,
+				position: [80, -180],
+				disabled: false,
+				parameters: { notice: '' },
+			},
+			{
+				id: '2',
+				name: 'Edit Fields',
+				type: 'n8n-nodes-base.set',
+				parameters: {
+					mode: 'manual',
+					duplicateItem: false,
+					assignments: {
+						_custom: { type: 'reactive', stateTypeName: 'Reactive', value: {} },
+					},
+					includeOtherFields: false,
+					options: {},
+				},
+				typeVersion: 3.4,
+				position: [500, -180],
+			},
+			{
+				id: '3',
+				name: 'Test Node',
+				type: 'n8n-nodes-base.code',
+				parameters: {
+					mode: 'runOnceForAllItems',
+					language: 'javaScript',
+					jsCode: "throw Error('yo')",
+					notice: '',
+				},
+				typeVersion: 2,
+				position: [300, -180],
+				issues: {
+					_custom: {
+						type: 'reactive',
+						stateTypeName: 'Reactive',
+						value: { execution: true },
+					},
+				},
+			},
+		] as INodeUi[];
+
+		const { getByTestId } = render({
+			workflowNodes: testNodes,
+			runs: [
+				{
+					hints: [],
+					startTime: 1737643696893,
+					executionTime: 2,
+					source: [
+						{
+							previousNode: 'When clicking ‘Test workflow’',
+						},
+					],
+					executionStatus: 'error',
+					// @ts-expect-error allow missing properties in test
+					error: {
+						level: 'error',
+						tags: {
+							packageName: 'nodes-base',
+						},
+						description: null,
+						lineNumber: 1,
+						node: {
+							type: 'n8n-nodes-base.code',
+							typeVersion: 2,
+							position: [300, -180],
+							id: 'e41f12e0-d178-4294-8748-da5a6a531be6',
+							name: 'Test Node',
+							parameters: {
+								mode: 'runOnceForAllItems',
+								language: 'javaScript',
+								jsCode: "throw Error('yo')",
+								notice: '',
+							},
+						},
+						message: 'yo [line 1]',
+						stack: 'Error: yo\n n8n/packages/core/src/execution-engine/workflow-execute.ts:2066:11',
+					},
+				},
+			],
+			defaultRunItems: [
+				{
+					hints: [],
+					startTime: 1737641598215,
+					executionTime: 3,
+					// @ts-expect-error allow missing properties in test
+					source: [{ previousNode: 'Execute Workflow Trigger' }],
+					// @ts-expect-error allow missing properties in test
+					executionStatus: 'error',
+					// @ts-expect-error allow missing properties in test
+					error: {
+						level: 'error',
+						tags: { packageName: 'nodes-base' },
+						description: null,
+						lineNumber: 1,
+						node: {
+							id: 'e41f12e0-d178-4294-8748-da5a6a531be6',
+							name: 'Test Node',
+							type: 'n8n-nodes-base.code',
+							typeVersion: 2,
+							position: [300, -180],
+							parameters: {
+								mode: 'runOnceForAllItems',
+								language: 'javaScript',
+								jsCode: "throw Error('yo')",
+								notice: '',
+							},
+						},
+						message: 'yo [line 1]',
+						stack: 'Error: yo\n n8n/packages/core/src/execution-engine/workflow-execute.ts:2066:11',
+					},
+				},
+			],
+		});
+		expect(getByTestId('ndv-items-count')).toBeInTheDocument();
+	});
+
+	// Default values for the render function
+	const nodes = [
+		{
+			id: '1',
+			typeVersion: 3,
+			name: 'Test Node',
+			position: [0, 0],
+			type: SET_NODE_TYPE,
+			parameters: {},
+		},
+	] as INodeUi[];
+
 	const render = ({
 		defaultRunItems,
+		workflowNodes = nodes,
 		displayMode,
 		pinnedData,
 		paneType = 'output',
@@ -407,6 +534,7 @@ describe('RunData', () => {
 		runs,
 	}: {
 		defaultRunItems?: INodeExecutionData[];
+		workflowNodes?: INodeUi[];
 		displayMode: IRunDataDisplayMode;
 		pinnedData?: INodeExecutionData[];
 		paneType?: NodePanelType;
@@ -433,7 +561,7 @@ describe('RunData', () => {
 				},
 				[STORES.WORKFLOWS]: {
 					workflow: {
-						nodes,
+						workflowNodes,
 					},
 					workflowExecutionData: {
 						id: '1',
@@ -468,7 +596,7 @@ describe('RunData', () => {
 		const nodeTypesStore = useNodeTypesStore();
 
 		nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
-		vi.mocked(workflowsStore).getNodeByName.mockReturnValue(nodes[0]);
+		vi.mocked(workflowsStore).getNodeByName.mockReturnValue(workflowNodes[0]);
 
 		if (pinnedData) {
 			vi.mocked(workflowsStore).pinDataByNodeName.mockReturnValue(pinnedData);
@@ -480,7 +608,8 @@ describe('RunData', () => {
 					name: 'Test Node',
 				},
 				workflow: createTestWorkflowObject({
-					nodes,
+					// @ts-expect-error allow missing properties in test
+					workflowNodes,
 				}),
 			},
 			global: {
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 9634e1e04f..bf7175e68d 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -27,6 +27,7 @@ import type {
 } from '@/Interface';
 
 import {
+	CORE_NODES_CATEGORY,
 	DATA_EDITING_DOCS_URL,
 	DATA_PINNING_DOCS_URL,
 	HTML_NODE_TYPE,
@@ -35,6 +36,7 @@ import {
 	MAX_DISPLAY_DATA_SIZE,
 	MAX_DISPLAY_DATA_SIZE_SCHEMA_VIEW,
 	NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND,
+	SCHEMA_PREVIEW_EXPERIMENT,
 	TEST_PIN_DATA,
 } from '@/constants';
 
@@ -60,12 +62,11 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import { getGenericHints } from '@/utils/nodeViewUtils';
 import { searchInObject } from '@/utils/objectUtils';
-import { clearJsonKey, isEmpty } from '@/utils/typesUtils';
+import { clearJsonKey, isEmpty, isPresent } from '@/utils/typesUtils';
 import { isEqual, isObject } from 'lodash-es';
 import {
 	N8nBlockUi,
 	N8nButton,
-	N8nRoute,
 	N8nCallout,
 	N8nIconButton,
 	N8nInfoTip,
@@ -81,6 +82,10 @@ import {
 import { storeToRefs } from 'pinia';
 import { useRoute } from 'vue-router';
 import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import { useUIStore } from '@/stores/ui.store';
+import { useSchemaPreviewStore } from '@/stores/schemaPreview.store';
+import { asyncComputed } from '@vueuse/core';
+import { usePostHog } from '@/stores/posthog.store';
 
 const LazyRunDataTable = defineAsyncComponent(
 	async () => await import('@/components/RunDataTable.vue'),
@@ -180,6 +185,9 @@ const ndvStore = useNDVStore();
 const workflowsStore = useWorkflowsStore();
 const sourceControlStore = useSourceControlStore();
 const rootStore = useRootStore();
+const uiStore = useUIStore();
+const schemaPreviewStore = useSchemaPreviewStore();
+const posthogStore = usePostHog();
 
 const toast = useToast();
 const route = useRoute();
@@ -543,6 +551,36 @@ const hasInputOverwrite = computed((): boolean => {
 	return Boolean(taskData?.inputOverride);
 });
 
+const isSchemaPreviewEnabled = computed(
+	() =>
+		props.paneType === 'input' &&
+		!(nodeType.value?.codex?.categories ?? []).some(
+			(category) => category === CORE_NODES_CATEGORY,
+		) &&
+		posthogStore.isFeatureEnabled(SCHEMA_PREVIEW_EXPERIMENT),
+);
+
+const hasPreviewSchema = asyncComputed(async () => {
+	if (!isSchemaPreviewEnabled.value || props.nodes.length === 0) return false;
+	const nodes = props.nodes
+		.filter((n) => n.depth === 1)
+		.map((n) => workflowsStore.getNodeByName(n.name))
+		.filter(isPresent);
+
+	for (const connectedNode of nodes) {
+		const { type, typeVersion, parameters } = connectedNode;
+		const hasPreview = await schemaPreviewStore.getSchemaPreview({
+			nodeType: type,
+			version: typeVersion,
+			resource: parameters.resource as string,
+			operation: parameters.operation as string,
+		});
+
+		if (hasPreview.ok) return true;
+	}
+	return false;
+}, false);
+
 watch(node, (newNode, prevNode) => {
 	if (newNode?.id === prevNode?.id) return;
 	init();
@@ -1251,10 +1289,6 @@ function onSearchClear() {
 	document.dispatchEvent(new KeyboardEvent('keyup', { key: '/' }));
 }
 
-function onExecutionHistoryNavigate() {
-	ndvStore.setActiveNodeName(null);
-}
-
 function getExecutionLinkLabel(task: ITaskMetadata): string | undefined {
 	if (task.parentExecution) {
 		return i18n.baseText('runData.openParentExecution', {
@@ -1349,7 +1383,8 @@ defineExpose({ enterEditMode });
 
 				<N8nRadioButtons
 					v-show="
-						hasNodeRun && (inputData.length || binaryData.length || search) && !editMode.enabled
+						hasPreviewSchema ||
+						(hasNodeRun && (inputData.length || binaryData.length || search) && !editMode.enabled)
 					"
 					:model-value="displayMode"
 					:options="displayModes"
@@ -1434,7 +1469,7 @@ defineExpose({ enterEditMode });
 					</template>
 					<N8nIconButton
 						:icon="linkedRuns ? 'unlink' : 'link'"
-						class="linkRun"
+						:class="['linkRun', linkedRuns ? 'linked' : '']"
 						text
 						type="tertiary"
 						size="small"
@@ -1464,7 +1499,7 @@ defineExpose({ enterEditMode });
 		<slot v-if="!displaysMultipleNodes" name="before-data" />
 
 		<div v-if="props.calloutMessage" :class="$style.hintCallout">
-			<N8nCallout theme="secondary" data-test-id="run-data-callout">
+			<N8nCallout theme="info" data-test-id="run-data-callout">
 				<N8nText v-n8n-html="props.calloutMessage" size="small"></N8nText>
 			</N8nCallout>
 		</div>
@@ -1474,6 +1509,7 @@ defineExpose({ enterEditMode });
 			:key="hint.message"
 			:class="$style.hintCallout"
 			:theme="hint.type || 'info'"
+			data-test-id="node-hint"
 		>
 			<N8nText v-n8n-html="hint.message" size="small"></N8nText>
 		</N8nCallout>
@@ -1496,14 +1532,13 @@ defineExpose({ enterEditMode });
 
 		<div
 			v-else-if="
-				!hasRunError &&
 				hasNodeRun &&
 				!isSearchInSchemaView &&
 				((dataCount > 0 && maxRunIndex === 0) || search) &&
 				!isArtificialRecoveredEventItem &&
 				!displaysMultipleNodes
 			"
-			v-show="!editMode.enabled && !hasRunError"
+			v-show="!editMode.enabled"
 			:class="[$style.itemsCount, { [$style.muted]: paneType === 'input' && maxRunIndex === 0 }]"
 			data-test-id="ndv-items-count"
 		>
@@ -1593,7 +1628,7 @@ defineExpose({ enterEditMode });
 			</div>
 
 			<div
-				v-else-if="!hasNodeRun && !(displaysMultipleNodes && node?.disabled)"
+				v-else-if="!hasNodeRun && !(displaysMultipleNodes && (node?.disabled || hasPreviewSchema))"
 				:class="$style.center"
 			>
 				<slot name="node-not-run"></slot>
@@ -1611,6 +1646,16 @@ defineExpose({ enterEditMode });
 				</N8nText>
 			</div>
 
+			<div
+				v-else-if="isTrimmedManualExecutionDataItem && uiStore.isProcessingExecutionResults"
+				:class="$style.center"
+			>
+				<div :class="$style.spinner"><N8nSpinner type="ring" /></div>
+				<N8nText color="text-dark" size="large">
+					{{ i18n.baseText('runData.trimmedData.loading') }}
+				</N8nText>
+			</div>
+
 			<div v-else-if="isTrimmedManualExecutionDataItem" :class="$style.center">
 				<N8nText bold color="text-dark" size="large">
 					{{ i18n.baseText('runData.trimmedData.title') }}
@@ -1618,11 +1663,6 @@ defineExpose({ enterEditMode });
 				<N8nText>
 					{{ i18n.baseText('runData.trimmedData.message') }}
 				</N8nText>
-				<N8nButton size="small" @click="onExecutionHistoryNavigate">
-					<N8nRoute :to="`/workflow/${workflowsStore.workflowId}/executions`">
-						{{ i18n.baseText('runData.trimmedData.button') }}
-					</N8nRoute>
-				</N8nButton>
 			</div>
 
 			<div v-else-if="hasNodeRun && isArtificialRecoveredEventItem" :class="$style.center">
@@ -1779,7 +1819,7 @@ defineExpose({ enterEditMode });
 				<LazyRunDataHtml :input-html="inputHtml" />
 			</Suspense>
 
-			<Suspense v-else-if="hasNodeRun && isSchemaView">
+			<Suspense v-else-if="(hasNodeRun || hasPreviewSchema) && isSchemaView">
 				<LazyRunDataSchema
 					:nodes="nodes"
 					:mapping-enabled="mappingEnabled"
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
index e065e46250..adacd5f30e 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -148,13 +148,7 @@ const outputError = computed(() => {
 							@click.stop="trackOpeningRelatedExecution(runMeta, 'ai')"
 						>
 							<N8nIcon icon="external-link-alt" size="xsmall" />
-							{{
-								i18n.baseText('runData.openSubExecutionWithId', {
-									interpolate: {
-										id: runMeta.subExecution?.executionId,
-									},
-								})
-							}}
+							{{ i18n.baseText('runData.openSubExecutionSingle') }}
 						</a>
 					</li>
 					<li v-if="(consumedTokensSum?.totalTokens ?? 0) > 0" :class="$style.tokensUsage">
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 2a8f41e94a..66afeb8eb2 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -258,6 +258,7 @@ const getListItemName = (path: string) => {
 	> span {
 		padding: 0 var(--spacing-5xs) 0 var(--spacing-5xs);
 		margin-left: var(--spacing-5xs);
+		white-space: pre-wrap;
 	}
 }
 
diff --git a/packages/editor-ui/src/components/RunDataTable.test.ts b/packages/editor-ui/src/components/RunDataTable.test.ts
new file mode 100644
index 0000000000..654ef53882
--- /dev/null
+++ b/packages/editor-ui/src/components/RunDataTable.test.ts
@@ -0,0 +1,110 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import RunDataTable from '@/components/RunDataTable.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { cleanup } from '@testing-library/vue';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	const resolve = vi.fn().mockReturnValue({ href: 'https://test.com' });
+	return {
+		useRouter: () => ({
+			push,
+			resolve,
+		}),
+		useRoute: () => ({}),
+		RouterLink: vi.fn(),
+	};
+});
+
+const { trackOpeningRelatedExecution, resolveRelatedExecutionUrl } = vi.hoisted(() => ({
+	trackOpeningRelatedExecution: vi.fn(),
+	resolveRelatedExecutionUrl: vi.fn().mockReturnValue('https://test.com'),
+}));
+
+vi.mock('@/composables/useExecutionHelpers', () => ({
+	useExecutionHelpers: () => ({
+		trackOpeningRelatedExecution,
+		resolveRelatedExecutionUrl,
+	}),
+}));
+
+const renderComponent = createComponentRenderer(RunDataTable, {
+	props: {
+		node: {
+			parameters: {
+				keepOnlySet: false,
+				values: {},
+				options: {},
+			},
+			id: '820ea733-d8a6-4379-8e73-88a2347ea003',
+			name: 'Set',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 1,
+			position: [380, 1060],
+			disabled: false,
+		},
+		distanceFromActive: 0,
+		pageOffset: 0,
+		runIndex: 0,
+		totalRuns: 0,
+		mappingEnabled: false,
+		hasDefaultHoverState: false,
+		search: '',
+	},
+	global: {
+		plugins: [createTestingPinia()],
+	},
+});
+
+describe('RunDataTable.vue', () => {
+	beforeEach(cleanup);
+
+	it('renders empty table correctly', () => {
+		const emptyInputData = [
+			{
+				json: {},
+				index: 0,
+				pairedItem: { item: 0 },
+				metadata: { subExecution: { executionId: '123', workflowId: '123abcd' } },
+			},
+			,
+		];
+		const emptyMessage = "This is an item, but it's empty.";
+
+		const { getByTestId, getByText } = renderComponent({
+			props: {
+				inputData: emptyInputData,
+			},
+		});
+		expect(getByText(emptyMessage)).toBeInTheDocument();
+		// Sub-execution button should be link (ADO-3057)
+		expect(getByTestId('debug-sub-execution')).toBeInTheDocument();
+		expect(getByTestId('debug-sub-execution').tagName).toBe('A');
+		expect(getByTestId('debug-sub-execution').getAttribute('href')).toBe('https://test.com');
+	});
+
+	it('renders table with items correctly', () => {
+		const inputData = {
+			json: { firstName: 'John', lastName: 'Doe' },
+			index: 0,
+			pairedItem: { item: 0 },
+			metadata: { subExecution: { executionId: '123', workflowId: '123abcd' } },
+		};
+		const { getByTestId, getAllByText } = renderComponent({
+			props: {
+				inputData: [inputData],
+			},
+		});
+		expect(getByTestId('debug-sub-execution')).toBeInTheDocument();
+		expect(getByTestId('debug-sub-execution').tagName).toBe('A');
+		expect(getByTestId('debug-sub-execution').getAttribute('href')).toBe('https://test.com');
+		// All keys from the input data should be rendered
+		Object.keys(inputData.json).forEach((key) => {
+			expect(getAllByText(key)).not.toHaveLength(0);
+		});
+		// Also, all values from the input data should be rendered
+		Object.values(inputData.json).forEach((value) => {
+			expect(getAllByText(value)).not.toHaveLength(0);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 925c57cfee..c8423e6b6e 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -451,12 +451,13 @@ watch(focusedMappableInput, (curr) => {
 							<N8nIconButton
 								v-if="tableData.metadata.data[index1]"
 								v-show="showExecutionLink(index1)"
+								element="a"
 								type="secondary"
 								icon="external-link-alt"
 								data-test-id="debug-sub-execution"
 								size="mini"
-								:href="resolveRelatedExecutionUrl(tableData.metadata.data[index1])"
 								target="_blank"
+								:href="resolveRelatedExecutionUrl(tableData.metadata.data[index1])"
 								@click="trackOpeningRelatedExecution(tableData.metadata.data[index1], 'table')"
 							/>
 						</N8nTooltip>
@@ -584,20 +585,18 @@ watch(focusedMappableInput, (curr) => {
 							placement="left"
 							:hide-after="0"
 						>
-							<a
+							<N8nIconButton
 								v-if="tableData.metadata.data[index1]"
 								v-show="showExecutionLink(index1)"
-								:href="resolveRelatedExecutionUrl(tableData.metadata.data[index1])"
+								element="a"
+								type="secondary"
+								icon="external-link-alt"
+								data-test-id="debug-sub-execution"
+								size="mini"
 								target="_blank"
+								:href="resolveRelatedExecutionUrl(tableData.metadata.data[index1])"
 								@click="trackOpeningRelatedExecution(tableData.metadata.data[index1], 'table')"
-							>
-								<N8nIconButton
-									type="secondary"
-									icon="external-link-alt"
-									data-test-id="debug-sub-execution"
-									size="mini"
-								/>
-							</a>
+							/>
 						</N8nTooltip>
 					</td>
 					<td
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts b/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts
new file mode 100644
index 0000000000..df2213ad40
--- /dev/null
+++ b/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.test.ts
@@ -0,0 +1,56 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import SetupWorkflowCredentialsButton from '@/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { mockedStore } from '@/__tests__/utils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+	const params = {};
+	const location = {};
+	return {
+		...actual,
+		useRouter: () => ({
+			push: vi.fn(),
+		}),
+		useRoute: () => ({
+			params,
+			location,
+		}),
+	};
+});
+
+let workflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
+
+const renderComponent = createComponentRenderer(SetupWorkflowCredentialsButton);
+
+const EMPTY_WORKFLOW = {
+	id: '__EMPTY__',
+	createdAt: -1,
+	updatedAt: -1,
+	versionId: '1',
+	name: 'Email Summary Agent ',
+	active: false,
+	connections: {},
+	nodes: [],
+	usedCredentials: [],
+	meta: { templateId: '2722', templateCredsSetupCompleted: true },
+};
+
+describe('SetupWorkflowCredentialsButton', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		workflowsStore = mockedStore(useWorkflowsStore);
+	});
+
+	it('renders', () => {
+		workflowsStore.workflow = EMPTY_WORKFLOW;
+		expect(() => renderComponent()).not.toThrow();
+	});
+
+	it('does not render the button if there are no nodes', () => {
+		workflowsStore.workflow = EMPTY_WORKFLOW;
+		const { queryByTestId } = renderComponent();
+		expect(queryByTestId('setup-credentials-button')).toBeNull();
+	});
+});
diff --git a/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue b/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
index fc6af742ca..5597070a70 100644
--- a/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
+++ b/packages/editor-ui/src/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue
@@ -25,7 +25,7 @@ const allCredentialsFilled = computed(() => {
 
 	const nodes = workflowsStore.getNodes();
 	if (!nodes.length) {
-		return false;
+		return true;
 	}
 
 	return nodes.every((node) => doesNodeHaveAllCredentialsFilled(nodeTypesStore, node));
@@ -64,6 +64,7 @@ onBeforeUnmount(() => {
 	<n8n-button
 		v-if="showButton"
 		:label="i18n.baseText('nodeView.setupTemplate')"
+		data-test-id="setup-credentials-button"
 		size="large"
 		icon="box-open"
 		type="secondary"
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts b/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts
new file mode 100644
index 0000000000..13333b864c
--- /dev/null
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.test.ts
@@ -0,0 +1,114 @@
+import SourceControlPullModalEe from './SourceControlPullModal.ee.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import { createEventBus } from 'n8n-design-system';
+import userEvent from '@testing-library/user-event';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { mockedStore } from '@/__tests__/utils';
+import { waitFor } from '@testing-library/dom';
+
+const eventBus = createEventBus();
+
+const DynamicScrollerStub = {
+	props: {
+		items: Array,
+	},
+	template: '<div><template v-for="item in items"><slot v-bind="{ item }"></slot></template></div>',
+	methods: {
+		scrollToItem: vi.fn(),
+	},
+};
+
+const DynamicScrollerItemStub = {
+	template: '<slot></slot>',
+};
+
+const renderModal = createComponentRenderer(SourceControlPullModalEe, {
+	global: {
+		stubs: {
+			DynamicScroller: DynamicScrollerStub,
+			DynamicScrollerItem: DynamicScrollerItemStub,
+			Modal: {
+				template: `
+					<div>
+						<slot name="header" />
+						<slot name="title" />
+						<slot name="content" />
+						<slot name="footer" />
+					</div>
+				`,
+			},
+		},
+	},
+});
+
+const sampleFiles = [
+	{
+		id: '014da93897f146d2b880-baa374b9d02d',
+		name: 'vuelfow2',
+		type: 'workflow',
+		status: 'created',
+		location: 'remote',
+		conflict: false,
+		file: '/014da93897f146d2b880-baa374b9d02d.json',
+		updatedAt: '2025-01-09T13:12:24.580Z',
+	},
+	{
+		id: 'a102c0b9-28ac-43cb-950e-195723a56d54',
+		name: 'Gmail account',
+		type: 'credential',
+		status: 'created',
+		location: 'remote',
+		conflict: false,
+		file: '/a102c0b9-28ac-43cb-950e-195723a56d54.json',
+		updatedAt: '2025-01-09T13:12:24.586Z',
+	},
+];
+
+describe('SourceControlPushModal', () => {
+	beforeEach(() => {
+		createTestingPinia();
+	});
+
+	it('mounts', () => {
+		const { getByText } = renderModal({
+			props: {
+				data: {
+					eventBus,
+					status: [],
+				},
+			},
+		});
+		expect(getByText('Pull and override')).toBeInTheDocument();
+	});
+
+	it('should renders the changes', () => {
+		const { getAllByTestId } = renderModal({
+			props: {
+				data: {
+					eventBus,
+					status: sampleFiles,
+				},
+			},
+		});
+
+		expect(getAllByTestId('pull-modal-item-header').length).toBe(2);
+		expect(getAllByTestId('pull-modal-item').length).toBe(2);
+	});
+
+	it('should force pull', async () => {
+		const sourceControlStore = mockedStore(useSourceControlStore);
+		const { getByTestId } = renderModal({
+			props: {
+				data: {
+					eventBus,
+					status: sampleFiles,
+				},
+			},
+		});
+
+		await userEvent.click(getByTestId('force-pull'));
+
+		await waitFor(() => expect(sourceControlStore.pullWorkfolder).toHaveBeenCalledWith(true));
+	});
+});
diff --git a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index ac3bce1922..0607efb4df 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -1,37 +1,83 @@
 <script lang="ts" setup>
 import Modal from './Modal.vue';
-import { SOURCE_CONTROL_PULL_MODAL_KEY } from '@/constants';
+import { SOURCE_CONTROL_PULL_MODAL_KEY, VIEWS } from '@/constants';
 import type { EventBus } from 'n8n-design-system/utils';
-import type { SourceControlAggregatedFile } from '@/types/sourceControl.types';
 import { useI18n } from '@/composables/useI18n';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useToast } from '@/composables/useToast';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
-import { computed, nextTick, ref } from 'vue';
+import { computed } from 'vue';
 import { sourceControlEventBus } from '@/event-bus/source-control';
+import { orderBy, groupBy } from 'lodash-es';
+import { N8nBadge, N8nText, N8nLink, N8nButton } from 'n8n-design-system';
+import { RouterLink } from 'vue-router';
+import {
+	getStatusText,
+	getStatusTheme,
+	getPullPriorityByStatus,
+	notifyUserAboutPullWorkFolderOutcome,
+} from '@/utils/sourceControlUtils';
+import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller';
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
+import { type SourceControlledFile, SOURCE_CONTROL_FILE_TYPE } from '@n8n/api-types';
+
+type SourceControlledFileType = SourceControlledFile['type'];
 
 const props = defineProps<{
-	data: { eventBus: EventBus; status: SourceControlAggregatedFile[] };
+	data: { eventBus: EventBus; status: SourceControlledFile[] };
 }>();
 
-const incompleteFileTypes = ['variables', 'credential'];
-
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
 const toast = useToast();
 const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
 
-const files = ref<SourceControlAggregatedFile[]>(props.data.status || []);
+const sortedFiles = computed(() =>
+	orderBy(
+		props.data.status,
+		[({ status }) => getPullPriorityByStatus(status), ({ name }) => name.toLowerCase()],
+		['desc', 'asc'],
+	),
+);
 
-const workflowFiles = computed(() => {
-	return files.value.filter((file) => file.type === 'workflow');
-});
+const groupedFilesByType = computed<
+	Partial<Record<SourceControlledFileType, SourceControlledFile[]>>
+>(() => groupBy(sortedFiles.value, 'type'));
 
-const modifiedWorkflowFiles = computed(() => {
-	return workflowFiles.value.filter((file) => file.status === 'modified');
-});
+type ItemsList = Array<
+	{ type: 'render-title'; title: string; id: SourceControlledFileType } | SourceControlledFile
+>;
+
+const ITEM_TITLES: Record<Exclude<SourceControlledFileType, 'file'>, string> = {
+	[SOURCE_CONTROL_FILE_TYPE.workflow]: 'Workflows',
+	[SOURCE_CONTROL_FILE_TYPE.credential]: 'Credentials',
+	[SOURCE_CONTROL_FILE_TYPE.variables]: 'Variables',
+	[SOURCE_CONTROL_FILE_TYPE.tags]: 'Tags',
+} as const;
+
+const files = computed<ItemsList>(() =>
+	[
+		SOURCE_CONTROL_FILE_TYPE.workflow,
+		SOURCE_CONTROL_FILE_TYPE.credential,
+		SOURCE_CONTROL_FILE_TYPE.variables,
+		SOURCE_CONTROL_FILE_TYPE.tags,
+	].reduce<ItemsList>((acc, fileType) => {
+		if (!groupedFilesByType.value[fileType]) {
+			return acc;
+		}
+
+		acc.push({
+			type: 'render-title',
+			title: ITEM_TITLES[fileType],
+			id: fileType,
+		});
+
+		acc.push(...groupedFilesByType.value[fileType]);
+		return acc;
+	}, []),
+);
 
 function close() {
 	uiStore.closeModal(SOURCE_CONTROL_PULL_MODAL_KEY);
@@ -42,29 +88,10 @@ async function pullWorkfolder() {
 	close();
 
 	try {
-		await sourceControlStore.pullWorkfolder(true);
+		const status = await sourceControlStore.pullWorkfolder(true);
 
-		const hasVariablesOrCredentials = files.value.some((file) => {
-			return incompleteFileTypes.includes(file.type);
-		});
+		await notifyUserAboutPullWorkFolderOutcome(status, toast);
 
-		toast.showMessage({
-			title: i18n.baseText('settings.sourceControl.pull.success.title'),
-			type: 'success',
-		});
-
-		if (hasVariablesOrCredentials) {
-			void nextTick(() => {
-				toast.showMessage({
-					message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
-					title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
-					type: 'info',
-					duration: 0,
-					showClose: true,
-					offset: 0,
-				});
-			});
-		}
 		sourceControlEventBus.emit('pull');
 	} catch (error) {
 		toast.showError(error, 'Error');
@@ -82,35 +109,70 @@ async function pullWorkfolder() {
 		:name="SOURCE_CONTROL_PULL_MODAL_KEY"
 	>
 		<template #content>
+			<N8nText tag="div" class="mb-xs">
+				{{ i18n.baseText('settings.sourceControl.modals.pull.description') }}
+				<br />
+				<N8nLink :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+					{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
+				</N8nLink>
+			</N8nText>
 			<div :class="$style.container">
-				<n8n-text>
-					{{ i18n.baseText('settings.sourceControl.modals.pull.description') }}
-					<n8n-link :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
-						{{ i18n.baseText('settings.sourceControl.modals.pull.description.learnMore') }}
-					</n8n-link>
-				</n8n-text>
-
-				<div v-if="modifiedWorkflowFiles.length > 0" class="mt-l">
-					<ul :class="$style.filesList">
-						<li v-for="file in modifiedWorkflowFiles" :key="file.id">
-							<n8n-link :class="$style.fileLink" new-window :to="`/workflow/${file.id}`">
-								{{ file.name }}
-								<n8n-icon icon="external-link-alt" />
-							</n8n-link>
-						</li>
-					</ul>
-				</div>
+				<DynamicScroller
+					ref="scroller"
+					:items="files"
+					:min-item-size="47"
+					class="full-height scroller"
+					style="max-height: 440px"
+				>
+					<template #default="{ item, index, active }">
+						<div
+							v-if="item.type === 'render-title'"
+							:class="$style.listHeader"
+							data-test-id="pull-modal-item-header"
+						>
+							<N8nText bold>{{ item.title }}</N8nText>
+						</div>
+						<DynamicScrollerItem
+							v-else
+							:item="item"
+							:active="active"
+							:size-dependencies="[item.name]"
+							:data-index="index"
+						>
+							<div :class="$style.listItem" data-test-id="pull-modal-item">
+								<RouterLink
+									v-if="item.type === 'credential'"
+									target="_blank"
+									:to="{ name: VIEWS.CREDENTIALS, params: { credentialId: item.id } }"
+								>
+									<N8nText>{{ item.name }}</N8nText>
+								</RouterLink>
+								<RouterLink
+									v-else-if="item.type === 'workflow'"
+									target="_blank"
+									:to="{ name: VIEWS.WORKFLOW, params: { name: item.id } }"
+								>
+									<N8nText>{{ item.name }}</N8nText>
+								</RouterLink>
+								<N8nText v-else>{{ item.name }}</N8nText>
+								<N8nBadge :theme="getStatusTheme(item.status)" :class="$style.listBadge">
+									{{ getStatusText(item.status) }}
+								</N8nBadge>
+							</div>
+						</DynamicScrollerItem>
+					</template>
+				</DynamicScroller>
 			</div>
 		</template>
 
 		<template #footer>
 			<div :class="$style.footer">
-				<n8n-button type="tertiary" class="mr-2xs" @click="close">
+				<N8nButton type="tertiary" class="mr-2xs" @click="close">
 					{{ i18n.baseText('settings.sourceControl.modals.pull.buttons.cancel') }}
-				</n8n-button>
-				<n8n-button type="primary" @click="pullWorkfolder">
+				</N8nButton>
+				<N8nButton type="primary" data-test-id="force-pull" @click="pullWorkfolder">
 					{{ i18n.baseText('settings.sourceControl.modals.pull.buttons.save') }}
-				</n8n-button>
+				</N8nButton>
 			</div>
 		</template>
 	</Modal>
@@ -131,14 +193,30 @@ async function pullWorkfolder() {
 	}
 }
 
-.fileLink {
-	svg {
-		display: none;
-		margin-left: var(--spacing-4xs);
-	}
+.listHeader {
+	padding-top: 16px;
+	padding-bottom: 12px;
+	height: 47px;
+}
 
-	&:hover svg {
-		display: inline-flex;
+.listBadge {
+	margin-left: auto;
+	align-self: flex-start;
+	margin-top: 2px;
+}
+
+.listItem {
+	display: flex;
+	padding-bottom: 10px;
+	&::before {
+		display: block;
+		content: '';
+		width: 5px;
+		height: 5px;
+		background-color: var(--color-foreground-xdark);
+		border-radius: 100%;
+		margin: 7px 8px 6px 2px;
+		flex-shrink: 0;
 	}
 }
 
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
index 2d71a7f6d2..f3ce0760cb 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
@@ -5,10 +5,11 @@ import { createComponentRenderer } from '@/__tests__/render';
 import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { createEventBus } from 'n8n-design-system';
-import type { SourceControlAggregatedFile } from '@/types/sourceControl.types';
+import type { SourceControlledFile } from '@n8n/api-types';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { mockedStore } from '@/__tests__/utils';
 import { VIEWS } from '@/constants';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 const eventBus = createEventBus();
 
@@ -22,19 +23,39 @@ vi.mock('vue-router', () => ({
 	useRouter: vi.fn(),
 }));
 
-let route: ReturnType<typeof useRoute>;
+vi.mock('@/composables/useTelemetry', () => {
+	const track = vi.fn();
+	return {
+		useTelemetry: () => {
+			return {
+				track,
+			};
+		},
+	};
+});
 
-const RecycleScroller = {
+let route: ReturnType<typeof useRoute>;
+let telemetry: ReturnType<typeof useTelemetry>;
+
+const DynamicScrollerStub = {
 	props: {
 		items: Array,
 	},
 	template: '<div><template v-for="item in items"><slot v-bind="{ item }"></slot></template></div>',
+	methods: {
+		scrollToItem: vi.fn(),
+	},
+};
+
+const DynamicScrollerItemStub = {
+	template: '<slot></slot>',
 };
 
 const renderModal = createComponentRenderer(SourceControlPushModal, {
 	global: {
 		stubs: {
-			RecycleScroller,
+			DynamicScroller: DynamicScrollerStub,
+			DynamicScrollerItem: DynamicScrollerItemStub,
 			Modal: {
 				template: `
 					<div>
@@ -51,7 +72,9 @@ const renderModal = createComponentRenderer(SourceControlPushModal, {
 
 describe('SourceControlPushModal', () => {
 	beforeEach(() => {
+		vi.clearAllMocks();
 		route = useRoute();
+		telemetry = useTelemetry();
 		createTestingPinia();
 	});
 
@@ -71,7 +94,7 @@ describe('SourceControlPushModal', () => {
 	});
 
 	it('should toggle checkboxes', async () => {
-		const status: SourceControlAggregatedFile[] = [
+		const status: SourceControlledFile[] = [
 			{
 				id: 'gTbbBkkYTnNyX1jD',
 				name: 'My workflow 1',
@@ -160,7 +183,7 @@ describe('SourceControlPushModal', () => {
 	});
 
 	it('should push non workflow entities', async () => {
-		const status: SourceControlAggregatedFile[] = [
+		const status: SourceControlledFile[] = [
 			{
 				id: 'gTbbBkkYTnNyX1jD',
 				name: 'credential',
@@ -195,7 +218,7 @@ describe('SourceControlPushModal', () => {
 
 		const sourceControlStore = mockedStore(useSourceControlStore);
 
-		const { getByTestId, getByText } = renderModal({
+		const { getByTestId, getByRole } = renderModal({
 			props: {
 				data: {
 					eventBus,
@@ -207,9 +230,9 @@ describe('SourceControlPushModal', () => {
 		const submitButton = getByTestId('source-control-push-modal-submit');
 		const commitMessage = 'commit message';
 		expect(submitButton).toBeDisabled();
-		expect(getByText('1 new credentials added, 0 deleted and 0 changed')).toBeInTheDocument();
-		expect(getByText('At least one new variable has been added or modified')).toBeInTheDocument();
-		expect(getByText('At least one new tag has been added or modified')).toBeInTheDocument();
+		expect(getByRole('alert').textContent).toContain('Credentials: 1 added.');
+		expect(getByRole('alert').textContent).toContain('Variables: at least one new or modified.');
+		expect(getByRole('alert').textContent).toContain('Tags: at least one new or modified.');
 
 		await userEvent.type(getByTestId('source-control-push-modal-commit'), commitMessage);
 
@@ -226,7 +249,7 @@ describe('SourceControlPushModal', () => {
 	});
 
 	it('should auto select currentWorkflow', async () => {
-		const status: SourceControlAggregatedFile[] = [
+		const status: SourceControlledFile[] = [
 			{
 				id: 'gTbbBkkYTnNyX1jD',
 				name: 'My workflow 1',
@@ -276,7 +299,7 @@ describe('SourceControlPushModal', () => {
 
 	describe('filters', () => {
 		it('should filter by name', async () => {
-			const status: SourceControlAggregatedFile[] = [
+			const status: SourceControlledFile[] = [
 				{
 					id: 'gTbbBkkYTnNyX1jD',
 					name: 'My workflow 1',
@@ -311,13 +334,16 @@ describe('SourceControlPushModal', () => {
 			expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(2);
 
 			await userEvent.type(getByTestId('source-control-push-search'), '1');
-			await waitFor(() =>
-				expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(1),
-			);
+			await waitFor(() => {
+				expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(1);
+				expect(telemetry.track).toHaveBeenCalledWith('User searched workflows in commit modal', {
+					search: '1',
+				});
+			});
 		});
 
 		it('should filter by status', async () => {
-			const status: SourceControlAggregatedFile[] = [
+			const status: SourceControlledFile[] = [
 				{
 					id: 'gTbbBkkYTnNyX1jD',
 					name: 'Created Workflow',
@@ -371,11 +397,14 @@ describe('SourceControlPushModal', () => {
 				const items = getAllByTestId('source-control-push-modal-file-checkbox');
 				expect(items).toHaveLength(1);
 				expect(items[0]).toHaveTextContent('Created Workflow');
+				expect(telemetry.track).toHaveBeenCalledWith('User filtered by status in commit modal', {
+					status: 'created',
+				});
 			});
 		});
 
 		it('should reset', async () => {
-			const status: SourceControlAggregatedFile[] = [
+			const status: SourceControlledFile[] = [
 				{
 					id: 'JIGKevgZagmJAnM6',
 					name: 'Modified workflow',
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index eb518c2d4c..54565b8e82 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import Modal from './Modal.vue';
 import { SOURCE_CONTROL_PUSH_MODAL_KEY, VIEWS } from '@/constants';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, toRaw, watch } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 import { useI18n } from '@/composables/useI18n';
 import { useLoadingService } from '@/composables/useLoadingService';
@@ -10,9 +10,8 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useRoute } from 'vue-router';
 import dateformat from 'dateformat';
-import { RecycleScroller } from 'vue-virtual-scroller';
+import { DynamicScroller, DynamicScrollerItem } from 'vue-virtual-scroller';
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
-import type { BaseTextKey } from '@/plugins/i18n';
 import { refDebounced } from '@vueuse/core';
 import {
 	N8nHeading,
@@ -31,16 +30,17 @@ import {
 	N8nInfoTip,
 } from 'n8n-design-system';
 import {
+	type SourceControlledFile,
 	SOURCE_CONTROL_FILE_STATUS,
 	SOURCE_CONTROL_FILE_TYPE,
 	SOURCE_CONTROL_FILE_LOCATION,
-	type SourceControlledFileStatus,
-	type SourceControlAggregatedFile,
-} from '@/types/sourceControl.types';
+} from '@n8n/api-types';
 import { orderBy, groupBy } from 'lodash-es';
+import { getStatusText, getStatusTheme, getPushPriorityByStatus } from '@/utils/sourceControlUtils';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 const props = defineProps<{
-	data: { eventBus: EventBus; status: SourceControlAggregatedFile[] };
+	data: { eventBus: EventBus; status: SourceControlledFile[] };
 }>();
 
 const loadingService = useLoadingService();
@@ -49,50 +49,53 @@ const toast = useToast();
 const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
 const route = useRoute();
+const telemetry = useTelemetry();
+
+const concatenateWithAnd = (messages: string[]) =>
+	new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages);
+
+type SourceControlledFileStatus = SourceControlledFile['status'];
 
 type Changes = {
-	tags: SourceControlAggregatedFile[];
-	variables: SourceControlAggregatedFile[];
-	credentials: SourceControlAggregatedFile[];
-	workflows: SourceControlAggregatedFile[];
-	currentWorkflow?: SourceControlAggregatedFile;
+	tags: SourceControlledFile[];
+	variables: SourceControlledFile[];
+	credentials: SourceControlledFile[];
+	workflows: SourceControlledFile[];
+	currentWorkflow?: SourceControlledFile;
 };
 
-const classifyFilesByType = (
-	files: SourceControlAggregatedFile[],
-	currentWorkflowId?: string,
-): Changes =>
+const classifyFilesByType = (files: SourceControlledFile[], currentWorkflowId?: string): Changes =>
 	files.reduce<Changes>(
 		(acc, file) => {
 			// do not show remote workflows that are not yet created locally during push
 			if (
-				file.location === SOURCE_CONTROL_FILE_LOCATION.REMOTE &&
-				file.type === SOURCE_CONTROL_FILE_TYPE.WORKFLOW &&
-				file.status === SOURCE_CONTROL_FILE_STATUS.CREATED
+				file.location === SOURCE_CONTROL_FILE_LOCATION.remote &&
+				file.type === SOURCE_CONTROL_FILE_TYPE.workflow &&
+				file.status === SOURCE_CONTROL_FILE_STATUS.created
 			) {
 				return acc;
 			}
 
-			if (file.type === SOURCE_CONTROL_FILE_TYPE.VARIABLES) {
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.variables) {
 				acc.variables.push(file);
 				return acc;
 			}
 
-			if (file.type === SOURCE_CONTROL_FILE_TYPE.TAGS) {
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.tags) {
 				acc.tags.push(file);
 				return acc;
 			}
 
-			if (file.type === SOURCE_CONTROL_FILE_TYPE.WORKFLOW && currentWorkflowId === file.id) {
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.workflow && currentWorkflowId === file.id) {
 				acc.currentWorkflow = file;
 			}
 
-			if (file.type === SOURCE_CONTROL_FILE_TYPE.WORKFLOW) {
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.workflow) {
 				acc.workflows.push(file);
 				return acc;
 			}
 
-			if (file.type === SOURCE_CONTROL_FILE_TYPE.CREDENTIAL) {
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.credential) {
 				acc.credentials.push(file);
 				return acc;
 			}
@@ -103,22 +106,33 @@ const classifyFilesByType = (
 	);
 
 const userNotices = computed(() => {
-	const messages: string[] = [];
+	const messages: Array<{ title: string; content: string }> = [];
 
 	if (changes.value.credentials.length) {
 		const { created, deleted, modified } = groupBy(changes.value.credentials, 'status');
 
-		messages.push(
-			`${created?.length ?? 0} new credentials added, ${deleted?.length ?? 0} deleted and ${modified?.length ?? 0} changed`,
-		);
+		messages.push({
+			title: 'Credentials',
+			content: concatenateWithAnd([
+				...(created?.length ? [`${created.length} added`] : []),
+				...(deleted?.length ? [`${deleted.length} deleted`] : []),
+				...(modified?.length ? [`${modified.length} changed`] : []),
+			]),
+		});
 	}
 
 	if (changes.value.variables.length) {
-		messages.push('At least one new variable has been added or modified');
+		messages.push({
+			title: 'Variables',
+			content: 'at least one new or modified',
+		});
 	}
 
 	if (changes.value.tags.length) {
-		messages.push('At least one new tag has been added or modified');
+		messages.push({
+			title: 'Tags',
+			content: 'at least one new or modified',
+		});
 	}
 
 	return messages;
@@ -139,7 +153,7 @@ const toggleSelected = (id: string) => {
 	}
 };
 
-const maybeSelectCurrentWorkflow = (workflow?: SourceControlAggregatedFile) =>
+const maybeSelectCurrentWorkflow = (workflow?: SourceControlledFile) =>
 	workflow && selectedChanges.value.add(workflow.id);
 onMounted(() => maybeSelectCurrentWorkflow(changes.value.currentWorkflow));
 
@@ -152,15 +166,15 @@ const resetFilters = () => {
 const statusFilterOptions: Array<{ label: string; value: SourceControlledFileStatus }> = [
 	{
 		label: 'New',
-		value: SOURCE_CONTROL_FILE_STATUS.CREATED,
+		value: SOURCE_CONTROL_FILE_STATUS.created,
 	},
 	{
 		label: 'Modified',
-		value: SOURCE_CONTROL_FILE_STATUS.MODIFIED,
+		value: SOURCE_CONTROL_FILE_STATUS.modified,
 	},
 	{
 		label: 'Deleted',
-		value: SOURCE_CONTROL_FILE_STATUS.DELETED,
+		value: SOURCE_CONTROL_FILE_STATUS.deleted,
 	},
 ] as const;
 
@@ -179,37 +193,22 @@ const filteredWorkflows = computed(() => {
 			return false;
 		}
 
-		if (filters.value.status && filters.value.status !== workflow.status) {
-			return false;
-		}
-
-		return true;
+		return !(filters.value.status && filters.value.status !== workflow.status);
 	});
 });
 
-const statusPriority: Partial<Record<SourceControlledFileStatus, number>> = {
-	[SOURCE_CONTROL_FILE_STATUS.MODIFIED]: 1,
-	[SOURCE_CONTROL_FILE_STATUS.RENAMED]: 2,
-	[SOURCE_CONTROL_FILE_STATUS.CREATED]: 3,
-	[SOURCE_CONTROL_FILE_STATUS.DELETED]: 4,
-} as const;
-const getPriorityByStatus = (status: SourceControlledFileStatus): number =>
-	statusPriority[status] ?? 0;
-
-const sortedWorkflows = computed(() => {
-	const sorted = orderBy(
+const sortedWorkflows = computed(() =>
+	orderBy(
 		filteredWorkflows.value,
 		[
 			// keep the current workflow at the top of the list
 			({ id }) => id === changes.value.currentWorkflow?.id,
-			({ status }) => getPriorityByStatus(status),
+			({ status }) => getPushPriorityByStatus(status),
 			'updatedAt',
 		],
 		['desc', 'asc', 'desc'],
-	);
-
-	return sorted;
-});
+	),
+);
 
 const commitMessage = ref('');
 const isSubmitDisabled = computed(() => {
@@ -222,27 +221,42 @@ const isSubmitDisabled = computed(() => {
 		changes.value.tags.length +
 		changes.value.variables.length +
 		selectedChanges.value.size;
-	if (toBePushed <= 0) {
-		return true;
-	}
 
-	return false;
+	return toBePushed <= 0;
 });
 
-const selectAll = computed(
-	() =>
-		selectedChanges.value.size > 0 && selectedChanges.value.size === sortedWorkflows.value.length,
-);
+const sortedWorkflowsSet = computed(() => new Set(sortedWorkflows.value.map(({ id }) => id)));
 
-const selectAllIndeterminate = computed(
-	() => selectedChanges.value.size > 0 && selectedChanges.value.size < sortedWorkflows.value.length,
-);
+const selectAll = computed(() => {
+	if (!selectedChanges.value.size) {
+		return false;
+	}
+
+	const notSelectedVisibleItems = toRaw(sortedWorkflowsSet.value).difference(selectedChanges.value);
+
+	return !Boolean(notSelectedVisibleItems.size);
+});
+
+const selectAllIndeterminate = computed(() => {
+	if (!selectedChanges.value.size) {
+		return false;
+	}
+
+	const selectedVisibleItems = toRaw(selectedChanges.value).intersection(sortedWorkflowsSet.value);
+
+	if (selectedVisibleItems.size === 0) {
+		return false;
+	}
+
+	return !selectAll.value;
+});
 
 function onToggleSelectAll() {
+	const selected = toRaw(selectedChanges.value);
 	if (selectAll.value) {
-		selectedChanges.value.clear();
+		selectedChanges.value = selected.difference(sortedWorkflowsSet.value);
 	} else {
-		selectedChanges.value = new Set(changes.value.workflows.map((file) => file.id));
+		selectedChanges.value = selected.union(sortedWorkflowsSet.value);
 	}
 }
 
@@ -250,7 +264,7 @@ function close() {
 	uiStore.closeModal(SOURCE_CONTROL_PUSH_MODAL_KEY);
 }
 
-function renderUpdatedAt(file: SourceControlAggregatedFile) {
+function renderUpdatedAt(file: SourceControlledFile) {
 	const currentYear = new Date().getFullYear().toString();
 
 	return i18n.baseText('settings.sourceControl.lastUpdated', {
@@ -300,7 +314,7 @@ const successNotificationMessage = () => {
 	}
 
 	return [
-		new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages),
+		concatenateWithAnd(messages),
 		i18n.baseText('settings.sourceControl.modals.push.success.description'),
 	].join(' ');
 };
@@ -332,18 +346,17 @@ async function commitAndPush() {
 	}
 }
 
-const getStatusText = (status: SourceControlledFileStatus) =>
-	i18n.baseText(`settings.sourceControl.status.${status}` as BaseTextKey);
-const getStatusTheme = (status: SourceControlledFileStatus) => {
-	const statusToBadgeThemeMap: Partial<
-		Record<SourceControlledFileStatus, 'success' | 'danger' | 'warning'>
-	> = {
-		[SOURCE_CONTROL_FILE_STATUS.CREATED]: 'success',
-		[SOURCE_CONTROL_FILE_STATUS.DELETED]: 'danger',
-		[SOURCE_CONTROL_FILE_STATUS.MODIFIED]: 'warning',
-	} as const;
-	return statusToBadgeThemeMap[status];
-};
+const modalHeight = computed(() => (changes.value.workflows.length ? 'min(80vh, 850px)' : 'auto'));
+
+watch(
+	() => filters.value.status,
+	(status) => {
+		telemetry.track('User filtered by status in commit modal', { status });
+	},
+);
+watch(refDebounced(search, 500), (term) => {
+	telemetry.track('User searched workflows in commit modal', { search: term });
+});
 </script>
 
 <template>
@@ -351,161 +364,190 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 		width="812px"
 		:event-bus="data.eventBus"
 		:name="SOURCE_CONTROL_PUSH_MODAL_KEY"
-		max-height="80%"
+		:height="modalHeight"
 		:custom-class="$style.sourceControlPush"
 	>
 		<template #header>
 			<N8nHeading tag="h1" size="xlarge">
 				{{ i18n.baseText('settings.sourceControl.modals.push.title') }}
 			</N8nHeading>
-			<div class="mt-l">
-				<N8nText tag="div">
-					{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
-					<N8nLink :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
-						{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
-					</N8nLink>
-				</N8nText>
 
-				<N8nNotice v-if="userNotices.length" class="mt-xs" :compact="false">
-					<ul class="ml-m">
-						<li v-for="notice in userNotices" :key="notice">{{ notice }}</li>
-					</ul>
-				</N8nNotice>
-			</div>
+			<div v-if="changes.workflows.length" :class="[$style.filtersRow]" class="mt-l">
+				<div :class="[$style.filters]">
+					<N8nInput
+						v-model="search"
+						data-test-id="source-control-push-search"
+						placeholder="Filter by title"
+						clearable
+						style="width: 234px"
+					>
+						<template #prefix>
+							<N8nIcon icon="search" />
+						</template>
+					</N8nInput>
+					<N8nPopover trigger="click" width="304" style="align-self: normal">
+						<template #reference>
+							<N8nButton
+								icon="filter"
+								type="tertiary"
+								style="height: 100%"
+								:active="Boolean(filterCount)"
+								data-test-id="source-control-filter-dropdown"
+							>
+								<N8nBadge v-if="filterCount" theme="primary" class="mr-4xs">
+									{{ filterCount }}
+								</N8nBadge>
+							</N8nButton>
+						</template>
+						<N8nInputLabel
+							:label="i18n.baseText('workflows.filters.status')"
+							:bold="false"
+							size="small"
+							color="text-base"
+							class="mb-3xs"
+						/>
+						<N8nSelect
+							v-model="filters.status"
+							data-test-id="source-control-status-filter"
+							clearable
+						>
+							<N8nOption
+								v-for="option in statusFilterOptions"
+								:key="option.label"
+								data-test-id="source-control-status-filter-option"
+								v-bind="option"
+							>
+							</N8nOption>
+						</N8nSelect>
+					</N8nPopover>
+				</div>
 
-			<div v-if="changes.workflows.length" :class="[$style.filers]" class="mt-l">
-				<N8nCheckbox
-					:class="$style.selectAll"
-					:indeterminate="selectAllIndeterminate"
-					:model-value="selectAll"
-					data-test-id="source-control-push-modal-toggle-all"
-					@update:model-value="onToggleSelectAll"
-				>
-					<N8nText bold tag="strong">
-						{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
+				<div>
+					<N8nText bold color="text-base" size="small">
+						{{ selectedChanges.size }} of {{ changes.workflows.length }}
 					</N8nText>
-					<N8nText tag="strong">
-						({{ selectedChanges.size }}/{{ sortedWorkflows.length }})
-					</N8nText>
-				</N8nCheckbox>
-				<N8nPopover trigger="click" width="304" style="align-self: normal">
-					<template #reference>
-						<N8nButton
-							icon="filter"
-							type="tertiary"
-							style="height: 100%"
-							:active="Boolean(filterCount)"
-							data-test-id="source-control-filter-dropdown"
-						>
-							<N8nBadge v-show="filterCount" theme="primary" class="mr-4xs">
-								{{ filterCount }}
-							</N8nBadge>
-							{{ i18n.baseText('forms.resourceFiltersDropdown.filters') }}
-						</N8nButton>
-					</template>
-					<N8nInputLabel
-						:label="i18n.baseText('workflows.filters.status')"
-						:bold="false"
-						size="small"
-						color="text-base"
-						class="mb-3xs"
-					/>
-					<N8nSelect v-model="filters.status" data-test-id="source-control-status-filter" clearable>
-						<N8nOption
-							v-for="option in statusFilterOptions"
-							:key="option.label"
-							data-test-id="source-control-status-filter-option"
-							v-bind="option"
-						>
-						</N8nOption>
-					</N8nSelect>
-				</N8nPopover>
-				<N8nInput
-					v-model="search"
-					data-test-id="source-control-push-search"
-					:placeholder="i18n.baseText('workflows.search.placeholder')"
-					clearable
-				>
-					<template #prefix>
-						<N8nIcon icon="search" />
-					</template>
-				</N8nInput>
+					<N8nText color="text-base" size="small"> workflows selected</N8nText>
+				</div>
 			</div>
 		</template>
 		<template #content>
-			<N8nInfoTip v-if="filtersApplied && !sortedWorkflows.length" :bold="false">
-				{{ i18n.baseText('workflows.filters.active') }}
-				<N8nLink size="small" data-test-id="source-control-filters-reset" @click="resetFilters">
-					{{ i18n.baseText('workflows.filters.active.reset') }}
-				</N8nLink>
-			</N8nInfoTip>
-			<RecycleScroller
-				v-if="sortedWorkflows.length"
-				:class="[$style.scroller]"
-				:items="sortedWorkflows"
-				:item-size="69"
-				key-field="id"
-			>
-				<template #default="{ item: file }">
+			<div :class="[$style.table]" v-if="changes.workflows.length">
+				<div :class="[$style.tableHeader]">
 					<N8nCheckbox
-						:class="['scopedListItem', $style.listItem]"
-						data-test-id="source-control-push-modal-file-checkbox"
-						:model-value="selectedChanges.has(file.id)"
-						@update:model-value="toggleSelected(file.id)"
+						:class="$style.selectAll"
+						:indeterminate="selectAllIndeterminate"
+						:model-value="selectAll"
+						data-test-id="source-control-push-modal-toggle-all"
+						@update:model-value="onToggleSelectAll"
 					>
-						<span>
-							<N8nText v-if="file.status === SOURCE_CONTROL_FILE_STATUS.DELETED" color="text-light">
-								<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.WORKFLOW">
-									Deleted Workflow:
-								</span>
-								<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.CREDENTIAL">
-									Deleted Credential:
-								</span>
-								<strong>{{ file.name || file.id }}</strong>
-							</N8nText>
-							<N8nText v-else bold> {{ file.name }} </N8nText>
-							<N8nText v-if="file.updatedAt" tag="p" class="mt-0" color="text-light" size="small">
-								{{ renderUpdatedAt(file) }}
-							</N8nText>
-						</span>
-						<span :class="[$style.badges]">
-							<N8nBadge
-								v-if="changes.currentWorkflow && file.id === changes.currentWorkflow.id"
-								class="mr-2xs"
-							>
-								Current workflow
-							</N8nBadge>
-							<N8nBadge :theme="getStatusTheme(file.status)">
-								{{ getStatusText(file.status) }}
-							</N8nBadge>
-						</span>
+						<N8nText> Title </N8nText>
 					</N8nCheckbox>
-				</template>
-			</RecycleScroller>
+				</div>
+				<div style="flex: 1; overflow: hidden">
+					<N8nInfoTip v-if="filtersApplied && !sortedWorkflows.length" :bold="false">
+						{{ i18n.baseText('workflows.filters.active') }}
+						<N8nLink size="small" data-test-id="source-control-filters-reset" @click="resetFilters">
+							{{ i18n.baseText('workflows.filters.active.reset') }}
+						</N8nLink>
+					</N8nInfoTip>
+					<DynamicScroller
+						v-if="sortedWorkflows.length"
+						:class="[$style.scroller]"
+						:items="sortedWorkflows"
+						:min-item-size="58"
+						item-class="scrollerItem"
+					>
+						<template #default="{ item: file, active, index }">
+							<DynamicScrollerItem
+								:item="file"
+								:active="active"
+								:size-dependencies="[file.name, file.id]"
+								:data-index="index"
+							>
+								<N8nCheckbox
+									:class="[$style.listItem]"
+									data-test-id="source-control-push-modal-file-checkbox"
+									:model-value="selectedChanges.has(file.id)"
+									@update:model-value="toggleSelected(file.id)"
+								>
+									<span>
+										<N8nText
+											v-if="file.status === SOURCE_CONTROL_FILE_STATUS.deleted"
+											color="text-light"
+										>
+											<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.workflow">
+												Deleted Workflow:
+											</span>
+											<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.credential">
+												Deleted Credential:
+											</span>
+											<strong>{{ file.name || file.id }}</strong>
+										</N8nText>
+										<N8nText v-else tag="div" bold color="text-dark" :class="[$style.listItemName]">
+											{{ file.name }}
+										</N8nText>
+										<N8nText
+											v-if="file.updatedAt"
+											tag="p"
+											class="mt-0"
+											color="text-light"
+											size="small"
+										>
+											{{ renderUpdatedAt(file) }}
+										</N8nText>
+									</span>
+									<span :class="[$style.badges]">
+										<N8nBadge
+											v-if="changes.currentWorkflow && file.id === changes.currentWorkflow.id"
+											class="mr-2xs"
+										>
+											Current workflow
+										</N8nBadge>
+										<N8nBadge :theme="getStatusTheme(file.status)">
+											{{ getStatusText(file.status) }}
+										</N8nBadge>
+									</span>
+								</N8nCheckbox>
+							</DynamicScrollerItem>
+						</template>
+					</DynamicScroller>
+				</div>
+			</div>
 		</template>
 
 		<template #footer>
-			<N8nText bold tag="p" class="mb-2xs">
+			<N8nNotice v-if="userNotices.length" :compact="false" class="mt-0">
+				<N8nText bold size="medium">Changes to credentials, variables and tags </N8nText>
+				<br />
+				<template v-for="{ title, content } in userNotices" :key="title">
+					<N8nText bold size="small">{{ title }}</N8nText>
+					<N8nText size="small">: {{ content }}. </N8nText>
+				</template>
+			</N8nNotice>
+
+			<N8nText bold tag="p">
 				{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
 			</N8nText>
-			<N8nInput
-				v-model="commitMessage"
-				data-test-id="source-control-push-modal-commit"
-				:placeholder="i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')"
-				@keydown.enter="onCommitKeyDownEnter"
-			/>
 
 			<div :class="$style.footer">
-				<N8nButton type="tertiary" class="mr-2xs" @click="close">
-					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
-				</N8nButton>
+				<N8nInput
+					v-model="commitMessage"
+					class="mr-2xs"
+					data-test-id="source-control-push-modal-commit"
+					:placeholder="
+						i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
+					"
+					@keydown.enter="onCommitKeyDownEnter"
+				/>
 				<N8nButton
 					data-test-id="source-control-push-modal-submit"
 					type="primary"
 					:disabled="isSubmitDisabled"
+					size="large"
 					@click="commitAndPush"
 				>
 					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.save') }}
+					{{ selectedChanges.size ? `(${selectedChanges.size})` : undefined }}
 				</N8nButton>
 			</div>
 		</template>
@@ -513,7 +555,14 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 </template>
 
 <style module lang="scss">
-.filers {
+.filtersRow {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	justify-content: space-between;
+}
+
+.filters {
 	display: flex;
 	align-items: center;
 	gap: 8px;
@@ -525,18 +574,33 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 }
 
 .scroller {
-	max-height: 380px;
+	max-height: 100%;
+	scrollbar-color: var(--color-foreground-base) transparent;
+	outline: var(--border-base);
+
+	:global(.scrollerItem) {
+		&:last-child {
+			.listItem {
+				border-bottom: 0;
+			}
+		}
+	}
 }
 
 .listItem {
 	align-items: center;
-	padding: var(--spacing-xs);
-	transition: border 0.3s ease;
-	border-radius: var(--border-radius-large);
-	border: var(--border-base);
+	padding: 10px 16px;
+	margin: 0;
+	border-bottom: var(--border-base);
 
-	&:hover {
-		border-color: var(--color-foreground-dark);
+	.listItemName {
+		line-clamp: 2;
+		-webkit-line-clamp: 2;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		word-wrap: break-word; /* Important for long words! */
 	}
 
 	:global(.el-checkbox__label) {
@@ -544,6 +608,7 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 		width: 100%;
 		justify-content: space-between;
 		align-items: center;
+		gap: 30px;
 	}
 
 	:global(.el-checkbox__inner) {
@@ -559,12 +624,30 @@ const getStatusTheme = (status: SourceControlledFileStatus) => {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-end;
-	margin-top: 20px;
+	margin-top: 8px;
 }
 
 .sourceControlPush {
+	&:global(.el-dialog) {
+		margin: 0;
+	}
+
 	:global(.el-dialog__header) {
 		padding-bottom: var(--spacing-xs);
 	}
 }
+
+.table {
+	height: 100%;
+	overflow: hidden;
+	display: flex;
+	flex-direction: column;
+	border: var(--border-base);
+	border-radius: 8px;
+}
+
+.tableHeader {
+	border-bottom: var(--border-base);
+	padding: 10px 16px;
+}
 </style>
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 98b25db9b6..16a10468d0 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -114,6 +114,7 @@ const {
 	segments: { all: segments },
 	readEditorValue,
 	hasFocus: editorHasFocus,
+	isDirty,
 } = useExpressionEditor({
 	editorRef: sqlEditor,
 	editorValue,
@@ -148,6 +149,7 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+	if (isDirty.value) emit('update:model-value', readEditorValue());
 	codeNodeEditorEventBus.off('highlightLine', highlightLine);
 });
 
@@ -226,6 +228,10 @@ async function onDrop(value: string, event: MouseEvent) {
 .sqlEditor {
 	position: relative;
 	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
 }
 
 .codemirror {
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index ea4e2d7aa2..53ea66747d 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -12,7 +12,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useContextMenu } from '@/composables/useContextMenu';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { GRID_SIZE } from '@/utils/nodeViewUtils';
 import { useToast } from '@/composables/useToast';
 import { assert } from '@/utils/assert';
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
index 9b0ec16a7e..c858e04b0c 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
@@ -1,40 +1,84 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
+import type { EditableField } from '../types';
 
 interface Props {
-	modelValue: string;
+	modelValue: EditableField<string>;
+	startEditing: (field: 'description') => void;
+	saveChanges: (field: 'description') => void;
+	handleKeydown: (e: KeyboardEvent, field: 'description') => void;
 }
 
-withDefaults(defineProps<Props>(), {
-	modelValue: '',
-});
-
-defineEmits<{ 'update:modelValue': [value: string] }>();
+defineProps<Props>();
+defineEmits<{ 'update:modelValue': [value: EditableField<string>] }>();
 
 const locale = useI18n();
 </script>
 
 <template>
-	<div :class="[$style.description]">
-		<n8n-input-label
-			:label="locale.baseText('testDefinition.edit.description')"
-			:bold="false"
-			size="small"
-			:class="$style.field"
-		>
-			<N8nInput
-				:model-value="modelValue"
-				type="textarea"
-				:placeholder="locale.baseText('testDefinition.edit.descriptionPlaceholder')"
-				@update:model-value="$emit('update:modelValue', $event)"
+	<div :class="$style.description">
+		<template v-if="!modelValue.isEditing">
+			<span :class="$style.descriptionText" @click="startEditing('description')">
+				<n8n-icon
+					v-if="modelValue.value.length === 0"
+					:class="$style.icon"
+					icon="plus"
+					color="text-light"
+					size="medium"
+				/>
+				<N8nText size="medium">
+					{{ modelValue.value.length > 0 ? modelValue.value : 'Add a description' }}
+				</N8nText>
+			</span>
+			<n8n-icon-button
+				:class="$style.editInputButton"
+				icon="pen"
+				type="tertiary"
+				@click="startEditing('description')"
 			/>
-		</n8n-input-label>
+		</template>
+		<N8nInput
+			v-else
+			ref="descriptionInput"
+			data-test-id="evaluation-description-input"
+			:model-value="modelValue.tempValue"
+			type="textarea"
+			:placeholder="locale.baseText('testDefinition.edit.descriptionPlaceholder')"
+			@update:model-value="$emit('update:modelValue', { ...modelValue, tempValue: $event })"
+			@blur="() => saveChanges('description')"
+			@keydown="(e: KeyboardEvent) => handleKeydown(e, 'description')"
+		/>
 	</div>
 </template>
 
 <style module lang="scss">
-.field {
-	width: 100%;
-	margin-top: var(--spacing-xs);
+.description {
+	display: flex;
+	align-items: center;
+	color: var(--color-text-light);
+	font-size: var(--font-size-s);
+
+	&:hover {
+		.editInputButton {
+			opacity: 1;
+		}
+	}
+}
+
+.descriptionText {
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+
+	.icon {
+		margin-right: var(--spacing-2xs);
+	}
+}
+
+.editInputButton {
+	--button-font-color: var(--prim-gray-490);
+	opacity: 0;
+	border: none;
 }
 </style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
deleted file mode 100644
index 58b8e7dc0f..0000000000
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-<script setup lang="ts">
-import { useI18n } from '@/composables/useI18n';
-import type { EditableField } from '../types';
-
-export interface EvaluationHeaderProps {
-	modelValue: EditableField<string>;
-	startEditing: (field: 'name') => void;
-	saveChanges: (field: 'name') => void;
-	handleKeydown: (e: KeyboardEvent, field: 'name') => void;
-}
-
-defineEmits<{ 'update:modelValue': [value: EditableField<string>] }>();
-defineProps<EvaluationHeaderProps>();
-
-const locale = useI18n();
-</script>
-
-<template>
-	<div :class="$style.header">
-		<n8n-icon-button
-			icon="arrow-left"
-			:class="$style.backButton"
-			type="tertiary"
-			:title="locale.baseText('testDefinition.edit.backButtonTitle')"
-			@click="$router.back()"
-		/>
-		<h2 :class="$style.title">
-			<template v-if="!modelValue.isEditing">
-				<span :class="$style.titleText">
-					{{ modelValue.value }}
-				</span>
-				<n8n-icon-button
-					:class="$style.editInputButton"
-					icon="pen"
-					type="tertiary"
-					@click="startEditing('name')"
-				/>
-			</template>
-			<N8nInput
-				v-else
-				ref="nameInput"
-				data-test-id="evaluation-name-input"
-				:model-value="modelValue.tempValue"
-				type="text"
-				:placeholder="locale.baseText('testDefinition.edit.namePlaceholder')"
-				@update:model-value="$emit('update:modelValue', { ...modelValue, tempValue: $event })"
-				@blur="() => saveChanges('name')"
-				@keydown="(e: KeyboardEvent) => handleKeydown(e, 'name')"
-			/>
-		</h2>
-	</div>
-</template>
-
-<style module lang="scss">
-.header {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2xs);
-	margin-bottom: var(--spacing-l);
-
-	&:hover {
-		.editInputButton {
-			opacity: 1;
-		}
-	}
-}
-
-.title {
-	margin: 0;
-	flex-grow: 1;
-	font-size: var(--font-size-xl);
-	font-weight: var(--font-weight-bold);
-	color: var(--color-text-dark);
-	display: flex;
-	align-items: center;
-	max-width: 100%;
-	overflow: hidden;
-
-	.titleText {
-		display: block;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-	}
-}
-
-.editInputButton {
-	--button-font-color: var(--prim-gray-490);
-	opacity: 0;
-	border: none;
-}
-
-.backButton {
-	--button-font-color: var(--color-text-light);
-	border: none;
-}
-</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
index 8ba5c4b657..01ab2188d9 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
@@ -2,14 +2,15 @@
 import { useI18n } from '@/composables/useI18n';
 import { ElCollapseTransition } from 'element-plus';
 import { ref, nextTick } from 'vue';
-import N8nTooltip from 'n8n-design-system/components/N8nTooltip';
 
 interface EvaluationStep {
 	title: string;
 	warning?: boolean;
 	small?: boolean;
 	expanded?: boolean;
-	tooltip?: string;
+	description?: string;
+	issues?: Array<{ field: string; message: string }>;
+	showIssues?: boolean;
 }
 
 const props = withDefaults(defineProps<EvaluationStep>(), {
@@ -17,14 +18,14 @@ const props = withDefaults(defineProps<EvaluationStep>(), {
 	warning: false,
 	small: false,
 	expanded: true,
-	tooltip: '',
+	issues: () => [],
+	showIssues: true,
 });
 
 const locale = useI18n();
 const isExpanded = ref(props.expanded);
 const contentRef = ref<HTMLElement | null>(null);
 const containerRef = ref<HTMLElement | null>(null);
-const isTooltipVisible = ref(false);
 
 const toggleExpand = async () => {
 	isExpanded.value = !isExpanded.value;
@@ -35,14 +36,6 @@ const toggleExpand = async () => {
 		}
 	}
 };
-
-const showTooltip = () => {
-	isTooltipVisible.value = true;
-};
-
-const hideTooltip = () => {
-	isTooltipVisible.value = false;
-};
 </script>
 
 <template>
@@ -51,22 +44,17 @@ const hideTooltip = () => {
 		:class="[$style.evaluationStep, small && $style.small]"
 		data-test-id="evaluation-step"
 	>
-		<N8nTooltip :disabled="!tooltip" placement="right" :offset="25" :visible="isTooltipVisible">
-			<template #content>
-				{{ tooltip }}
-			</template>
-			<!-- This empty div is needed to ensure the tooltip trigger area spans the full width of the step.
-			     Without it, the tooltip would only show when hovering over the content div, which is narrower.
-			     The contentPlaceholder creates an invisible full-width area that can trigger the tooltip. -->
-			<div :class="$style.contentPlaceholder"></div>
-		</N8nTooltip>
-		<div :class="$style.content" @mouseenter="showTooltip" @mouseleave="hideTooltip">
+		<div :class="$style.content">
 			<div :class="$style.header">
 				<div :class="[$style.icon, warning && $style.warning]">
 					<slot name="icon" />
 				</div>
 				<h3 :class="$style.title">{{ title }}</h3>
-				<span v-if="warning" :class="$style.warningIcon">⚠</span>
+				<span v-if="issues.length > 0 && showIssues" :class="$style.warningIcon">
+					<N8nInfoTip :bold="true" type="tooltip" theme="warning" tooltip-placement="right">
+						{{ issues.map((issue) => issue.message).join(', ') }}
+					</N8nInfoTip>
+				</span>
 				<button
 					v-if="$slots.cardContent"
 					:class="$style.collapseButton"
@@ -83,6 +71,7 @@ const hideTooltip = () => {
 					<font-awesome-icon :icon="isExpanded ? 'angle-down' : 'angle-right'" size="lg" />
 				</button>
 			</div>
+			<div v-if="description" :class="$style.description">{{ description }}</div>
 			<ElCollapseTransition v-if="$slots.cardContent">
 				<div v-show="isExpanded" :class="$style.cardContentWrapper">
 					<div ref="contentRef" :class="$style.cardContent" data-test-id="evaluation-step-content">
@@ -109,16 +98,9 @@ const hideTooltip = () => {
 
 	&.small {
 		width: 80%;
+		margin-left: auto;
 	}
 }
-.contentPlaceholder {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: -1;
-}
 .icon {
 	display: flex;
 	align-items: center;
@@ -173,4 +155,10 @@ const hideTooltip = () => {
 .cardContentWrapper {
 	height: max-content;
 }
+
+.description {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-light);
+	line-height: 1rem;
+}
 </style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
index c33180c312..2e2c2a6d9c 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
@@ -22,11 +22,11 @@ const eventBus = createEventBus<CanvasEventBusEvents>();
 const style = useCssModule();
 const uuid = crypto.randomUUID();
 const props = defineProps<{
-	modelValue: Array<{ name: string }>;
+	modelValue: Array<{ name: string; id: string }>;
 }>();
 
 const emit = defineEmits<{
-	'update:modelValue': [value: Array<{ name: string }>];
+	'update:modelValue': [value: Array<{ name: string; id: string }>];
 }>();
 
 const isLoading = ref(true);
@@ -84,14 +84,7 @@ function disableAllNodes() {
 	const ids = mappedNodes.value.map((node) => node.id);
 	updateNodeClasses(ids, false);
 
-	const pinnedNodes = props.modelValue
-		.map((node) => {
-			const matchedNode = mappedNodes.value.find(
-				(mappedNode) => mappedNode?.data?.name === node.name,
-			);
-			return matchedNode?.id ?? null;
-		})
-		.filter((n) => n !== null);
+	const pinnedNodes = props.modelValue.map((node) => node.id).filter((id) => id !== null);
 
 	if (pinnedNodes.length > 0) {
 		updateNodeClasses(pinnedNodes, true);
@@ -101,10 +94,10 @@ function onPinButtonClick(data: CanvasNodeData) {
 	const nodeName = getNodeNameById(data.id);
 	if (!nodeName) return;
 
-	const isPinned = props.modelValue.some((node) => node.name === nodeName);
+	const isPinned = props.modelValue.some((node) => node.id === data.id);
 	const updatedNodes = isPinned
-		? props.modelValue.filter((node) => node.name !== nodeName)
-		: [...props.modelValue, { name: nodeName }];
+		? props.modelValue.filter((node) => node.id !== data.id)
+		: [...props.modelValue, { name: nodeName, id: data.id }];
 
 	emit('update:modelValue', updatedNodes);
 	updateNodeClasses([data.id], !isPinned);
@@ -122,7 +115,13 @@ onMounted(loadData);
 </script>
 
 <template>
-	<div :class="$style.container">
+	<div v-if="mappedNodes.length === 0" :class="$style.noNodes">
+		<N8nHeading size="large" :bold="true" :class="$style.noNodesTitle">{{
+			locale.baseText('testDefinition.edit.pinNodes.noNodes.title')
+		}}</N8nHeading>
+		<N8nText>{{ locale.baseText('testDefinition.edit.pinNodes.noNodes.description') }}</N8nText>
+	</div>
+	<div v-else :class="$style.container">
 		<N8nSpinner v-if="isLoading" size="xlarge" type="dots" :class="$style.spinner" />
 		<Canvas
 			:id="canvasId"
@@ -145,6 +144,7 @@ onMounted(loadData);
 							size="large"
 							icon="thumbtack"
 							:class="$style.pinButton"
+							data-test-id="node-pin-button"
 							@click="onPinButtonClick(data)"
 						/>
 					</N8nTooltip>
@@ -191,4 +191,11 @@ onMounted(loadData);
 	left: 50%;
 	transform: translate(-50%, -50%);
 }
+.noNodes {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
+}
 </style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue
new file mode 100644
index 0000000000..b0416bbb9e
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TestNameInput.vue
@@ -0,0 +1,69 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { EditableField } from '../types';
+
+export interface EvaluationHeaderProps {
+	modelValue: EditableField<string>;
+	startEditing: (field: 'name') => void;
+	saveChanges: (field: 'name') => void;
+	handleKeydown: (e: KeyboardEvent, field: 'name') => void;
+}
+
+defineEmits<{ 'update:modelValue': [value: EditableField<string>] }>();
+defineProps<EvaluationHeaderProps>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<h2 :class="$style.title">
+		<template v-if="!modelValue.isEditing">
+			<span :class="$style.titleText">
+				{{ modelValue.value }}
+			</span>
+			<n8n-icon-button
+				:class="$style.editInputButton"
+				icon="pen"
+				type="tertiary"
+				@click="startEditing('name')"
+			/>
+		</template>
+		<N8nInput
+			v-else
+			ref="nameInput"
+			data-test-id="evaluation-name-input"
+			:model-value="modelValue.tempValue"
+			type="text"
+			:placeholder="locale.baseText('testDefinition.edit.namePlaceholder')"
+			@update:model-value="$emit('update:modelValue', { ...modelValue, tempValue: $event })"
+			@blur="() => saveChanges('name')"
+			@keydown="(e: KeyboardEvent) => handleKeydown(e, 'name')"
+		/>
+	</h2>
+</template>
+
+<style module lang="scss">
+.title {
+	margin: 0;
+	font-size: var(--font-size-xl);
+	font-weight: var(--font-weight-bold);
+	color: var(--color-text-dark);
+	display: flex;
+	align-items: center;
+	max-width: 100%;
+	overflow: hidden;
+
+	.titleText {
+		display: block;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+}
+
+.editInputButton {
+	--button-font-color: var(--prim-gray-490);
+	opacity: 0.2;
+	border: none;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
index 87626d3ae3..45b1080fa2 100644
--- a/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/WorkflowSelector.vue
@@ -1,20 +1,45 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
-import type { INodeParameterResourceLocator } from 'n8n-workflow';
+import { SAMPLE_EVALUATION_WORKFLOW } from '@/constants.workflows';
+import type { IWorkflowDataCreate } from '@/Interface';
+import type { INodeParameterResourceLocator, IPinData } from 'n8n-workflow';
+import { computed } from 'vue';
+
 interface WorkflowSelectorProps {
 	modelValue: INodeParameterResourceLocator;
+	examplePinnedData?: IPinData;
+	sampleWorkflowName?: string;
 }
 
-withDefaults(defineProps<WorkflowSelectorProps>(), {
+const props = withDefaults(defineProps<WorkflowSelectorProps>(), {
 	modelValue: () => ({
 		mode: 'id',
 		value: '',
 		__rl: true,
 	}),
+	examplePinnedData: () => ({}),
+	sampleWorkflowName: undefined,
 });
 
 defineEmits<{ 'update:modelValue': [value: WorkflowSelectorProps['modelValue']] }>();
 const locale = useI18n();
+
+const subworkflowName = computed(() => {
+	if (props.sampleWorkflowName) {
+		return locale.baseText('testDefinition.workflowInput.subworkflowName', {
+			interpolate: { name: props.sampleWorkflowName },
+		});
+	}
+	return locale.baseText('testDefinition.workflowInput.subworkflowName.default');
+});
+
+const sampleWorkflow = computed<IWorkflowDataCreate>(() => {
+	return {
+		...SAMPLE_EVALUATION_WORKFLOW,
+		name: subworkflowName.value,
+		pinData: props.examplePinnedData,
+	};
+});
 </script>
 <template>
 	<div>
@@ -36,6 +61,7 @@ const locale = useI18n();
 				:expression-edit-dialog-visible="false"
 				:path="'workflows'"
 				allow-new
+				:sample-workflow="sampleWorkflow"
 				@update:model-value="$emit('update:modelValue', $event)"
 			/>
 		</n8n-input-label>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
new file mode 100644
index 0000000000..36c9fefe3c
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/ConfigSection.vue
@@ -0,0 +1,240 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import EvaluationStep from '@/components/TestDefinition/EditDefinition/EvaluationStep.vue';
+import TagsInput from '@/components/TestDefinition/EditDefinition/TagsInput.vue';
+import WorkflowSelector from '@/components/TestDefinition/EditDefinition/WorkflowSelector.vue';
+import MetricsInput from '@/components/TestDefinition/EditDefinition/MetricsInput.vue';
+import type { TestMetricRecord } from '@/api/testDefinition.ee';
+import type { EditableFormState, EvaluationFormState } from '@/components/TestDefinition/types';
+import type { ITag, ModalState } from '@/Interface';
+import { NODE_PINNING_MODAL_KEY } from '@/constants';
+import { ref } from 'vue';
+import type { IPinData } from 'n8n-workflow';
+
+defineProps<{
+	showConfig: boolean;
+	tagUsageCount: number;
+	allTags: ITag[];
+	tagsById: Record<string, ITag>;
+	isLoading: boolean;
+	examplePinnedData?: IPinData;
+	sampleWorkflowName?: string;
+	getFieldIssues: (key: string) => Array<{ field: string; message: string }>;
+	startEditing: (field: keyof EditableFormState) => void;
+	saveChanges: (field: keyof EditableFormState) => void;
+	cancelEditing: (field: keyof EditableFormState) => void;
+	createTag?: (name: string) => Promise<ITag>;
+}>();
+
+const emit = defineEmits<{
+	openPinningModal: [];
+	deleteMetric: [metric: Partial<TestMetricRecord>];
+}>();
+
+const locale = useI18n();
+const changedFieldsKeys = ref<string[]>([]);
+const tags = defineModel<EvaluationFormState['tags']>('tags', { required: true });
+const evaluationWorkflow = defineModel<EvaluationFormState['evaluationWorkflow']>(
+	'evaluationWorkflow',
+	{ required: true },
+);
+const metrics = defineModel<EvaluationFormState['metrics']>('metrics', { required: true });
+const mockedNodes = defineModel<EvaluationFormState['mockedNodes']>('mockedNodes', {
+	required: true,
+});
+
+const nodePinningModal = ref<ModalState | null>(null);
+
+function updateChangedFieldsKeys(key: string) {
+	changedFieldsKeys.value.push(key);
+}
+
+function showFieldIssues(fieldKey: string) {
+	return changedFieldsKeys.value.includes(fieldKey);
+}
+</script>
+
+<template>
+	<div :class="[$style.panelBlock, { [$style.hidden]: !showConfig }]">
+		<div :class="$style.panelIntro">
+			{{ locale.baseText('testDefinition.edit.step.intro') }}
+		</div>
+		<BlockArrow :class="$style.introArrow" />
+		<!-- Select Executions -->
+		<EvaluationStep
+			:class="$style.step"
+			:title="
+				locale.baseText('testDefinition.edit.step.executions', {
+					adjustToNumber: tagUsageCount,
+				})
+			"
+			:description="locale.baseText('testDefinition.edit.step.executions.description')"
+			:issues="getFieldIssues('tags')"
+			:show-issues="showFieldIssues('tags')"
+		>
+			<template #icon><font-awesome-icon icon="history" size="lg" /></template>
+			<template #cardContent>
+				<TagsInput
+					v-model="tags"
+					:class="{ 'has-issues': getFieldIssues('tags') }"
+					:all-tags="allTags"
+					:tags-by-id="tagsById"
+					:is-loading="isLoading"
+					:start-editing="startEditing"
+					:save-changes="saveChanges"
+					:cancel-editing="cancelEditing"
+					:create-tag="createTag"
+					@update:model-value="updateChangedFieldsKeys('tags')"
+				/>
+			</template>
+		</EvaluationStep>
+		<div :class="$style.evaluationArrows">
+			<BlockArrow />
+			<BlockArrow />
+		</div>
+
+		<!-- Mocked Nodes -->
+		<EvaluationStep
+			:class="$style.step"
+			:title="
+				locale.baseText('testDefinition.edit.step.mockedNodes', {
+					adjustToNumber: mockedNodes?.length ?? 0,
+				})
+			"
+			:small="true"
+			:expanded="true"
+			:description="locale.baseText('testDefinition.edit.step.nodes.description')"
+			:issues="getFieldIssues('mockedNodes')"
+			:show-issues="showFieldIssues('mockedNodes')"
+		>
+			<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
+			<template #cardContent>
+				<n8n-button
+					size="small"
+					data-test-id="select-nodes-button"
+					:label="locale.baseText('testDefinition.edit.selectNodes')"
+					type="tertiary"
+					@click="$emit('openPinningModal')"
+				/>
+			</template>
+		</EvaluationStep>
+
+		<!-- Re-run Executions -->
+		<EvaluationStep
+			:class="$style.step"
+			:title="locale.baseText('testDefinition.edit.step.reRunExecutions')"
+			:small="true"
+			:description="locale.baseText('testDefinition.edit.step.reRunExecutions.description')"
+		>
+			<template #icon><font-awesome-icon icon="redo" size="lg" /></template>
+		</EvaluationStep>
+
+		<!-- Compare Executions -->
+		<EvaluationStep
+			:class="$style.step"
+			:title="locale.baseText('testDefinition.edit.step.compareExecutions')"
+			:description="locale.baseText('testDefinition.edit.step.compareExecutions.description')"
+			:issues="getFieldIssues('evaluationWorkflow')"
+			:show-issues="showFieldIssues('evaluationWorkflow')"
+		>
+			<template #icon><font-awesome-icon icon="equals" size="lg" /></template>
+			<template #cardContent>
+				<WorkflowSelector
+					v-model="evaluationWorkflow"
+					:example-pinned-data="examplePinnedData"
+					:class="{ 'has-issues': getFieldIssues('evaluationWorkflow').length > 0 }"
+					:sample-workflow-name="sampleWorkflowName"
+					@update:model-value="updateChangedFieldsKeys('evaluationWorkflow')"
+				/>
+			</template>
+		</EvaluationStep>
+
+		<!-- Metrics -->
+		<EvaluationStep
+			:class="$style.step"
+			:title="locale.baseText('testDefinition.edit.step.metrics')"
+			:description="locale.baseText('testDefinition.edit.step.metrics.description')"
+			:issues="getFieldIssues('metrics')"
+			:show-issues="showFieldIssues('metrics')"
+		>
+			<template #icon><font-awesome-icon icon="chart-bar" size="lg" /></template>
+			<template #cardContent>
+				<MetricsInput
+					v-model="metrics"
+					:class="{ 'has-issues': getFieldIssues('metrics').length > 0 }"
+					@delete-metric="(metric) => emit('deleteMetric', metric)"
+					@update:model-value="updateChangedFieldsKeys('metrics')"
+				/>
+			</template>
+		</EvaluationStep>
+
+		<Modal ref="nodePinningModal" width="80vw" height="85vh" :name="NODE_PINNING_MODAL_KEY">
+			<template #header>
+				<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
+					locale.baseText('testDefinition.edit.selectNodes')
+				}}</N8nHeading>
+			</template>
+			<template #content>
+				<NodesPinning v-model="mockedNodes" data-test-id="nodes-pinning-modal" />
+			</template>
+		</Modal>
+	</div>
+</template>
+
+<style module lang="scss">
+.panelBlock {
+	width: var(--evaluation-edit-panel-width);
+	display: grid;
+	height: 100%;
+	overflow-y: auto;
+	flex-shrink: 0;
+	padding-bottom: var(--spacing-l);
+	margin-left: var(--spacing-2xl);
+	transition: width 0.2s ease;
+
+	&.hidden {
+		margin-left: 0;
+		width: 0;
+		overflow: hidden;
+		flex-shrink: 1;
+	}
+
+	.noRuns & {
+		overflow-y: initial;
+	}
+}
+
+.panelIntro {
+	font-size: var(--font-size-m);
+	color: var(--color-text-dark);
+
+	justify-self: center;
+	position: relative;
+	display: block;
+}
+
+.step {
+	position: relative;
+
+	&:not(:first-child) {
+		margin-top: var(--spacing-m);
+	}
+}
+
+.introArrow {
+	--arrow-height: 1.5rem;
+	margin-bottom: -1rem;
+	justify-self: center;
+}
+
+.evaluationArrows {
+	--arrow-height: 23rem;
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	max-width: 80%;
+	margin: 0 auto;
+	margin-bottom: -100%;
+	z-index: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/HeaderSection.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/HeaderSection.vue
new file mode 100644
index 0000000000..01b46fc216
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/HeaderSection.vue
@@ -0,0 +1,134 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import TestNameInput from '@/components/TestDefinition/EditDefinition/TestNameInput.vue';
+import DescriptionInput from '@/components/TestDefinition/EditDefinition/DescriptionInput.vue';
+import type { EditableField, EditableFormState } from '@/components/TestDefinition/types';
+import { computed } from 'vue';
+
+const props = defineProps<{
+	hasRuns: boolean;
+	isSaving: boolean;
+	showConfig: boolean;
+	runTestEnabled: boolean;
+	startEditing: <T extends keyof EditableFormState>(field: T) => void;
+	saveChanges: <T extends keyof EditableFormState>(field: T) => void;
+	handleKeydown: <T extends keyof EditableFormState>(event: KeyboardEvent, field: T) => void;
+	onSaveTest: () => Promise<void>;
+	runTest: () => Promise<void>;
+	toggleConfig: () => void;
+	getFieldIssues: (key: string) => Array<{ field: string; message: string }>;
+}>();
+
+const name = defineModel<EditableField<string>>('name', { required: true });
+const description = defineModel<EditableField<string>>('description', { required: true });
+
+const locale = useI18n();
+
+const showSavingIndicator = computed(() => {
+	return !name.value.isEditing;
+});
+</script>
+
+<template>
+	<div :class="$style.headerSection">
+		<div :class="$style.headerMeta">
+			<div :class="$style.name">
+				<n8n-icon-button
+					:class="$style.backButton"
+					icon="arrow-left"
+					type="tertiary"
+					:title="locale.baseText('testDefinition.edit.backButtonTitle')"
+					@click="$router.back()"
+				/>
+				<TestNameInput
+					v-model="name"
+					:class="{ 'has-issues': getFieldIssues('name').length > 0 }"
+					:start-editing="startEditing"
+					:save-changes="saveChanges"
+					:handle-keydown="handleKeydown"
+				/>
+				<div v-if="showSavingIndicator" :class="$style.lastSaved">
+					<template v-if="isSaving">
+						{{ locale.baseText('testDefinition.edit.saving') }}
+					</template>
+					<template v-else> {{ locale.baseText('testDefinition.edit.saved') }} </template>
+				</div>
+			</div>
+			<DescriptionInput
+				v-model="description"
+				:start-editing="startEditing"
+				:save-changes="saveChanges"
+				:handle-keydown="handleKeydown"
+				:class="$style.descriptionInput"
+			/>
+		</div>
+		<div :class="$style.controls">
+			<N8nButton
+				v-if="props.hasRuns"
+				size="small"
+				:icon="showConfig ? 'eye-slash' : 'eye'"
+				data-test-id="toggle-config-button"
+				:label="
+					showConfig
+						? locale.baseText('testDefinition.edit.hideConfig')
+						: locale.baseText('testDefinition.edit.showConfig')
+				"
+				type="tertiary"
+				@click="toggleConfig"
+			/>
+			<N8nTooltip :disabled="runTestEnabled" :placement="'left'">
+				<N8nButton
+					:disabled="!runTestEnabled"
+					:class="$style.runTestButton"
+					size="small"
+					data-test-id="run-test-button"
+					:label="locale.baseText('testDefinition.runTest')"
+					type="primary"
+					@click="runTest"
+				/>
+				<template #content>
+					<slot name="runTestTooltip" />
+				</template>
+			</N8nTooltip>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.headerSection {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	background-color: var(--color-background-light);
+	width: 100%;
+}
+
+.headerMeta {
+	max-width: 50%;
+}
+
+.name {
+	display: flex;
+	align-items: center;
+	justify-content: flex-start;
+
+	.lastSaved {
+		font-size: var(--font-size-s);
+		color: var(--color-text-light);
+	}
+}
+
+.descriptionInput {
+	margin-top: var(--spacing-2xs);
+}
+
+.controls {
+	display: flex;
+	gap: var(--spacing-s);
+}
+.backButton {
+	--button-font-color: var(--color-text-light);
+	border: none;
+	padding-left: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue
new file mode 100644
index 0000000000..1e1b62330a
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/sections/RunsSection.vue
@@ -0,0 +1,52 @@
+<script setup lang="ts">
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import type { AppliedThemeOption } from '@/Interface';
+import MetricsChart from '@/components/TestDefinition/ListRuns/MetricsChart.vue';
+import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
+
+defineProps<{
+	runs: TestRunRecord[];
+	testId: string;
+	appliedTheme: AppliedThemeOption;
+}>();
+
+const emit = defineEmits<{
+	deleteRuns: [runs: TestRunRecord[]];
+}>();
+
+const selectedMetric = defineModel<string>('selectedMetric', { required: true });
+
+function onDeleteRuns(toDelete: TestRunRecord[]) {
+	emit('deleteRuns', toDelete);
+}
+</script>
+
+<template>
+	<div :class="$style.runs">
+		<!-- Metrics Chart -->
+		<MetricsChart v-model:selectedMetric="selectedMetric" :runs="runs" :theme="appliedTheme" />
+		<!-- Past Runs Table -->
+		<TestRunsTable
+			:class="$style.runsTable"
+			:runs="runs"
+			:selectable="true"
+			data-test-id="past-runs-table"
+			@delete-runs="onDeleteRuns"
+		/>
+	</div>
+</template>
+
+<style module lang="scss">
+.runs {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-m);
+	flex: 1;
+	padding-top: var(--spacing-3xs);
+	overflow: auto;
+
+	@media (min-height: 56rem) {
+		margin-top: var(--spacing-2xl);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts b/packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
new file mode 100644
index 0000000000..e4d0fd4c29
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
@@ -0,0 +1,143 @@
+import { waitFor } from '@testing-library/vue';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import NodesPinning from '../NodesPinning.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+import {
+	createTestNode,
+	createTestWorkflow,
+	createTestWorkflowObject,
+	mockNodeTypeDescription,
+} from '@/__tests__/mocks';
+import { mockedStore } from '@/__tests__/utils';
+import { NodeConnectionType } from 'n8n-workflow';
+import { SET_NODE_TYPE } from '@/constants';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	return {
+		useRouter: () => ({
+			push,
+		}),
+		useRoute: () => ({
+			params: {
+				name: 'test-workflow',
+				testId: 'test-123',
+			},
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+const renderComponent = createComponentRenderer(NodesPinning, {
+	props: {
+		modelValue: [{ id: '1', name: 'Node 1' }],
+	},
+	global: {
+		plugins: [createTestingPinia()],
+	},
+});
+
+describe('NodesPinning', () => {
+	const workflowsStore = mockedStore(useWorkflowsStore);
+	const nodes = [
+		createTestNode({ id: '1', name: 'Node 1', type: SET_NODE_TYPE }),
+		createTestNode({ id: '2', name: 'Node 2', type: SET_NODE_TYPE }),
+	];
+
+	const nodeTypesStore = mockedStore(useNodeTypesStore);
+	const nodeTypeDescription = mockNodeTypeDescription({
+		name: SET_NODE_TYPE,
+		inputs: [NodeConnectionType.Main],
+		outputs: [NodeConnectionType.Main],
+	});
+	nodeTypesStore.nodeTypes = {
+		node: { 1: nodeTypeDescription },
+	};
+
+	nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+	const workflow = createTestWorkflow({
+		id: 'test-workflow',
+		name: 'Test Workflow',
+		nodes,
+		connections: {},
+	});
+
+	const workflowObject = createTestWorkflowObject(workflow);
+
+	workflowsStore.getWorkflowById = vi.fn().mockReturnValue(workflow);
+	workflowsStore.getCurrentWorkflow = vi.fn().mockReturnValue(workflowObject);
+	beforeEach(() => {
+		const pinia = createPinia();
+		setActivePinia(pinia);
+
+		nodeTypesStore.setNodeTypes([nodeTypeDescription]);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render workflow nodes', async () => {
+		const { container } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelectorAll('.vue-flow__node')).toHaveLength(2);
+		});
+
+		expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		expect(container.querySelector('[data-node-name="Node 2"]')).toBeInTheDocument();
+	});
+
+	it('should update node classes when pinning/unpinning nodes', async () => {
+		const { container } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		});
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toHaveClass(
+				'canvasNode pinnedNode',
+			);
+			expect(container.querySelector('[data-node-name="Node 2"]')).toHaveClass(
+				'canvasNode notPinnedNode',
+			);
+		});
+	});
+
+	it('should emit update:modelValue when pinning nodes', async () => {
+		const { container, emitted, getAllByTestId } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		});
+		const pinButton = getAllByTestId('node-pin-button')[1];
+		pinButton?.click();
+
+		expect(emitted('update:modelValue')).toBeTruthy();
+		expect(emitted('update:modelValue')[0]).toEqual([
+			[
+				{ id: '1', name: 'Node 1' },
+				{ id: '2', name: 'Node 2' },
+			],
+		]);
+	});
+	it('should emit update:modelValue when unpinning nodes', async () => {
+		const { container, emitted, getAllByTestId } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		});
+		const pinButton = getAllByTestId('node-pin-button')[0];
+		pinButton?.click();
+
+		expect(emitted('update:modelValue')).toBeTruthy();
+		expect(emitted('update:modelValue')[0]).toEqual([[]]);
+	});
+});
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
index 9f507c327f..d2f022777b 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
@@ -11,19 +11,28 @@ const locale = useI18n();
 		<div :class="$style.header">
 			<h1>{{ locale.baseText('testDefinition.list.tests') }}</h1>
 		</div>
-		<n8n-action-box
-			:description="locale.baseText('testDefinition.list.actionDescription')"
-			:button-text="locale.baseText('testDefinition.list.actionButton')"
-			@click:button="$emit('create-test')"
-		/>
+		<div :class="$style.content">
+			<n8n-action-box
+				:class="$style.actionBox"
+				:heading="locale.baseText('testDefinition.list.evaluations')"
+				:description="locale.baseText('testDefinition.list.actionDescription')"
+				:button-text="locale.baseText('testDefinition.list.actionButton')"
+				@click:button="$emit('create-test')"
+			/>
+			<n8n-action-box
+				:class="$style.actionBox"
+				:heading="locale.baseText('testDefinition.list.unitTests.title')"
+				:description="locale.baseText('testDefinition.list.unitTests.description')"
+				:button-text="locale.baseText('testDefinition.list.unitTests.cta')"
+				button-type="tertiary"
+			/>
+		</div>
 	</div>
 </template>
 
 <style module lang="scss">
 .container {
-	max-width: 44rem;
-	margin: var(--spacing-4xl) auto 0;
-	gap: var(--spacing-l);
+	max-width: 75rem;
 }
 .header {
 	display: flex;
@@ -37,4 +46,12 @@ const locale = useI18n();
 		margin: 0;
 	}
 }
+.content {
+	width: 100%;
+	display: flex;
+	gap: var(--spacing-m);
+}
+.actionBox {
+	flex: 1;
+}
 </style>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
index a4e5a4d4ac..0b702ce2f7 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
@@ -1,49 +1,25 @@
 <script setup lang="ts">
-import type { TestListItem } from '@/components/TestDefinition/types';
+import type { TestListItem, TestItemAction } from '@/components/TestDefinition/types';
 import TimeAgo from '@/components/TimeAgo.vue';
 import { useI18n } from '@/composables/useI18n';
 import n8nIconButton from 'n8n-design-system/components/N8nIconButton';
+import { computed } from 'vue';
 
 export interface TestItemProps {
 	test: TestListItem;
+	actions: TestItemAction[];
 }
 
 const props = defineProps<TestItemProps>();
 const locale = useI18n();
 
-const emit = defineEmits<{
-	'run-test': [testId: string];
+defineEmits<{
 	'view-details': [testId: string];
-	'edit-test': [testId: string];
-	'delete-test': [testId: string];
 }>();
 
-const actions = [
-	{
-		icon: 'play',
-		id: 'run',
-		event: () => emit('run-test', props.test.id),
-		tooltip: locale.baseText('testDefinition.runTest'),
-	},
-	{
-		icon: 'list',
-		id: 'view',
-		event: () => emit('view-details', props.test.id),
-		tooltip: locale.baseText('testDefinition.viewDetails'),
-	},
-	{
-		icon: 'pen',
-		id: 'edit',
-		event: () => emit('edit-test', props.test.id),
-		tooltip: locale.baseText('testDefinition.editTest'),
-	},
-	{
-		icon: 'trash',
-		id: 'delete',
-		event: () => emit('delete-test', props.test.id),
-		tooltip: locale.baseText('testDefinition.deleteTest'),
-	},
-];
+const visibleActions = computed(() =>
+	props.actions.filter((action) => action.show?.(props.test.id) ?? true),
+);
 </script>
 
 <template>
@@ -85,17 +61,21 @@ const actions = [
 		</div>
 
 		<div :class="$style.actions">
-			<n8n-tooltip v-for="action in actions" :key="action.icon" placement="top" :show-after="1000">
-				<template #content>
-					{{ action.tooltip }}
-				</template>
+			<n8n-tooltip
+				v-for="action in visibleActions"
+				:key="action.icon"
+				placement="top"
+				:show-after="1000"
+				:content="action.tooltip(test.id)"
+			>
 				<component
 					:is="n8nIconButton"
 					:icon="action.icon"
 					:data-test-id="`${action.id}-test-button-${test.id}`"
 					type="tertiary"
 					size="mini"
-					@click.stop="action.event"
+					:disabled="action?.disabled ? action.disabled(test.id) : false"
+					@click.stop="action.event(test.id)"
 				/>
 			</n8n-tooltip>
 		</div>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
index d744b1a31b..6b615d30f1 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestsList.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { useI18n } from '@/composables/useI18n';
 import TestItem from './TestItem.vue';
-import type { TestListItem } from '@/components/TestDefinition/types';
+import type { TestListItem, TestItemAction } from '@/components/TestDefinition/types';
 export interface TestListProps {
 	tests: TestListItem[];
+	actions: TestItemAction[];
 }
 
-defineEmits<{ 'create-test': [] }>();
+defineEmits<{ 'create-test': []; 'view-details': [testId: string] }>();
 defineProps<TestListProps>();
 const locale = useI18n();
 </script>
@@ -19,7 +20,13 @@ const locale = useI18n();
 				@click="$emit('create-test')"
 			/>
 		</div>
-		<TestItem v-for="test in tests" :key="test.id" :test="test" v-bind="$attrs" />
+		<TestItem
+			v-for="test in tests"
+			:key="test.id"
+			:test="test"
+			:actions="actions"
+			@view-details="$emit('view-details', test.id)"
+		/>
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue b/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
index cd2e58f8de..4e3502dc6b 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
@@ -45,11 +45,11 @@ watchEffect(() => {
 <template>
 	<div v-if="availableMetrics.length > 0" :class="$style.metricsChartContainer">
 		<div :class="$style.chartHeader">
-			<N8nText>{{ locale.baseText('testDefinition.listRuns.metricsOverTime') }}</N8nText>
 			<N8nSelect
 				:model-value="selectedMetric"
 				:class="$style.metricSelect"
 				placeholder="Select metric"
+				size="small"
 				@update:model-value="emit('update:selectedMetric', $event)"
 			>
 				<N8nOption
@@ -59,6 +59,7 @@ watchEffect(() => {
 					:value="metric"
 				/>
 			</N8nSelect>
+			<N8nText>{{ locale.baseText('testDefinition.listRuns.metricsOverTime') }}</N8nText>
 		</div>
 		<div :class="$style.chartWrapper">
 			<Line
@@ -74,17 +75,17 @@ watchEffect(() => {
 
 <style lang="scss" module>
 .metricsChartContainer {
-	margin: var(--spacing-m) 0;
 	background: var(--color-background-xlight);
 	border-radius: var(--border-radius-large);
 	box-shadow: var(--box-shadow-base);
 
 	.chartHeader {
 		display: flex;
-		justify-content: space-between;
+		justify-content: flex-start;
 		align-items: center;
+		gap: var(--spacing-s);
 		margin-bottom: var(--spacing-m);
-		padding: var(--spacing-s);
+		padding: var(--spacing-xs) var(--spacing-s);
 		border-bottom: 1px solid var(--color-foreground-base);
 	}
 
@@ -100,7 +101,7 @@ watchEffect(() => {
 
 	.chartWrapper {
 		position: relative;
-		height: 400px;
+		height: var(--metrics-chart-height, 400px);
 		width: 100%;
 		padding: var(--spacing-s);
 	}
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue b/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
index 7fb1b19139..f5222dccbb 100644
--- a/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
+++ b/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import type { TestRunRecord } from '@/api/testDefinition.ee';
 import { computed, ref } from 'vue';
-import type { TestDefinitionTableColumn } from '../shared/TestDefinitionTable.vue';
-import TestDefinitionTable from '../shared/TestDefinitionTable.vue';
+import type { TestTableColumn } from '../shared/TestTableBase.vue';
+import TestTableBase from '../shared/TestTableBase.vue';
 import { convertToDisplayDate } from '@/utils/typesUtils';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
@@ -29,7 +29,7 @@ const metrics = computed(() => {
 	}, [] as string[]);
 });
 
-const columns = computed((): Array<TestDefinitionTableColumn<TestRunRecord>> => {
+const columns = computed((): Array<TestTableColumn<TestRunRecord>> => {
 	return [
 		{
 			prop: 'runNumber',
@@ -49,6 +49,7 @@ const columns = computed((): Array<TestDefinitionTableColumn<TestRunRecord>> =>
 				{ text: locale.baseText('testDefinition.listRuns.status.running'), value: 'running' },
 				{ text: locale.baseText('testDefinition.listRuns.status.completed'), value: 'completed' },
 				{ text: locale.baseText('testDefinition.listRuns.status.error'), value: 'error' },
+				{ text: locale.baseText('testDefinition.listRuns.status.cancelled'), value: 'cancelled' },
 			],
 			filterMethod: (value: string, row: TestRunRecord) => row.status === value,
 		},
@@ -57,6 +58,8 @@ const columns = computed((): Array<TestDefinitionTableColumn<TestRunRecord>> =>
 			label: locale.baseText('testDefinition.listRuns.runDate'),
 			sortable: true,
 			formatter: (row: TestRunRecord) => convertToDisplayDate(new Date(row.runAt).getTime()),
+			sortMethod: (a: TestRunRecord, b: TestRunRecord) =>
+				new Date(a.runAt).getTime() - new Date(b.runAt).getTime(),
 		},
 
 		...metrics.value.map((metric) => ({
@@ -73,20 +76,23 @@ function onSelectionChange(runs: TestRunRecord[]) {
 	emit('selectionChange', runs);
 }
 
-function deleteRuns() {
+async function deleteRuns() {
 	emit('deleteRuns', selectedRows.value);
 }
 </script>
 
 <template>
 	<div :class="$style.container">
-		<div :class="$style.footer">
+		<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
+			locale.baseText('testDefinition.edit.pastRuns')
+		}}</N8nHeading>
+		<div :class="$style.header">
 			<n8n-button
 				v-show="selectedRows.length > 0"
 				type="danger"
 				:class="$style.activator"
-				:size="'medium'"
-				:icon="'trash'"
+				size="medium"
+				icon="trash"
 				data-test-id="delete-runs-button"
 				@click="deleteRuns"
 			>
@@ -97,7 +103,7 @@ function deleteRuns() {
 				}}
 			</n8n-button>
 		</div>
-		<TestDefinitionTable
+		<TestTableBase
 			:data="runs"
 			:columns="columns"
 			selectable
@@ -115,5 +121,6 @@ function deleteRuns() {
 	display: flex;
 	flex-direction: column;
 	gap: 10px;
+	flex: 1;
 }
 </style>
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts b/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
index 9a792cc8fc..2e1faa2e58 100644
--- a/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
@@ -79,7 +79,7 @@ export function useMetricsChart(mode: AppliedThemeOption = 'light') {
 						color: colors.text.primary,
 					},
 					title: {
-						display: true,
+						display: false,
 						text: params.metric,
 						padding: 16,
 						color: colors.text.primary,
@@ -90,14 +90,11 @@ export function useMetricsChart(mode: AppliedThemeOption = 'light') {
 						display: false,
 					},
 					ticks: {
-						maxRotation: 45,
-						minRotation: 45,
-						color: colors.text.primary,
+						display: false,
 					},
 					title: {
-						display: true,
 						text: params.xTitle,
-						padding: 16,
+						padding: 1,
 						color: colors.text.primary,
 					},
 				},
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
index 1b5fee84a0..fcfcb80c20 100644
--- a/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
@@ -26,7 +26,11 @@ export function useTestDefinitionForm() {
 			tempValue: [],
 			isEditing: false,
 		},
-		description: '',
+		description: {
+			value: '',
+			tempValue: '',
+			isEditing: false,
+		},
 		evaluationWorkflow: {
 			mode: 'list',
 			value: '',
@@ -37,17 +41,16 @@ export function useTestDefinitionForm() {
 	});
 
 	const isSaving = ref(false);
-	const fieldsIssues = ref<Array<{ field: string; message: string }>>([]);
 	const fields = ref<FormRefs>({} as FormRefs);
 
-	// A computed mapping of editable fields to their states
-	// This ensures TS knows the exact type of each field.
 	const editableFields: ComputedRef<{
 		name: EditableField<string>;
 		tags: EditableField<string[]>;
+		description: EditableField<string>;
 	}> = computed(() => ({
 		name: state.value.name,
 		tags: state.value.tags,
+		description: state.value.description,
 	}));
 
 	/**
@@ -61,7 +64,11 @@ export function useTestDefinitionForm() {
 			if (testDefinition) {
 				const metrics = await evaluationsStore.fetchMetrics(testId);
 
-				state.value.description = testDefinition.description ?? '';
+				state.value.description = {
+					value: testDefinition.description ?? '',
+					isEditing: false,
+					tempValue: '',
+				};
 				state.value.name = {
 					value: testDefinition.name ?? '',
 					isEditing: false,
@@ -89,13 +96,12 @@ export function useTestDefinitionForm() {
 		if (isSaving.value) return;
 
 		isSaving.value = true;
-		fieldsIssues.value = [];
 
 		try {
 			const params = {
 				name: state.value.name.value,
 				workflowId,
-				description: state.value.description,
+				description: state.value.description.value,
 			};
 			return await evaluationsStore.create(params);
 		} finally {
@@ -125,15 +131,15 @@ export function useTestDefinitionForm() {
 				});
 			}
 		});
-
+		isSaving.value = true;
 		await Promise.all(promises);
+		isSaving.value = false;
 	};
 
 	const updateTest = async (testId: string) => {
 		if (isSaving.value) return;
 
 		isSaving.value = true;
-		fieldsIssues.value = [];
 
 		try {
 			if (!testId) {
@@ -142,7 +148,7 @@ export function useTestDefinitionForm() {
 
 			const params: UpdateTestDefinitionParams = {
 				name: state.value.name.value,
-				description: state.value.description,
+				description: state.value.description.value,
 			};
 
 			if (state.value.evaluationWorkflow.value) {
@@ -157,7 +163,8 @@ export function useTestDefinitionForm() {
 				params.mockedNodes = state.value.mockedNodes;
 			}
 
-			return await evaluationsStore.update({ ...params, id: testId });
+			const response = await evaluationsStore.update({ ...params, id: testId });
+			return response;
 		} finally {
 			isSaving.value = false;
 		}
@@ -220,7 +227,6 @@ export function useTestDefinitionForm() {
 		state,
 		fields,
 		isSaving: computed(() => isSaving.value),
-		fieldsIssues: computed(() => fieldsIssues.value),
 		deleteMetric,
 		updateMetrics,
 		loadTestData,
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue b/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
index 208e1d5d0f..70a20e27ec 100644
--- a/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
+++ b/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts" generic="T">
 import { useI18n } from '@/composables/useI18n';
-import type { TestDefinitionTableColumn } from './TestDefinitionTable.vue';
+import type { TestTableColumn } from './TestTableBase.vue';
 import { useRouter } from 'vue-router';
 
 defineProps<{
-	column: TestDefinitionTableColumn<T>;
+	column: TestTableColumn<T>;
 	row: T;
 }>();
 
@@ -23,26 +23,30 @@ function hasStatus(row: unknown): row is WithStatus {
 }
 
 const statusThemeMap: Record<string, string> = {
-	new: 'info',
+	new: 'default',
 	running: 'warning',
+	evaluation_running: 'warning',
 	completed: 'success',
 	error: 'danger',
 	success: 'success',
+	cancelled: 'default',
 };
 
 const statusLabelMap: Record<string, string> = {
 	new: locale.baseText('testDefinition.listRuns.status.new'),
 	running: locale.baseText('testDefinition.listRuns.status.running'),
+	evaluation_running: locale.baseText('testDefinition.listRuns.status.evaluating'),
 	completed: locale.baseText('testDefinition.listRuns.status.completed'),
 	error: locale.baseText('testDefinition.listRuns.status.error'),
 	success: locale.baseText('testDefinition.listRuns.status.success'),
+	cancelled: locale.baseText('testDefinition.listRuns.status.cancelled'),
 };
 
 function hasProperty(row: unknown, prop: string): row is Record<string, unknown> {
 	return typeof row === 'object' && row !== null && prop in row;
 }
 
-const getCellContent = (column: TestDefinitionTableColumn<T>, row: T) => {
+const getCellContent = (column: TestTableColumn<T>, row: T) => {
 	if (column.formatter) {
 		return column.formatter(row);
 	}
@@ -51,11 +55,11 @@ const getCellContent = (column: TestDefinitionTableColumn<T>, row: T) => {
 </script>
 
 <template>
-	<div v-if="column.route">
-		<a v-if="column.openInNewTab" :href="router.resolve(column.route(row)).href" target="_blank">
+	<div v-if="column.route?.(row)">
+		<a v-if="column.openInNewTab" :href="router.resolve(column.route(row)!).href" target="_blank">
 			{{ getCellContent(column, row) }}
 		</a>
-		<router-link v-else :to="column.route(row)">
+		<router-link v-else :to="column.route(row)!">
 			{{ getCellContent(column, row) }}
 		</router-link>
 	</div>
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue b/packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue
deleted file mode 100644
index b67d04b70b..0000000000
--- a/packages/editor-ui/src/components/TestDefinition/shared/TestDefinitionTable.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-<script setup lang="ts" generic="T">
-import type { RouteLocationRaw } from 'vue-router';
-import TableCell from './TableCell.vue';
-import { ElTable, ElTableColumn } from 'element-plus';
-import { ref } from 'vue';
-import type { TableInstance } from 'element-plus';
-
-/**
- * A reusable table component for displaying test definition data
- * @template T - The type of data being displayed in the table rows
- */
-
-/**
- * Configuration for a table column
- * @template TRow - The type of data in each table row
- */
-export type TestDefinitionTableColumn<TRow> = {
-	prop: string;
-	label: string;
-	width?: number;
-	sortable?: boolean;
-	filters?: Array<{ text: string; value: string }>;
-	filterMethod?: (value: string, row: TRow) => boolean;
-	route?: (row: TRow) => RouteLocationRaw;
-	openInNewTab?: boolean;
-	formatter?: (row: TRow) => string;
-};
-
-withDefaults(
-	defineProps<{
-		data: T[];
-		columns: Array<TestDefinitionTableColumn<T>>;
-		showControls?: boolean;
-		defaultSort?: { prop: string; order: 'ascending' | 'descending' };
-		selectable?: boolean;
-		selectableFilter?: (row: T) => boolean;
-	}>(),
-	{
-		defaultSort: () => ({ prop: 'date', order: 'ascending' }),
-		selectable: false,
-		selectableFilter: () => true,
-	},
-);
-
-const tableRef = ref<TableInstance>();
-const selectedRows = ref<T[]>([]);
-
-const emit = defineEmits<{
-	rowClick: [row: T];
-	selectionChange: [rows: T[]];
-}>();
-
-const handleSelectionChange = (rows: T[]) => {
-	selectedRows.value = rows;
-	emit('selectionChange', rows);
-};
-</script>
-
-<template>
-	<ElTable
-		ref="tableRef"
-		:default-sort="defaultSort"
-		:data="data"
-		style="width: 100%"
-		:border="true"
-		max-height="800"
-		resizable
-		@selection-change="handleSelectionChange"
-	>
-		<ElTableColumn
-			v-if="selectable"
-			type="selection"
-			:selectable="selectableFilter"
-			width="55"
-			data-test-id="table-column-select"
-		/>
-		<ElTableColumn
-			v-for="column in columns"
-			:key="column.prop"
-			v-bind="column"
-			style="width: 100%"
-			:resizable="true"
-			data-test-id="table-column"
-		>
-			<template #default="{ row }">
-				<TableCell
-					:column="column"
-					:row="row"
-					@click="$emit('rowClick', row)"
-					data-test-id="table-cell"
-				/>
-			</template>
-		</ElTableColumn>
-	</ElTable>
-</template>
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue b/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
new file mode 100644
index 0000000000..ae0d9eea11
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
@@ -0,0 +1,152 @@
+<script setup lang="ts" generic="T extends object">
+import type { RouteLocationRaw } from 'vue-router';
+import TableCell from './TableCell.vue';
+import { ElTable, ElTableColumn } from 'element-plus';
+import { ref, watch, nextTick, onMounted, onUnmounted } from 'vue';
+import type { TableInstance } from 'element-plus';
+import { isEqual } from 'lodash-es';
+/**
+ * A reusable table component for displaying evaluation results data
+ * @template T - The type of data being displayed in the table rows
+ */
+
+/**
+ * Configuration for a table column
+ * @template TRow - The type of data in each table row
+ */
+export type TestTableColumn<TRow> = {
+	prop: string;
+	label: string;
+	width?: number;
+	sortable?: boolean;
+	filters?: Array<{ text: string; value: string }>;
+	filterMethod?: (value: string, row: TRow) => boolean;
+	route?: (row: TRow) => RouteLocationRaw | undefined;
+	sortMethod?: (a: TRow, b: TRow) => number;
+	openInNewTab?: boolean;
+	formatter?: (row: TRow) => string;
+};
+
+type TableRow = T & { id: string };
+
+const MIN_TABLE_HEIGHT = 350;
+const MAX_TABLE_HEIGHT = 1400;
+const props = withDefaults(
+	defineProps<{
+		data: TableRow[];
+		columns: Array<TestTableColumn<TableRow>>;
+		showControls?: boolean;
+		defaultSort?: { prop: string; order: 'ascending' | 'descending' };
+		selectable?: boolean;
+		selectableFilter?: (row: TableRow) => boolean;
+	}>(),
+	{
+		defaultSort: () => ({ prop: 'date', order: 'descending' }),
+		selectable: false,
+		selectableFilter: () => true,
+	},
+);
+
+const tableRef = ref<TableInstance>();
+const selectedRows = ref<TableRow[]>([]);
+const localData = ref<TableRow[]>([]);
+const tableHeight = ref<string>('100%');
+const emit = defineEmits<{
+	rowClick: [row: TableRow];
+	selectionChange: [rows: TableRow[]];
+}>();
+
+// Watch for changes to the data prop and update the local data state
+// This preserves selected rows when the data changes by:
+// 1. Storing current selection IDs
+// 2. Updating local data with new data
+// 3. Re-applying default sort
+// 4. Re-selecting previously selected rows that still exist in new data
+watch(
+	() => props.data,
+	async (newData) => {
+		if (!isEqual(localData.value, newData)) {
+			const currentSelectionIds = selectedRows.value.map((row) => row.id);
+
+			localData.value = newData;
+			await nextTick();
+
+			tableRef.value?.sort(props.defaultSort.prop, props.defaultSort.order);
+			currentSelectionIds.forEach((id) => {
+				const row = localData.value.find((r) => r.id === id);
+				if (row) {
+					tableRef.value?.toggleRowSelection(row, true);
+				}
+			});
+		}
+	},
+	{ immediate: true, deep: true },
+);
+
+const handleSelectionChange = (rows: TableRow[]) => {
+	selectedRows.value = rows;
+	emit('selectionChange', rows);
+};
+
+const computeTableHeight = () => {
+	const containerHeight = tableRef.value?.$el?.parentElement?.clientHeight ?? 600;
+	const height = Math.min(Math.max(containerHeight, MIN_TABLE_HEIGHT), MAX_TABLE_HEIGHT);
+	tableHeight.value = `${height - 100}px`;
+};
+
+onMounted(() => {
+	computeTableHeight();
+
+	window.addEventListener('resize', computeTableHeight);
+});
+
+onUnmounted(() => {
+	window.removeEventListener('resize', computeTableHeight);
+});
+</script>
+
+<template>
+	<ElTable
+		ref="tableRef"
+		:class="$style.table"
+		:default-sort="defaultSort"
+		:data="localData"
+		:border="true"
+		:max-height="tableHeight"
+		resizable
+		@selection-change="handleSelectionChange"
+		@vue:mounted="computeTableHeight"
+	>
+		<ElTableColumn
+			v-if="selectable"
+			type="selection"
+			:selectable="selectableFilter"
+			data-test-id="table-column-select"
+		/>
+		<ElTableColumn
+			v-for="column in columns"
+			:key="column.prop"
+			v-bind="column"
+			:resizable="true"
+			data-test-id="table-column"
+		>
+			<template #default="{ row }">
+				<TableCell
+					:key="row.status"
+					:column="column"
+					:row="row"
+					data-test-id="table-cell"
+					@click="$emit('rowClick', row)"
+				/>
+			</template>
+		</ElTableColumn>
+	</ElTable>
+</template>
+
+<style module lang="scss">
+.table {
+	:global(.el-table__cell) {
+		padding: var(--spacing-3xs) 0;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
index 98d67980d0..05f9d83038 100644
--- a/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
+++ b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
@@ -42,7 +42,7 @@ describe('useTestDefinitionForm', () => {
 	it('should initialize with default props', () => {
 		const { state } = useTestDefinitionForm();
 
-		expect(state.value.description).toBe('');
+		expect(state.value.description.value).toBe('');
 		expect(state.value.name.value).toContain('My Test');
 		expect(state.value.tags.value).toEqual([]);
 		expect(state.value.metrics).toEqual([]);
@@ -70,7 +70,7 @@ describe('useTestDefinitionForm', () => {
 		expect(fetchSpy).toBeCalled();
 		expect(fetchMetricsSpy).toBeCalledWith(TEST_DEF_A.id);
 		expect(state.value.name.value).toEqual(TEST_DEF_A.name);
-		expect(state.value.description).toEqual(TEST_DEF_A.description);
+		expect(state.value.description.value).toEqual(TEST_DEF_A.description);
 		expect(state.value.tags.value).toEqual([TEST_DEF_A.annotationTagId]);
 		expect(state.value.evaluationWorkflow.value).toEqual(TEST_DEF_A.evaluationWorkflowId);
 		expect(state.value.metrics).toEqual([
@@ -88,7 +88,7 @@ describe('useTestDefinitionForm', () => {
 		await loadTestData('unknown-id');
 		expect(fetchSpy).toBeCalled();
 		// Should remain unchanged since no definition found
-		expect(state.value.description).toBe('');
+		expect(state.value.description.value).toBe('');
 		expect(state.value.name.value).toContain('My Test');
 		expect(state.value.tags.value).toEqual([]);
 		expect(state.value.metrics).toEqual([]);
@@ -112,7 +112,7 @@ describe('useTestDefinitionForm', () => {
 		const createSpy = vi.spyOn(useTestDefinitionStore(), 'create').mockResolvedValue(TEST_DEF_NEW);
 
 		state.value.name.value = TEST_DEF_NEW.name;
-		state.value.description = TEST_DEF_NEW.description ?? '';
+		state.value.description.value = TEST_DEF_NEW.description ?? '';
 
 		const newTest = await createTest('123');
 		expect(createSpy).toBeCalledWith({
@@ -143,7 +143,7 @@ describe('useTestDefinitionForm', () => {
 		const updateSpy = vi.spyOn(useTestDefinitionStore(), 'update').mockResolvedValue(updatedBTest);
 
 		state.value.name.value = TEST_DEF_B.name;
-		state.value.description = TEST_DEF_B.description ?? '';
+		state.value.description.value = TEST_DEF_B.description ?? '';
 
 		const updatedTest = await updateTest(TEST_DEF_A.id);
 		expect(updateSpy).toBeCalledWith({
@@ -166,7 +166,7 @@ describe('useTestDefinitionForm', () => {
 			.mockRejectedValue(new Error('Update Failed'));
 
 		state.value.name.value = 'Test';
-		state.value.description = 'Some description';
+		state.value.description.value = 'Some description';
 
 		await expect(updateTest(TEST_DEF_A.id)).rejects.toThrow('Update Failed');
 		expect(updateSpy).toBeCalled();
diff --git a/packages/editor-ui/src/components/TestDefinition/types.ts b/packages/editor-ui/src/components/TestDefinition/types.ts
index 968b3a2eec..4bc2bc1c3f 100644
--- a/packages/editor-ui/src/components/TestDefinition/types.ts
+++ b/packages/editor-ui/src/components/TestDefinition/types.ts
@@ -7,16 +7,25 @@ export interface EditableField<T = string> {
 	isEditing: boolean;
 }
 
+export interface TestItemAction {
+	icon: string;
+	id: string;
+	event: (testId: string) => void | Promise<void>;
+	tooltip: (testId: string) => string;
+	disabled?: (testId: string) => boolean;
+	show?: (testId: string) => boolean;
+}
+
 export interface EditableFormState {
 	name: EditableField<string>;
 	tags: EditableField<string[]>;
+	description: EditableField<string>;
 }
 
 export interface EvaluationFormState extends EditableFormState {
-	description: string;
 	evaluationWorkflow: INodeParameterResourceLocator;
 	metrics: TestMetricRecord[];
-	mockedNodes: Array<{ name: string }>;
+	mockedNodes: Array<{ name: string; id: string }>;
 }
 
 export interface TestExecution {
@@ -24,6 +33,7 @@ export interface TestExecution {
 	errorRate: number | null;
 	metrics: Record<string, number>;
 	status: TestRunRecord['status'];
+	id: string | null;
 }
 
 export interface TestListItem {
@@ -32,4 +42,5 @@ export interface TestListItem {
 	tagName: string;
 	testCases: number;
 	execution: TestExecution;
+	fieldsIssues?: Array<{ field: string; message: string }>;
 }
diff --git a/packages/editor-ui/src/components/VariablesForm.vue b/packages/editor-ui/src/components/VariablesForm.vue
new file mode 100644
index 0000000000..76e1cd7043
--- /dev/null
+++ b/packages/editor-ui/src/components/VariablesForm.vue
@@ -0,0 +1,132 @@
+<script lang="ts" setup>
+import type { EnvironmentVariable, Rule, RuleGroup } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
+import { computed, ref, reactive, toRaw } from 'vue';
+import { N8nFormInput, N8nButton } from 'n8n-design-system';
+import VariablesUsageBadge from './VariablesUsageBadge.vue';
+
+const props = defineProps<{
+	variable: EnvironmentVariable;
+}>();
+
+const emit = defineEmits<{
+	submit: [variable: EnvironmentVariable];
+	cancel: [];
+}>();
+
+const i18n = useI18n();
+
+const keyValidationRules: Array<Rule | RuleGroup> = [
+	{ name: 'REQUIRED' },
+	{ name: 'MAX_LENGTH', config: { maximum: 50 } },
+	{
+		name: 'MATCH_REGEX',
+		config: {
+			regex: /^[a-zA-Z]/,
+			message: i18n.baseText('variables.editing.key.error.startsWithLetter'),
+		},
+	},
+	{
+		name: 'MATCH_REGEX',
+		config: {
+			regex: /^[a-zA-Z][a-zA-Z0-9_]*$/,
+			message: i18n.baseText('variables.editing.key.error.jsonKey'),
+		},
+	},
+];
+
+const VALUE_MAX_LENGTH = 220;
+const valueValidationRules: Array<Rule | RuleGroup> = [
+	{ name: 'MAX_LENGTH', config: { maximum: VALUE_MAX_LENGTH } },
+];
+const form = reactive<EnvironmentVariable>(structuredClone(toRaw(props.variable)));
+const formValidation = reactive<{
+	key: boolean;
+	value: boolean;
+}>({
+	key: false,
+	value: false,
+});
+const isValid = computed(() => Object.values(formValidation).every((value) => value));
+
+const handleCancel = () => emit('cancel');
+
+const validateOnBlur = ref(false);
+const handleSubmit = () => {
+	validateOnBlur.value = true;
+	if (isValid.value) {
+		emit('submit', form);
+	}
+};
+</script>
+
+<template>
+	<tr>
+		<td class="key-cell">
+			<N8nFormInput
+				v-model="form.key"
+				label=""
+				name="key"
+				data-test-id="variable-row-key-input"
+				:placeholder="i18n.baseText('variables.editing.key.placeholder')"
+				required
+				:validate-on-blur="validateOnBlur"
+				:validation-rules="keyValidationRules"
+				focus-initially
+				@validate="(value: boolean) => (formValidation.key = value)"
+			/>
+		</td>
+
+		<td class="value-cell" width="100%">
+			<N8nFormInput
+				v-model="form.value"
+				class="key-input"
+				label=""
+				name="value"
+				data-test-id="variable-row-value-input"
+				:placeholder="i18n.baseText('variables.editing.value.placeholder')"
+				type="textarea"
+				:autosize="{ minRows: 1, maxRows: 6 }"
+				size="medium"
+				:maxlength="VALUE_MAX_LENGTH"
+				:validate-on-blur="validateOnBlur"
+				:validation-rules="valueValidationRules"
+				@validate="(value: boolean) => (formValidation.value = value)"
+			/>
+		</td>
+
+		<td><VariablesUsageBadge v-if="formValidation.key" :name="form.key" /></td>
+		<td align="right">
+			<N8nButton
+				data-test-id="variable-row-cancel-button"
+				type="tertiary"
+				class="mr-xs"
+				@click="handleCancel"
+			>
+				{{ i18n.baseText('variables.row.button.cancel') }}
+			</N8nButton>
+			<N8nButton data-test-id="variable-row-save-button" type="primary" @click="handleSubmit">
+				{{ i18n.baseText('variables.row.button.save') }}
+			</N8nButton>
+		</td>
+	</tr>
+</template>
+
+<style lang="scss" scoped>
+.key-cell,
+.value-cell {
+	vertical-align: top;
+}
+
+.value-cell {
+	width: 100%;
+	max-width: 50%;
+}
+
+.key-input {
+	:deep(textarea) {
+		min-height: 40px !important;
+		resize: none;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/VariablesRow.test.ts b/packages/editor-ui/src/components/VariablesRow.test.ts
deleted file mode 100644
index 7d7013054f..0000000000
--- a/packages/editor-ui/src/components/VariablesRow.test.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import VariablesRow from './VariablesRow.vue';
-import { fireEvent } from '@testing-library/vue';
-import { setupServer } from '@/__tests__/server';
-import { afterAll, beforeAll } from 'vitest';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/stores/users.store';
-import { createComponentRenderer } from '@/__tests__/render';
-import { createTestingPinia } from '@pinia/testing';
-import { STORES } from '@/constants';
-
-const renderComponent = createComponentRenderer(VariablesRow, {
-	pinia: createTestingPinia({
-		initialState: {
-			[STORES.SETTINGS]: {
-				settings: {
-					enterprise: {
-						variables: true,
-					},
-				},
-			},
-		},
-	}),
-	global: {
-		stubs: ['n8n-tooltip'],
-	},
-});
-
-describe('VariablesRow', () => {
-	let server: ReturnType<typeof setupServer>;
-
-	beforeAll(() => {
-		server = setupServer();
-	});
-
-	beforeEach(async () => {
-		await useSettingsStore().getSettings();
-		await useUsersStore().loginWithCookie();
-	});
-
-	afterAll(() => {
-		server.shutdown();
-	});
-
-	const environmentVariable = {
-		id: '1',
-		name: 'key',
-		value: 'value',
-	};
-
-	it('should render correctly', () => {
-		const wrapper = renderComponent({
-			props: {
-				data: environmentVariable,
-			},
-		});
-
-		expect(wrapper.container.querySelectorAll('td')).toHaveLength(4);
-	});
-
-	it('should show edit and delete buttons on hover', async () => {
-		const wrapper = renderComponent({
-			props: {
-				data: environmentVariable,
-			},
-		});
-
-		await fireEvent.mouseEnter(wrapper.container);
-
-		expect(wrapper.getByTestId('variable-row-edit-button')).toBeVisible();
-		expect(wrapper.getByTestId('variable-row-delete-button')).toBeVisible();
-	});
-
-	it('should show key and value inputs in edit mode', async () => {
-		const wrapper = renderComponent({
-			props: {
-				data: environmentVariable,
-				editing: true,
-			},
-		});
-
-		await fireEvent.mouseEnter(wrapper.container);
-
-		expect(wrapper.getByTestId('variable-row-key-input')).toBeVisible();
-		expect(wrapper.getByTestId('variable-row-key-input').querySelector('input')).toHaveValue(
-			environmentVariable.name,
-		);
-		expect(wrapper.getByTestId('variable-row-value-input')).toBeVisible();
-		expect(wrapper.getByTestId('variable-row-value-input').querySelector('input')).toHaveValue(
-			environmentVariable.value,
-		);
-	});
-
-	it('should show cancel and save buttons in edit mode', async () => {
-		const wrapper = renderComponent({
-			props: {
-				data: environmentVariable,
-				editing: true,
-			},
-		});
-
-		await fireEvent.mouseEnter(wrapper.container);
-
-		expect(wrapper.getByTestId('variable-row-cancel-button')).toBeVisible();
-		expect(wrapper.getByTestId('variable-row-save-button')).toBeVisible();
-	});
-});
diff --git a/packages/editor-ui/src/components/VariablesRow.vue b/packages/editor-ui/src/components/VariablesRow.vue
deleted file mode 100644
index f970bd91ae..0000000000
--- a/packages/editor-ui/src/components/VariablesRow.vue
+++ /dev/null
@@ -1,278 +0,0 @@
-<script lang="ts" setup>
-import type { ComponentPublicInstance } from 'vue';
-import { computed, nextTick, onMounted, ref, watch } from 'vue';
-import type { Rule, RuleGroup } from '@/Interface';
-import { useI18n } from '@/composables/useI18n';
-import { useToast } from '@/composables/useToast';
-import { useClipboard } from '@/composables/useClipboard';
-import { EnterpriseEditionFeature } from '@/constants';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/stores/users.store';
-import { getResourcePermissions } from '@/permissions';
-import type { IResource } from './layouts/ResourcesListLayout.vue';
-
-const i18n = useI18n();
-const clipboard = useClipboard();
-const { showMessage } = useToast();
-const settingsStore = useSettingsStore();
-const usersStore = useUsersStore();
-
-const emit = defineEmits<{
-	save: [data: IResource];
-	cancel: [data: IResource];
-	edit: [data: IResource];
-	delete: [data: IResource];
-}>();
-
-const props = withDefaults(
-	defineProps<{
-		data: IResource;
-		editing: boolean;
-	}>(),
-	{
-		editing: false,
-	},
-);
-
-const permissions = computed(
-	() => getResourcePermissions(usersStore.currentUser?.globalScopes).variable,
-);
-const modelValue = ref<IResource>({ ...props.data });
-
-const formValidationStatus = ref<Record<string, boolean>>({
-	key: false,
-	value: false,
-});
-const formValid = computed(() => {
-	return formValidationStatus.value.name && formValidationStatus.value.value;
-});
-
-const keyInputRef = ref<ComponentPublicInstance & { inputRef?: HTMLElement }>();
-const valueInputRef = ref<HTMLElement>();
-
-const usage = ref(`$vars.${props.data.name}`);
-
-const isFeatureEnabled = computed(
-	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Variables],
-);
-
-onMounted(() => {
-	focusFirstInput();
-});
-
-const keyValidationRules: Array<Rule | RuleGroup> = [
-	{ name: 'REQUIRED' },
-	{ name: 'MAX_LENGTH', config: { maximum: 50 } },
-	{
-		name: 'MATCH_REGEX',
-		config: {
-			regex: /^[a-zA-Z]/,
-			message: i18n.baseText('variables.editing.key.error.startsWithLetter'),
-		},
-	},
-	{
-		name: 'MATCH_REGEX',
-		config: {
-			regex: /^[a-zA-Z][a-zA-Z0-9_]*$/,
-			message: i18n.baseText('variables.editing.key.error.jsonKey'),
-		},
-	},
-];
-
-const valueValidationRules: Array<Rule | RuleGroup> = [
-	{ name: 'MAX_LENGTH', config: { maximum: 220 } },
-];
-
-watch(
-	() => modelValue.value.name,
-	async () => {
-		await nextTick();
-		if (formValidationStatus.value.name) {
-			updateUsageSyntax();
-		}
-	},
-);
-
-function updateUsageSyntax() {
-	usage.value = `$vars.${modelValue.value.name || props.data.name}`;
-}
-
-async function onCancel() {
-	modelValue.value = { ...props.data };
-	emit('cancel', modelValue.value);
-}
-
-async function onSave() {
-	emit('save', modelValue.value);
-}
-
-async function onEdit() {
-	emit('edit', modelValue.value);
-
-	await nextTick();
-
-	focusFirstInput();
-}
-
-async function onDelete() {
-	emit('delete', modelValue.value);
-}
-
-function onValidate(name: string, value: boolean) {
-	formValidationStatus.value[name] = value;
-}
-
-function onUsageClick() {
-	void clipboard.copy(usage.value);
-	showMessage({
-		title: i18n.baseText('variables.row.usage.copiedToClipboard'),
-		type: 'success',
-	});
-}
-
-function focusFirstInput() {
-	keyInputRef.value?.inputRef?.focus?.();
-}
-</script>
-
-<template>
-	<tr :class="$style.variablesRow" data-test-id="variables-row">
-		<td class="variables-key-column">
-			<div>
-				<span v-if="!editing">{{ data.name }}</span>
-				<n8n-form-input
-					v-else
-					ref="keyInputRef"
-					v-model="modelValue.name"
-					label
-					name="name"
-					data-test-id="variable-row-key-input"
-					:placeholder="i18n.baseText('variables.editing.key.placeholder')"
-					required
-					validate-on-blur
-					:validation-rules="keyValidationRules"
-					@validate="(value: boolean) => onValidate('name', value)"
-				/>
-			</div>
-		</td>
-		<td class="variables-value-column">
-			<div>
-				<span v-if="!editing">{{ data.value }}</span>
-				<n8n-form-input
-					v-else
-					ref="valueInputRef"
-					v-model="modelValue.value"
-					label
-					name="value"
-					data-test-id="variable-row-value-input"
-					:placeholder="i18n.baseText('variables.editing.value.placeholder')"
-					validate-on-blur
-					:validation-rules="valueValidationRules"
-					@validate="(value: boolean) => onValidate('value', value)"
-				/>
-			</div>
-		</td>
-		<td class="variables-usage-column">
-			<div>
-				<n8n-tooltip placement="top">
-					<span v-if="modelValue.name && usage" :class="$style.usageSyntax" @click="onUsageClick">{{
-						usage
-					}}</span>
-					<template #content>
-						{{ i18n.baseText('variables.row.usage.copyToClipboard') }}
-					</template>
-				</n8n-tooltip>
-			</div>
-		</td>
-		<td v-if="isFeatureEnabled">
-			<div v-if="editing" :class="$style.buttons">
-				<n8n-button
-					data-test-id="variable-row-cancel-button"
-					type="tertiary"
-					class="mr-xs"
-					@click="onCancel"
-				>
-					{{ i18n.baseText('variables.row.button.cancel') }}
-				</n8n-button>
-				<n8n-button
-					data-test-id="variable-row-save-button"
-					:disabled="!formValid"
-					type="primary"
-					@click="onSave"
-				>
-					{{ i18n.baseText('variables.row.button.save') }}
-				</n8n-button>
-			</div>
-			<div v-else :class="[$style.buttons, $style.hoverButtons]">
-				<n8n-tooltip :disabled="permissions.update" placement="top">
-					<div>
-						<n8n-button
-							data-test-id="variable-row-edit-button"
-							type="tertiary"
-							class="mr-xs"
-							:disabled="!permissions.update"
-							@click="onEdit"
-						>
-							{{ i18n.baseText('variables.row.button.edit') }}
-						</n8n-button>
-					</div>
-					<template #content>
-						{{ i18n.baseText('variables.row.button.edit.onlyRoleCanEdit') }}
-					</template>
-				</n8n-tooltip>
-				<n8n-tooltip :disabled="permissions.delete" placement="top">
-					<div>
-						<n8n-button
-							data-test-id="variable-row-delete-button"
-							type="tertiary"
-							:disabled="!permissions.delete"
-							@click="onDelete"
-						>
-							{{ i18n.baseText('variables.row.button.delete') }}
-						</n8n-button>
-					</div>
-					<template #content>
-						{{ i18n.baseText('variables.row.button.delete.onlyRoleCanDelete') }}
-					</template>
-				</n8n-tooltip>
-			</div>
-		</td>
-	</tr>
-</template>
-
-<style lang="scss" module>
-.variablesRow {
-	&:hover {
-		.hoverButtons {
-			opacity: 1;
-		}
-	}
-
-	td {
-		> div {
-			display: flex;
-			align-items: center;
-			min-height: 40px;
-		}
-	}
-}
-
-.buttons {
-	display: flex;
-	flex-wrap: nowrap;
-	justify-content: flex-end;
-}
-
-.hoverButtons {
-	opacity: 0;
-	transition: opacity 0.2s ease;
-}
-
-.usageSyntax {
-	cursor: pointer;
-	background: var(--color-variables-usage-syntax-bg);
-	color: var(--color-variables-usage-font);
-	font-family: var(--font-family-monospace);
-	font-size: var(--font-size-s);
-}
-</style>
diff --git a/packages/editor-ui/src/components/VariablesUsageBadge.test.ts b/packages/editor-ui/src/components/VariablesUsageBadge.test.ts
new file mode 100644
index 0000000000..a325ada897
--- /dev/null
+++ b/packages/editor-ui/src/components/VariablesUsageBadge.test.ts
@@ -0,0 +1,31 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import VariablesUsageBadge from './VariablesUsageBadge.vue';
+import userEvent from '@testing-library/user-event';
+
+const renderComponent = createComponentRenderer(VariablesUsageBadge);
+
+const showMessage = vi.fn();
+vi.mock('@/composables/useToast', () => ({
+	useToast: () => ({ showMessage }),
+}));
+
+const copy = vi.fn();
+vi.mock('@/composables/useClipboard', () => ({
+	useClipboard: () => ({ copy }),
+}));
+
+describe('VariablesUsageBadge', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should copy to the clipboard', async () => {
+		const name = 'myVar';
+		const output = `$vars.${name}`;
+		const { getByText } = renderComponent({ props: { name } });
+		await userEvent.click(getByText(output));
+
+		expect(showMessage).toHaveBeenCalledWith(expect.objectContaining({ type: 'success' }));
+		expect(copy).toHaveBeenCalledWith(output);
+	});
+});
diff --git a/packages/editor-ui/src/components/VariablesUsageBadge.vue b/packages/editor-ui/src/components/VariablesUsageBadge.vue
new file mode 100644
index 0000000000..043d7e5d17
--- /dev/null
+++ b/packages/editor-ui/src/components/VariablesUsageBadge.vue
@@ -0,0 +1,44 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { N8nTooltip } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useClipboard } from '@/composables/useClipboard';
+
+const i18n = useI18n();
+const clipboard = useClipboard();
+const { showMessage } = useToast();
+
+const props = defineProps<{
+	name: string;
+}>();
+
+const usage = computed(() => `$vars.${props.name}`);
+
+const handleClick = () => {
+	void clipboard.copy(usage.value);
+	showMessage({
+		title: i18n.baseText('variables.row.usage.copiedToClipboard'),
+		type: 'success',
+	});
+};
+</script>
+
+<template>
+	<N8nTooltip placement="top">
+		<span class="usageSyntax" @click="handleClick">{{ usage }}</span>
+		<template #content>
+			{{ i18n.baseText('variables.row.usage.copyToClipboard') }}
+		</template>
+	</N8nTooltip>
+</template>
+
+<style lang="scss" scoped>
+.usageSyntax {
+	cursor: pointer;
+	background: var(--color-variables-usage-syntax-bg);
+	color: var(--color-variables-usage-font);
+	font-family: var(--font-family-monospace);
+	font-size: var(--font-size-s);
+}
+</style>
diff --git a/packages/editor-ui/src/components/VirtualSchema.test.ts b/packages/editor-ui/src/components/VirtualSchema.test.ts
index f648b1de3c..a81bec4808 100644
--- a/packages/editor-ui/src/components/VirtualSchema.test.ts
+++ b/packages/editor-ui/src/components/VirtualSchema.test.ts
@@ -13,11 +13,18 @@ import { IF_NODE_TYPE, SET_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE } from '@/constan
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { mock } from 'vitest-mock-extended';
 import type { IWorkflowDb } from '@/Interface';
-import { NodeConnectionType, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
+import {
+	createResultOk,
+	NodeConnectionType,
+	type IDataObject,
+	type INodeExecutionData,
+} from 'n8n-workflow';
 import * as nodeHelpers from '@/composables/useNodeHelpers';
 import { useNDVStore } from '@/stores/ndv.store';
 import { fireEvent } from '@testing-library/dom';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { useSchemaPreviewStore } from '../stores/schemaPreview.store';
+import { usePostHog } from '../stores/posthog.store';
 
 const mockNode1 = createTestNode({
 	name: 'Manual Trigger',
@@ -127,6 +134,9 @@ describe('VirtualSchema.vue', () => {
 	const DynamicScrollerItemStub = {
 		template: '<slot></slot>',
 	};
+	const NoticeStub = {
+		template: '<div v-bind="$attrs"><slot></slot></div>',
+	};
 
 	beforeEach(async () => {
 		cleanup();
@@ -136,6 +146,7 @@ describe('VirtualSchema.vue', () => {
 					DynamicScroller: DynamicScrollerStub,
 					DynamicScrollerItem: DynamicScrollerItemStub,
 					FontAwesomeIcon: true,
+					Notice: NoticeStub,
 				},
 			},
 			pinia: await setupStore(),
@@ -155,7 +166,9 @@ describe('VirtualSchema.vue', () => {
 	it('renders schema for empty data', async () => {
 		const { getAllByText, getAllByTestId } = renderComponent();
 
-		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(2);
+		await waitFor(() =>
+			expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(2),
+		);
 
 		// Collapse second node
 		await userEvent.click(getAllByTestId('run-data-schema-header')[1]);
@@ -179,23 +192,25 @@ describe('VirtualSchema.vue', () => {
 		});
 
 		const { getAllByTestId } = renderComponent();
-		const headers = getAllByTestId('run-data-schema-header');
-		expect(headers.length).toBe(2);
-		expect(headers[0]).toHaveTextContent('Manual Trigger');
-		expect(headers[0]).toHaveTextContent('2 items');
-		expect(headers[1]).toHaveTextContent('Set2');
+		await waitFor(() => {
+			const headers = getAllByTestId('run-data-schema-header');
+			expect(headers.length).toBe(2);
+			expect(headers[0]).toHaveTextContent('Manual Trigger');
+			expect(headers[0]).toHaveTextContent('2 items');
+			expect(headers[1]).toHaveTextContent('Set2');
 
-		const items = getAllByTestId('run-data-schema-item');
+			const items = getAllByTestId('run-data-schema-item');
 
-		expect(items[0]).toHaveTextContent('nameJohn');
-		expect(items[1]).toHaveTextContent('age22');
-		expect(items[2]).toHaveTextContent('hobbies');
-		expect(items[3]).toHaveTextContent('hobbies[0]surfing');
-		expect(items[4]).toHaveTextContent('hobbies[1]traveling');
+			expect(items[0]).toHaveTextContent('nameJohn');
+			expect(items[1]).toHaveTextContent('age22');
+			expect(items[2]).toHaveTextContent('hobbies');
+			expect(items[3]).toHaveTextContent('hobbies[0]surfing');
+			expect(items[4]).toHaveTextContent('hobbies[1]traveling');
+		});
 	});
 
 	it('renders schema in output pane', async () => {
-		const { container } = renderComponent({
+		const { container, getAllByTestId } = renderComponent({
 			props: {
 				nodes: [],
 				paneType: 'output',
@@ -207,10 +222,15 @@ describe('VirtualSchema.vue', () => {
 			},
 		});
 
+		await waitFor(() => {
+			const items = getAllByTestId('run-data-schema-item');
+			expect(items).toHaveLength(5);
+		});
+
 		expect(container).toMatchSnapshot();
 	});
 
-	it('renders schema with spaces and dots', () => {
+	it('renders schema with spaces and dots', async () => {
 		useWorkflowsStore().pinData({
 			node: mockNode1,
 			data: [
@@ -229,39 +249,51 @@ describe('VirtualSchema.vue', () => {
 			],
 		});
 
-		const { container } = renderComponent();
+		const { container, getAllByTestId } = renderComponent();
+
+		await waitFor(() => {
+			const items = getAllByTestId('run-data-schema-item');
+			expect(items).toHaveLength(6);
+		});
+
 		expect(container).toMatchSnapshot();
 	});
 
-	it('renders no data to show for data empty objects', () => {
+	it('renders no data to show for data empty objects', async () => {
 		useWorkflowsStore().pinData({
 			node: mockNode1,
 			data: [{ json: {} }, { json: {} }],
 		});
 
 		const { getAllByText } = renderComponent();
-		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(2);
+		await waitFor(() =>
+			expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(2),
+		);
 	});
 
 	// this can happen when setting the output to [{}]
-	it('renders empty state to show for empty data', () => {
+	it('renders empty state to show for empty data', async () => {
 		useWorkflowsStore().pinData({
 			node: mockNode1,
 			data: [{} as INodeExecutionData],
 		});
 
 		const { getAllByText } = renderComponent({ props: { paneType: 'output' } });
-		expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(1);
+		await waitFor(() =>
+			expect(getAllByText("No fields - item(s) exist, but they're empty").length).toBe(1),
+		);
 	});
 
-	it('renders disabled nodes correctly', () => {
+	it('renders disabled nodes correctly', async () => {
 		const { getByTestId } = renderComponent({
 			props: {
 				nodes: [{ name: disabledNode.name, indicies: [], depth: 1 }],
 			},
 		});
-		expect(getByTestId('run-data-schema-header')).toHaveTextContent(
-			`${disabledNode.name} (Deactivated)`,
+		await waitFor(() =>
+			expect(getByTestId('run-data-schema-header')).toHaveTextContent(
+				`${disabledNode.name} (Deactivated)`,
+			),
 		);
 	});
 
@@ -325,23 +357,27 @@ describe('VirtualSchema.vue', () => {
 			},
 		});
 
-		expect(getByTestId('run-data-schema-item')).toHaveTextContent('AI tool output');
+		await waitFor(() =>
+			expect(getByTestId('run-data-schema-item')).toHaveTextContent('AI tool output'),
+		);
 	});
 
 	test.each([[[{ tx: false }, { tx: false }]], [[{ tx: '' }, { tx: '' }]], [[{ tx: [] }]]])(
 		'renders schema instead of showing no data for %o',
-		(data) => {
+		async (data) => {
 			useWorkflowsStore().pinData({
 				node: mockNode1,
 				data: data.map((item) => ({ json: item })),
 			});
 
 			const { getAllByTestId } = renderComponent();
-			expect(getAllByTestId('run-data-schema-item')[0]).toHaveTextContent('tx');
+			await waitFor(() =>
+				expect(getAllByTestId('run-data-schema-item')[0]).toHaveTextContent('tx'),
+			);
 		},
 	);
 
-	it('should filter invalid connections', () => {
+	it('should filter invalid connections', async () => {
 		const { pinData } = useWorkflowsStore();
 		pinData({
 			node: mockNode1,
@@ -363,10 +399,10 @@ describe('VirtualSchema.vue', () => {
 			},
 		});
 
-		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+		await waitFor(() => expect(getAllByTestId('run-data-schema-item').length).toBe(2));
 	});
 
-	it('should show connections', () => {
+	it('should show connections', async () => {
 		const ndvStore = useNDVStore();
 		vi.spyOn(ndvStore, 'ndvNodeInputNumber', 'get').mockReturnValue({
 			[defaultNodes[0].name]: [0],
@@ -374,10 +410,13 @@ describe('VirtualSchema.vue', () => {
 		});
 
 		const { getAllByTestId } = renderComponent();
-		const headers = getAllByTestId('run-data-schema-header');
-		expect(headers.length).toBe(2);
-		expect(headers[0]).toHaveTextContent('Input 0');
-		expect(headers[1]).toHaveTextContent('Inputs 0, 1, 2');
+
+		await waitFor(() => {
+			const headers = getAllByTestId('run-data-schema-header');
+			expect(headers.length).toBe(2);
+			expect(headers[0]).toHaveTextContent('Input 0');
+			expect(headers[1]).toHaveTextContent('Inputs 0, 1, 2');
+		});
 	});
 
 	it('should handle drop event', async () => {
@@ -391,8 +430,10 @@ describe('VirtualSchema.vue', () => {
 		const reset = vi.spyOn(ndvStore, 'resetMappingTelemetry');
 		const { getAllByTestId } = renderComponent();
 
+		await waitFor(() => {
+			expect(getAllByTestId('run-data-schema-item')).toHaveLength(6);
+		});
 		const items = getAllByTestId('run-data-schema-item');
-		expect(items.length).toBe(6);
 
 		expect(items[0].className).toBe('schema-item draggable');
 		expect(items[0]).toHaveTextContent('nameJohn');
@@ -425,15 +466,56 @@ describe('VirtualSchema.vue', () => {
 		});
 
 		const { getAllByTestId, queryAllByTestId, rerender } = renderComponent();
-		const headers = getAllByTestId('run-data-schema-header');
-		expect(headers.length).toBe(2);
-		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+		await waitFor(async () => {
+			const headers = getAllByTestId('run-data-schema-header');
+			expect(headers.length).toBe(2);
+			expect(getAllByTestId('run-data-schema-item').length).toBe(2);
 
-		// Collapse all nodes
-		await Promise.all(headers.map(async ($header) => await userEvent.click($header)));
+			// Collapse all nodes
+			await Promise.all(headers.map(async ($header) => await userEvent.click($header)));
 
-		expect(queryAllByTestId('run-data-schema-item').length).toBe(0);
-		await rerender({ search: 'John' });
-		expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+			expect(queryAllByTestId('run-data-schema-item').length).toBe(0);
+			await rerender({ search: 'John' });
+			expect(getAllByTestId('run-data-schema-item').length).toBe(2);
+		});
+	});
+
+	it('renders preview schema when enabled and available', async () => {
+		useWorkflowsStore().pinData({
+			node: mockNode1,
+			data: [],
+		});
+		useWorkflowsStore().pinData({
+			node: mockNode2,
+			data: [],
+		});
+		const posthogStore = usePostHog();
+		vi.spyOn(posthogStore, 'isFeatureEnabled').mockReturnValue(true);
+		const schemaPreviewStore = useSchemaPreviewStore();
+		vi.spyOn(schemaPreviewStore, 'getSchemaPreview').mockResolvedValue(
+			createResultOk({
+				type: 'object',
+				properties: {
+					account: {
+						type: 'object',
+						properties: {
+							id: {
+								type: 'string',
+							},
+						},
+					},
+				},
+			}),
+		);
+
+		const { getAllByTestId, queryAllByText, container } = renderComponent({});
+
+		await waitFor(() => {
+			expect(getAllByTestId('run-data-schema-header')).toHaveLength(2);
+		});
+
+		expect(queryAllByText("No fields - item(s) exist, but they're empty")).toHaveLength(0);
+		expect(getAllByTestId('schema-preview-warning')).toHaveLength(2);
+		expect(container).toMatchSnapshot();
 	});
 });
diff --git a/packages/editor-ui/src/components/VirtualSchema.vue b/packages/editor-ui/src/components/VirtualSchema.vue
index 2a4c0ebedc..5aac9e57a8 100644
--- a/packages/editor-ui/src/components/VirtualSchema.vue
+++ b/packages/editor-ui/src/components/VirtualSchema.vue
@@ -7,7 +7,12 @@ import { N8nText } from 'n8n-design-system';
 import Draggable from '@/components/Draggable.vue';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { NodeConnectionType, type IConnectedNode, type IDataObject } from 'n8n-workflow';
+import {
+	createResultError,
+	NodeConnectionType,
+	type IConnectedNode,
+	type IDataObject,
+} from 'n8n-workflow';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useI18n } from '@/composables/useI18n';
 import MappingPill from './MappingPill.vue';
@@ -23,6 +28,10 @@ import {
 } from 'vue-virtual-scroller';
 
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
+import { useSchemaPreviewStore } from '@/stores/schemaPreview.store';
+import { asyncComputed } from '@vueuse/core';
+import { usePostHog } from '@/stores/posthog.store';
+import { SCHEMA_PREVIEW_EXPERIMENT } from '@/constants';
 
 type Props = {
 	nodes?: IConnectedNode[];
@@ -55,7 +64,9 @@ const i18n = useI18n();
 const ndvStore = useNDVStore();
 const nodeTypesStore = useNodeTypesStore();
 const workflowsStore = useWorkflowsStore();
-const { getSchemaForExecutionData, filterSchema } = useDataSchema();
+const schemaPreviewStore = useSchemaPreviewStore();
+const posthogStore = usePostHog();
+const { getSchemaForExecutionData, getSchemaForJsonSchema, filterSchema } = useDataSchema();
 const { closedNodes, flattenSchema, flattenMultipleSchemas, toggleLeaf, toggleNode } =
 	useFlattenSchema();
 const { getNodeInputData } = useNodeHelpers();
@@ -79,7 +90,7 @@ watch(
 	},
 );
 
-const getNodeSchema = (fullNode: INodeUi, connectedNode: IConnectedNode) => {
+const getNodeSchema = async (fullNode: INodeUi, connectedNode: IConnectedNode) => {
 	const pinData = workflowsStore.pinDataByNodeName(connectedNode.name);
 	const connectedOutputIndexes = connectedNode.indicies.length > 0 ? connectedNode.indicies : [0];
 	const data =
@@ -98,42 +109,88 @@ const getNodeSchema = (fullNode: INodeUi, connectedNode: IConnectedNode) => {
 			)
 			.flat();
 
+	let schema = getSchemaForExecutionData(data);
+	let preview = false;
+
+	if (data.length === 0 && isSchemaPreviewEnabled.value) {
+		const previewSchema = await getSchemaPreview(fullNode);
+		if (previewSchema.ok) {
+			schema = getSchemaForJsonSchema(previewSchema.result);
+			preview = true;
+		}
+	}
+
 	return {
-		schema: getSchemaForExecutionData(data),
+		schema,
 		connectedOutputIndexes,
 		itemsCount: data.length,
+		preview,
 	};
 };
 
-const nodeSchema = computed(() =>
-	filterSchema(getSchemaForExecutionData(props.data), props.search),
+const isSchemaPreviewEnabled = computed(() =>
+	posthogStore.isFeatureEnabled(SCHEMA_PREVIEW_EXPERIMENT),
 );
 
-const nodesSchemas = computed<SchemaNode[]>(() => {
-	return props.nodes.reduce<SchemaNode[]>((acc, node) => {
+const nodeSchema = asyncComputed(async () => {
+	if (props.data.length === 0 && isSchemaPreviewEnabled.value) {
+		const previewSchema = await getSchemaPreview(props.node);
+		if (previewSchema.ok) {
+			return filterSchema(getSchemaForJsonSchema(previewSchema.result), props.search);
+		}
+	}
+
+	return filterSchema(getSchemaForExecutionData(props.data), props.search);
+});
+
+async function getSchemaPreview(node: INodeUi | null) {
+	if (!node) return createResultError(new Error());
+	const {
+		type,
+		typeVersion,
+		parameters: { resource, operation },
+	} = node;
+
+	return await schemaPreviewStore.getSchemaPreview({
+		nodeType: type,
+		version: typeVersion,
+		resource: resource as string,
+		operation: operation as string,
+	});
+}
+
+const nodesSchemas = asyncComputed<SchemaNode[]>(async () => {
+	const result: SchemaNode[] = [];
+
+	for (const node of props.nodes) {
 		const fullNode = workflowsStore.getNodeByName(node.name);
-		if (!fullNode) return acc;
+		if (!fullNode) continue;
 
 		const nodeType = nodeTypesStore.getNodeType(fullNode.type, fullNode.typeVersion);
-		if (!nodeType) return acc;
+		if (!nodeType) continue;
 
-		const { schema, connectedOutputIndexes, itemsCount } = getNodeSchema(fullNode, node);
+		const { schema, connectedOutputIndexes, itemsCount, preview } = await getNodeSchema(
+			fullNode,
+			node,
+		);
 
 		const filteredSchema = filterSchema(schema, props.search);
 
-		if (!filteredSchema) return acc;
+		if (!filteredSchema) continue;
 
-		acc.push({
+		result.push({
 			node: fullNode,
 			connectedOutputIndexes,
 			depth: node.depth,
 			itemsCount,
 			nodeType,
 			schema: filteredSchema,
+			preview,
 		});
-		return acc;
-	}, []);
-});
+	}
+
+	return result;
+}, []);
 
 const nodeAdditionalInfo = (node: INodeUi) => {
 	const returnData: string[] = [];
@@ -243,21 +300,21 @@ const onDragEnd = (el: HTMLElement) => {
 				class="full-height scroller"
 			>
 				<template #default="{ item, index, active }">
-					<VirtualSchemaHeader
-						v-if="item.type === 'header'"
-						v-bind="item"
-						:collapsed="closedNodes.has(item.id)"
-						@click:toggle="toggleLeaf(item.id)"
-						@click="toggleNodeAndScrollTop(item.id)"
-					/>
 					<DynamicScrollerItem
-						v-else
 						:item="item"
 						:active="active"
-						:size-dependencies="[item.value]"
+						:size-dependencies="[item]"
 						:data-index="index"
 					>
+						<VirtualSchemaHeader
+							v-if="item.type === 'header'"
+							v-bind="item"
+							:collapsed="closedNodes.has(item.id)"
+							@click:toggle="toggleLeaf(item.id)"
+							@click="toggleNodeAndScrollTop(item.id)"
+						/>
 						<VirtualSchemaItem
+							v-else
 							v-bind="item"
 							:search="search"
 							:draggable="mappingEnabled"
@@ -283,6 +340,7 @@ const onDragEnd = (el: HTMLElement) => {
 
 .scroller {
 	padding: 0 var(--spacing-s);
+	padding-bottom: var(--spacing-2xl);
 }
 
 .no-results {
diff --git a/packages/editor-ui/src/components/VirtualSchemaHeader.vue b/packages/editor-ui/src/components/VirtualSchemaHeader.vue
index 677f88ba5c..cdf87f168d 100644
--- a/packages/editor-ui/src/components/VirtualSchemaHeader.vue
+++ b/packages/editor-ui/src/components/VirtualSchemaHeader.vue
@@ -4,6 +4,8 @@ import NodeIcon from '@/components/NodeIcon.vue';
 import { type INodeTypeDescription } from 'n8n-workflow';
 import { useI18n } from '@/composables/useI18n';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import { DATA_EDITING_DOCS_URL } from '@/constants';
+import { N8nNotice } from 'n8n-design-system';
 
 const props = defineProps<{
 	title: string;
@@ -12,6 +14,7 @@ const props = defineProps<{
 	collapsed: boolean;
 	nodeType: INodeTypeDescription;
 	itemCount: number | null;
+	preview?: boolean;
 }>();
 
 const i18n = useI18n();
@@ -22,33 +25,51 @@ const emit = defineEmits<{
 </script>
 
 <template>
-	<div class="schema-header" data-test-id="run-data-schema-header">
-		<div class="toggle" @click.capture.stop="emit('click:toggle')">
-			<FontAwesomeIcon icon="angle-down" :class="{ 'collapse-icon': true, collapsed }" />
-		</div>
+	<div class="schema-header-wrapper">
+		<div class="schema-header" data-test-id="run-data-schema-header">
+			<div class="toggle" @click.capture.stop="emit('click:toggle')">
+				<FontAwesomeIcon icon="angle-down" :class="{ 'collapse-icon': true, collapsed }" />
+			</div>
 
-		<NodeIcon
-			class="icon"
-			:class="{ ['icon-trigger']: isTrigger }"
-			:node-type="nodeType"
-			:size="12"
-		/>
-		<div class="title">
-			{{ title }}
-			<span v-if="info" class="info">{{ info }}</span>
-		</div>
-		<FontAwesomeIcon v-if="isTrigger" class="trigger-icon" icon="bolt" size="xs" />
-		<div v-if="itemCount" class="item-count" data-test-id="run-data-schema-node-item-count">
-			{{ i18n.baseText('ndv.output.items', { interpolate: { count: itemCount } }) }}
+			<NodeIcon
+				class="icon"
+				:class="{ ['icon-trigger']: isTrigger }"
+				:node-type="nodeType"
+				:size="12"
+			/>
+			<div class="title">
+				{{ title }}
+				<span v-if="info" class="info">{{ info }}</span>
+			</div>
+			<FontAwesomeIcon v-if="isTrigger" class="trigger-icon" icon="bolt" size="xs" />
+			<div v-if="itemCount" class="item-count" data-test-id="run-data-schema-node-item-count">
+				{{ i18n.baseText('ndv.output.items', { interpolate: { count: itemCount } }) }}
+			</div>
 		</div>
+		<N8nNotice
+			v-if="preview && !collapsed"
+			class="notice"
+			theme="warning"
+			data-test-id="schema-preview-warning"
+		>
+			<i18n-t keypath="dataMapping.schemaView.preview">
+				<template #link>
+					<N8nLink :to="DATA_EDITING_DOCS_URL" size="small">
+						{{ i18n.baseText('generic.learnMore') }}
+					</N8nLink>
+				</template>
+			</i18n-t>
+		</N8nNotice>
 	</div>
 </template>
 
 <style lang="scss" scoped>
+.schema-header-wrapper {
+	padding-bottom: var(--spacing-2xs);
+}
 .schema-header {
 	display: flex;
 	align-items: center;
-	padding-bottom: var(--spacing-2xs);
 	cursor: pointer;
 }
 .toggle {
@@ -101,4 +122,10 @@ const emit = defineEmits<{
 	color: var(--color-text-light);
 	margin-left: auto;
 }
+
+.notice {
+	margin-left: var(--spacing-2xl);
+	margin-top: var(--spacing-2xs);
+	margin-bottom: 0;
+}
 </style>
diff --git a/packages/editor-ui/src/components/VirtualSchemaItem.vue b/packages/editor-ui/src/components/VirtualSchemaItem.vue
index 84e9a49b8c..e8c7df6792 100644
--- a/packages/editor-ui/src/components/VirtualSchemaItem.vue
+++ b/packages/editor-ui/src/components/VirtualSchemaItem.vue
@@ -17,6 +17,7 @@ type Props = {
 	draggable?: boolean;
 	collapsed?: boolean;
 	search?: string;
+	preview?: boolean;
 };
 
 const props = defineProps<Props>();
@@ -42,7 +43,7 @@ const emit = defineEmits<{
 			:data-node-type="nodeType"
 			data-target="mappable"
 			class="pill"
-			:class="{ 'pill--highlight': highlight }"
+			:class="{ 'pill--highlight': highlight, 'pill--preview': preview }"
 			data-test-id="run-data-schema-node-name"
 		>
 			<FontAwesomeIcon class="type-icon" :icon size="sm" />
@@ -89,11 +90,22 @@ const emit = defineEmits<{
 	color: var(--color-text-dark);
 	max-width: 50%;
 	align-items: center;
+
 	> *:not(:first-child) {
 		margin-left: var(--spacing-3xs);
 		padding-left: var(--spacing-3xs);
 		border-left: 1px solid var(--color-foreground-light);
 	}
+
+	&.pill--preview {
+		border-style: dashed;
+		border-width: 1.5px;
+
+		.title {
+			color: var(--color-text-light);
+			border-left: 1.5px dashed var(--color-foreground-light);
+		}
+	}
 }
 
 .draggable .pill.pill--highlight {
diff --git a/packages/editor-ui/src/components/WorkflowActivator.test.ts b/packages/editor-ui/src/components/WorkflowActivator.test.ts
index 62f9481636..46bc6a7190 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.test.ts
+++ b/packages/editor-ui/src/components/WorkflowActivator.test.ts
@@ -7,16 +7,31 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { createTestingPinia } from '@pinia/testing';
 import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore } from '@/__tests__/utils';
-import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from '@/constants';
+import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, WOOCOMMERCE_TRIGGER_NODE_TYPE } from '@/constants';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useToast } from '@/composables/useToast';
 
 const renderComponent = createComponentRenderer(WorkflowActivator);
 let mockWorkflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
+let mockCredentialsStore: ReturnType<typeof mockedStore<typeof useCredentialsStore>>;
+
+vi.mock('@/composables/useToast', () => {
+	const showMessage = vi.fn();
+	return {
+		useToast: () => {
+			return {
+				showMessage,
+			};
+		},
+	};
+});
 
 describe('WorkflowActivator', () => {
 	beforeEach(() => {
 		createTestingPinia();
 
 		mockWorkflowsStore = mockedStore(useWorkflowsStore);
+		mockCredentialsStore = mockedStore(useCredentialsStore);
 	});
 
 	afterEach(() => {
@@ -79,4 +94,171 @@ describe('WorkflowActivator', () => {
 		);
 		expect(getByTestId('workflow-activator-status')).toHaveTextContent('Inactive');
 	});
+
+	it('Should show warning toast if the workflow to be activated has non-disabled node using free OpenAI credentials', async () => {
+		const toast = useToast();
+
+		mockWorkflowsStore.usedCredentials = {
+			'1': {
+				id: '1',
+				name: '',
+				credentialType: '',
+				currentUserHasAccess: false,
+			},
+		};
+
+		mockCredentialsStore.state.credentials = {
+			'1': {
+				id: '1',
+				name: 'OpenAI',
+				type: 'openAiApi',
+				data: '',
+				isManaged: true,
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		};
+
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: WOOCOMMERCE_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		mockWorkflowsStore.allNodes = [
+			{
+				credentials: {
+					openAiApi: {
+						name: 'OpenAI',
+						id: '1',
+					},
+				},
+				disabled: false,
+				position: [1, 1],
+				name: '',
+				id: '',
+				typeVersion: 0,
+				type: '',
+				parameters: {},
+			},
+		];
+
+		const { rerender } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await rerender({ workflowActive: true });
+
+		expect(toast.showMessage).toHaveBeenCalledWith(
+			expect.objectContaining({
+				title: "You're using free OpenAI API credits",
+				message:
+					'To make sure your workflow runs smoothly in the future, replace the free OpenAI API credits with your own API key.',
+				type: 'warning',
+				duration: 0,
+			}),
+		);
+	});
+
+	it('Should not show warning toast if the workflow to be activated has disabled node using free OpenAI credentials', async () => {
+		const toast = useToast();
+
+		mockWorkflowsStore.usedCredentials = {
+			'1': {
+				id: '1',
+				name: '',
+				credentialType: '',
+				currentUserHasAccess: false,
+			},
+		};
+
+		mockCredentialsStore.state.credentials = {
+			'1': {
+				id: '1',
+				name: 'OpenAI',
+				type: 'openAiApi',
+				data: '',
+				isManaged: true,
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		};
+
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: WOOCOMMERCE_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		mockWorkflowsStore.allNodes = [
+			{
+				credentials: {
+					openAiApi: {
+						name: 'OpenAI',
+						id: '1',
+					},
+				},
+				disabled: true,
+				position: [1, 1],
+				name: '',
+				id: '',
+				typeVersion: 0,
+				type: '',
+				parameters: {},
+			},
+		];
+
+		const { rerender } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await rerender({ workflowActive: true });
+
+		expect(toast.showMessage).not.toHaveBeenCalled();
+	});
+
+	it('Should not show warning toast if the workflow to be activated has no node with free OpenAI credential', async () => {
+		const toast = useToast();
+
+		mockWorkflowsStore.usedCredentials = {
+			'1': {
+				id: '1',
+				name: '',
+				credentialType: '',
+				currentUserHasAccess: false,
+			},
+		};
+
+		mockCredentialsStore.state.credentials = {
+			'1': {
+				id: '1',
+				name: 'Jira',
+				type: 'jiraApi',
+				data: '',
+				isManaged: true,
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		};
+
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: WOOCOMMERCE_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		const { rerender } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await rerender({ workflowActive: true });
+
+		expect(toast.showMessage).not.toHaveBeenCalled();
+	});
 });
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index 8dec6f6620..888f473cc0 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -4,11 +4,14 @@ import { useWorkflowActivate } from '@/composables/useWorkflowActivate';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getActivatableTriggerNodes } from '@/utils/nodeTypesUtils';
 import type { VNode } from 'vue';
-import { computed, h } from 'vue';
+import { computed, h, watch } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import type { PermissionsRecord } from '@/permissions';
 import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import WorkflowActivationErrorMessage from './WorkflowActivationErrorMessage.vue';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import type { INodeUi, IUsedCredential } from '@/Interface';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 
 const props = defineProps<{
 	workflowActive: boolean;
@@ -20,6 +23,7 @@ const workflowActivate = useWorkflowActivate();
 
 const i18n = useI18n();
 const workflowsStore = useWorkflowsStore();
+const credentialsStore = useCredentialsStore();
 
 const isWorkflowActive = computed((): boolean => {
 	const activeWorkflows = workflowsStore.activeWorkflows;
@@ -69,6 +73,41 @@ const disabled = computed((): boolean => {
 	return false;
 });
 
+function findManagedOpenAiCredentialId(
+	usedCredentials: Record<string, IUsedCredential>,
+): string | undefined {
+	return Object.keys(usedCredentials).find((credentialId) => {
+		const credential = credentialsStore.state.credentials[credentialId];
+		return credential.isManaged && credential.type === OPEN_AI_API_CREDENTIAL_TYPE;
+	});
+}
+
+function hasActiveNodeUsingCredential(nodes: INodeUi[], credentialId: string): boolean {
+	return nodes.some(
+		(node) =>
+			node?.credentials?.[OPEN_AI_API_CREDENTIAL_TYPE]?.id === credentialId && !node.disabled,
+	);
+}
+
+/**
+ * Determines if the warning for free AI credits should be shown in the workflow.
+ *
+ * This computed property evaluates whether to display a warning about free AI credits
+ * in the workflow. The warning is shown when both conditions are met:
+ * 1. The workflow uses managed OpenAI API credentials
+ * 2. Those credentials are associated with at least one enabled node
+ *
+ */
+const shouldShowFreeAiCreditsWarning = computed((): boolean => {
+	const usedCredentials = workflowsStore?.usedCredentials;
+	if (!usedCredentials) return false;
+
+	const managedOpenAiCredentialId = findManagedOpenAiCredentialId(usedCredentials);
+	if (!managedOpenAiCredentialId) return false;
+
+	return hasActiveNodeUsingCredential(workflowsStore.allNodes, managedOpenAiCredentialId);
+});
+
 async function activeChanged(newActiveState: boolean) {
 	return await workflowActivate.updateWorkflowActivation(props.workflowId, newActiveState);
 }
@@ -100,6 +139,20 @@ async function displayActivationError() {
 		duration: 0,
 	});
 }
+
+watch(
+	() => props.workflowActive,
+	(workflowActive) => {
+		if (workflowActive && shouldShowFreeAiCreditsWarning.value) {
+			showMessage({
+				title: i18n.baseText('freeAi.credits.showWarning.workflow.activation.title'),
+				message: i18n.baseText('freeAi.credits.showWarning.workflow.activation.description'),
+				type: 'warning',
+				duration: 0,
+			});
+		}
+	},
+);
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/WorkflowPreview.test.ts b/packages/editor-ui/src/components/WorkflowPreview.test.ts
index 5895eac2fd..f9b3e3921f 100644
--- a/packages/editor-ui/src/components/WorkflowPreview.test.ts
+++ b/packages/editor-ui/src/components/WorkflowPreview.test.ts
@@ -12,6 +12,7 @@ const renderComponent = createComponentRenderer(WorkflowPreview);
 let pinia: ReturnType<typeof createPinia>;
 let executionsStore: ReturnType<typeof useExecutionsStore>;
 let postMessageSpy: Mock;
+let focusSpy: Mock;
 let consoleErrorSpy: MockInstance;
 
 const sendPostMessageCommand = (command: string) => {
@@ -26,10 +27,12 @@ describe('WorkflowPreview', () => {
 
 		consoleErrorSpy = vi.spyOn(console, 'error');
 		postMessageSpy = vi.fn();
+		focusSpy = vi.fn();
 		Object.defineProperty(HTMLIFrameElement.prototype, 'contentWindow', {
 			writable: true,
 			value: {
 				postMessage: postMessageSpy,
+				focus: focusSpy,
 			},
 		});
 	});
@@ -105,6 +108,7 @@ describe('WorkflowPreview', () => {
 				}),
 				'*',
 			);
+			expect(focusSpy).toHaveBeenCalled();
 		});
 	});
 
diff --git a/packages/editor-ui/src/components/WorkflowPreview.vue b/packages/editor-ui/src/components/WorkflowPreview.vue
index ff617499ff..52274cb526 100644
--- a/packages/editor-ui/src/components/WorkflowPreview.vue
+++ b/packages/editor-ui/src/components/WorkflowPreview.vue
@@ -15,6 +15,7 @@ const props = withDefaults(
 		loaderType?: 'image' | 'spinner';
 		canOpenNDV?: boolean;
 		hideNodeIssues?: boolean;
+		focusOnLoad?: boolean;
 	}>(),
 	{
 		loading: false,
@@ -25,6 +26,7 @@ const props = withDefaults(
 		loaderType: 'image',
 		canOpenNDV: true,
 		hideNodeIssues: false,
+		focusOnLoad: true,
 	},
 );
 
@@ -120,6 +122,7 @@ const onMouseEnter = () => {
 	scrollX.value = window.scrollX;
 	scrollY.value = window.scrollY;
 };
+
 const onMouseLeave = () => {
 	insideIframe.value = false;
 };
@@ -131,18 +134,41 @@ const receiveMessage = ({ data }: MessageEvent) => {
 	try {
 		const json = JSON.parse(data);
 		if (json.command === 'n8nReady') {
-			ready.value = true;
+			onReady();
 		} else if (json.command === 'openNDV') {
-			nodeViewDetailsOpened.value = true;
+			onOpenNDV();
 		} else if (json.command === 'closeNDV') {
-			nodeViewDetailsOpened.value = false;
+			onCloseNDV();
 		} else if (json.command === 'error') {
-			emit('close');
+			onError();
 		}
 	} catch (e) {
 		console.error(e);
 	}
 };
+
+const onReady = () => {
+	ready.value = true;
+
+	if (props.focusOnLoad) {
+		setTimeout(() => {
+			iframeRef.value?.contentWindow?.focus();
+		});
+	}
+};
+
+const onOpenNDV = () => {
+	nodeViewDetailsOpened.value = true;
+};
+
+const onCloseNDV = () => {
+	nodeViewDetailsOpened.value = false;
+};
+
+const onError = () => {
+	emit('close');
+};
+
 const onDocumentScroll = () => {
 	if (insideIframe.value) {
 		window.scrollTo(scrollX.value, scrollY.value);
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
index c54b13144d..686adcafc6 100644
--- a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
@@ -20,8 +20,9 @@ import { useWorkflowResourceLocatorModes } from './useWorkflowResourceLocatorMod
 import { useWorkflowResourcesLocator } from './useWorkflowResourcesLocator';
 import { useProjectsStore } from '@/stores/projects.store';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL } from '@/constants';
+import { VIEWS } from '@/constants';
 import { SAMPLE_SUBWORKFLOW_WORKFLOW } from '@/constants.workflows';
+import type { IWorkflowDataCreate } from '@/Interface';
 
 interface Props {
 	modelValue: INodeParameterResourceLocator;
@@ -34,6 +35,7 @@ interface Props {
 	forceShowExpression?: boolean;
 	parameterIssues?: string[];
 	parameter: INodeProperties;
+	sampleWorkflow?: IWorkflowDataCreate;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -44,6 +46,7 @@ const props = withDefaults(defineProps<Props>(), {
 	forceShowExpression: false,
 	expressionDisplayValue: '',
 	parameterIssues: () => [],
+	sampleWorkflow: () => SAMPLE_SUBWORKFLOW_WORKFLOW,
 });
 
 const emit = defineEmits<{
@@ -205,36 +208,30 @@ onClickOutside(dropdown, () => {
 	isDropdownVisible.value = false;
 });
 
-const onAddResourceClicked = () => {
-	const subWorkflowNameRegex = /My\s+Sub-Workflow\s+\d+/;
-
-	const urlSearchParams = new URLSearchParams();
-
-	if (projectStore.currentProjectId) {
-		urlSearchParams.set('projectId', projectStore.currentProjectId);
-	}
-
+const onAddResourceClicked = async () => {
+	const projectId = projectStore.currentProjectId;
+	const sampleWorkflow = props.sampleWorkflow;
+	const workflowName = sampleWorkflow.name ?? 'My Sub-Workflow';
 	const sampleSubWorkflows = workflowsStore.allWorkflows.filter(
-		(w) => w.name && subWorkflowNameRegex.test(w.name),
+		(w) => w.name && new RegExp(workflowName).test(w.name),
 	);
 
-	urlSearchParams.set('sampleSubWorkflows', sampleSubWorkflows.length.toString());
-
+	const workflow: IWorkflowDataCreate = {
+		...sampleWorkflow,
+		name: `${workflowName} ${sampleSubWorkflows.length + 1}`,
+	};
+	if (projectId) {
+		workflow.projectId = projectId;
+	}
 	telemetry.track('User clicked create new sub-workflow button', {}, { withPostHog: true });
 
-	const sampleSubworkflowChannel = new BroadcastChannel(NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL);
+	const newWorkflow = await workflowsStore.createNewWorkflow(workflow);
+	const { href } = router.resolve({ name: VIEWS.WORKFLOW, params: { name: newWorkflow.id } });
+	await reloadWorkflows();
+	onInputChange(newWorkflow.id);
+	hideDropdown();
 
-	sampleSubworkflowChannel.onmessage = async (event: MessageEvent<{ workflowId: string }>) => {
-		const workflowId = event.data.workflowId;
-		await reloadWorkflows();
-		onInputChange(workflowId);
-		hideDropdown();
-	};
-
-	window.open(
-		`/workflows/onboarding/${SAMPLE_SUBWORKFLOW_WORKFLOW.meta.templateId}?${urlSearchParams.toString()}`,
-		'_blank',
-	);
+	window.open(href, '_blank');
 };
 </script>
 <template>
@@ -258,6 +255,7 @@ const onAddResourceClicked = () => {
 			}"
 			:width="width"
 			:event-bus="eventBus"
+			:value="modelValue"
 			@update:model-value="onListItemSelected"
 			@filter="onSearchFilter"
 			@load-more="populateNextWorkflowsPage"
diff --git a/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
index 37ce7d48ca..d69e86aec3 100644
--- a/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
+++ b/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
@@ -28,19 +28,6 @@ exports[`InputPanel > should render 1`] = `
           role="radiogroup"
         >
           
-          <label
-            aria-checked="false"
-            class="n8n-radio-button container hoverable"
-            role="radio"
-            tabindex="-1"
-          >
-            <div
-              class="button medium"
-              data-test-id="radio-button-mapping"
-            >
-              Mapping
-            </div>
-          </label>
           <label
             aria-checked="true"
             class="n8n-radio-button container hoverable"
@@ -49,6 +36,19 @@ exports[`InputPanel > should render 1`] = `
           >
             <div
               class="button active medium"
+              data-test-id="radio-button-mapping"
+            >
+              Mapping
+            </div>
+          </label>
+          <label
+            aria-checked="false"
+            class="n8n-radio-button container hoverable"
+            role="radio"
+            tabindex="-1"
+          >
+            <div
+              class="button medium"
               data-test-id="radio-button-debugging"
             >
               Debugging
diff --git a/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
index 5321a5b16a..be28af8e45 100644
--- a/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
+++ b/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
@@ -2,12 +2,21 @@
 
 exports[`MultipleParameter > should render correctly 1`] = `
 "<div data-v-a47e4507="" class="duplicate-parameter">
-  <div data-v-a47e4507="" class="container" data-test-id="input-label"><label class="n8n-input-label inputLabel heading underline small">
-      <div class="title"><span class="n8n-text text-dark size-small bold">Additional Fields <!--v-if--></span></div>
+  <div data-v-a47e4507="" class="container" data-test-id="input-label">
+    <div class="labelRow"><label class="n8n-input-label inputLabel heading underline small">
+        <div class="main-content">
+          <div class="title"><span class="n8n-text text-dark size-small bold">Additional Fields <!--v-if--></span></div>
+          <!--v-if-->
+        </div>
+        <div class="trailing-content">
+          <!--v-if-->
+          <!--v-if-->
+          <!--v-if-->
+        </div>
+      </label>
       <!--v-if-->
-      <!--v-if-->
-      <!--v-if-->
-    </label></div>
+    </div>
+  </div>
   <div data-v-a47e4507="" class="add-item-wrapper">
     <div data-v-a47e4507="" class="no-items-exist"><span data-v-a47e4507="" class="n8n-text size-small regular">Currently no items exist</span></div><button data-v-a47e4507="" class="button button tertiary medium block" aria-live="polite">
       <!--v-if--><span>Add item</span>
diff --git a/packages/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap
new file mode 100644
index 0000000000..5e72b2eb94
--- /dev/null
+++ b/packages/editor-ui/src/components/__snapshots__/PushConnectionTracker.test.ts.snap
@@ -0,0 +1,55 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`PushConnectionTracker > should not render error when connected and connection not requested 1`] = `
+<div>
+  <span>
+    
+    
+  </span>
+</div>
+`;
+
+exports[`PushConnectionTracker > should not render error when connected and connection requested 1`] = `
+<div>
+  <span>
+    
+    
+  </span>
+</div>
+`;
+
+exports[`PushConnectionTracker > should render error when disconnected and connection requested 1`] = `
+<div>
+  <span>
+    <div
+      class="push-connection-lost primary-color"
+    >
+      
+      <span
+        class="el-tooltip__trigger"
+      >
+        <svg
+          aria-hidden="true"
+          class="svg-inline--fa fa-exclamation-triangle fa-w-18"
+          data-icon="exclamation-triangle"
+          data-prefix="fas"
+          focusable="false"
+          role="img"
+          viewBox="0 0 576 512"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path
+            class=""
+            d="M569.517 440.013C587.975 472.007 564.806 512 527.94 512H48.054c-36.937 0-59.999-40.055-41.577-71.987L246.423 23.985c18.467-32.009 64.72-31.951 83.154 0l239.94 416.028zM288 354c-25.405 0-46 20.595-46 46s20.595 46 46 46 46-20.595 46-46-20.595-46-46-46zm-43.673-165.346l7.418 136c.347 6.364 5.609 11.346 11.982 11.346h48.546c6.373 0 11.635-4.982 11.982-11.346l7.418-136c.375-6.874-5.098-12.654-11.982-12.654h-63.383c-6.884 0-12.356 5.78-11.981 12.654z"
+            fill="currentColor"
+          />
+        </svg>
+          Connection lost
+      </span>
+      <!--teleport start-->
+      <!--teleport end-->
+      
+    </div>
+  </span>
+</div>
+`;
diff --git a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
index d7d666d2bb..9d526dc740 100644
--- a/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__snapshots__/VirtualSchema.test.ts.snap
@@ -1,13 +1,768 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`VirtualSchema.vue > renders preview schema when enabled and available 1`] = `
+<div>
+  <div
+    class="run-data-schema full-height"
+    data-v-d00cba9a=""
+  >
+    <!--v-if-->
+    <div
+      class="full-height"
+      data-v-d00cba9a=""
+    >
+      
+      <div
+        class="full-height scroller"
+        data-v-d00cba9a=""
+        min-item-size="38"
+      >
+        
+        
+        
+        <div
+          class="schema-header-wrapper"
+          data-v-882a318e=""
+          data-v-d00cba9a=""
+          id="Manual Trigger"
+          type="header"
+        >
+          <div
+            class="schema-header"
+            data-test-id="run-data-schema-header"
+            data-v-882a318e=""
+          >
+            <div
+              class="toggle"
+              data-v-882a318e=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-882a318e=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+            <div
+              class="n8n-node-icon icon icon-trigger icon icon-trigger"
+              data-v-882a318e=""
+            >
+              <div
+                class="nodeIconWrapper"
+                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              >
+                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+                
+                <div
+                  class="icon"
+                >
+                  <img
+                    class="nodeIconImage"
+                  />
+                  <!--v-if-->
+                </div>
+                
+              </div>
+            </div>
+            <div
+              class="title"
+              data-v-882a318e=""
+            >
+              Manual Trigger 
+              <!--v-if-->
+            </div>
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="trigger-icon"
+              data-v-882a318e=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="bolt"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="xs"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <!--v-if-->
+          </div>
+          <div
+            class="notice"
+            data-test-id="schema-preview-warning"
+            data-v-882a318e=""
+            theme="warning"
+          >
+            
+            
+            This is a preview of the schema, execute the node to see the exact schema and data. 
+            
+            <a
+              class="n8n-link"
+              data-v-882a318e=""
+              href="https://docs.n8n.io/data/data-editing/"
+              target="_blank"
+            >
+              
+              <span
+                class="primary"
+              >
+                <span
+                  class="n8n-text size-small regular"
+                >
+                  
+                  
+                  Learn more
+                  
+                  
+                </span>
+              </span>
+              
+            </a>
+            
+            
+            
+          </div>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <div
+              class="toggle"
+              data-v-0f5e7239=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-0f5e7239=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+          </div>
+          <div
+            class="pill pill--preview"
+            data-depth="1"
+            data-name="account"
+            data-nest-level="1"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path=".account"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json.account }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="cube"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                account
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill pill--preview"
+            data-depth="1"
+            data-name="id"
+            data-nest-level="2"
+            data-node-type="n8n-nodes-base.manualTrigger"
+            data-path=".account.id"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $json.account.id }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                id
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill pill--preview"
+            data-name="..."
+            data-nest-level="1"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon=""
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                ...
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-header-wrapper"
+          data-v-882a318e=""
+          data-v-d00cba9a=""
+          id="Set2"
+          type="header"
+        >
+          <div
+            class="schema-header"
+            data-test-id="run-data-schema-header"
+            data-v-882a318e=""
+          >
+            <div
+              class="toggle"
+              data-v-882a318e=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-882a318e=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+            <div
+              class="n8n-node-icon icon icon"
+              data-v-882a318e=""
+            >
+              <div
+                class="nodeIconWrapper"
+                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              >
+                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+                
+                <div
+                  class="icon"
+                >
+                  <img
+                    class="nodeIconImage"
+                  />
+                  <!--v-if-->
+                </div>
+                
+              </div>
+            </div>
+            <div
+              class="title"
+              data-v-882a318e=""
+            >
+              Set2 
+              <!--v-if-->
+            </div>
+            <!--v-if-->
+            <!--v-if-->
+          </div>
+          <div
+            class="notice"
+            data-test-id="schema-preview-warning"
+            data-v-882a318e=""
+            theme="warning"
+          >
+            
+            
+            This is a preview of the schema, execute the node to see the exact schema and data. 
+            
+            <a
+              class="n8n-link"
+              data-v-882a318e=""
+              href="https://docs.n8n.io/data/data-editing/"
+              target="_blank"
+            >
+              
+              <span
+                class="primary"
+              >
+                <span
+                  class="n8n-text size-small regular"
+                >
+                  
+                  
+                  Learn more
+                  
+                  
+                </span>
+              </span>
+              
+            </a>
+            
+            
+            
+          </div>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <div
+              class="toggle"
+              data-v-0f5e7239=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-0f5e7239=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+          </div>
+          <div
+            class="pill pill--preview"
+            data-depth="2"
+            data-name="account"
+            data-nest-level="1"
+            data-node-type="n8n-nodes-base.set"
+            data-path=".account"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('Set2').item.json.account }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="cube"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                account
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill pill--preview"
+            data-depth="2"
+            data-name="id"
+            data-nest-level="2"
+            data-node-type="n8n-nodes-base.set"
+            data-path=".account.id"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+            data-value="{{ $('Set2').item.json.account.id }}"
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon="font"
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                id
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            
+            <span>
+              <!--v-if-->
+              
+            </span>
+            
+          </span>
+        </div>
+        
+        
+        
+        
+        <div
+          class="schema-item draggable"
+          data-test-id="run-data-schema-item"
+          data-v-0f5e7239=""
+          data-v-d00cba9a=""
+          type="item"
+        >
+          <div
+            class="toggle-container"
+            data-v-0f5e7239=""
+          >
+            <!--v-if-->
+          </div>
+          <div
+            class="pill pill--preview"
+            data-name="..."
+            data-nest-level="1"
+            data-target="mappable"
+            data-test-id="run-data-schema-node-name"
+            data-v-0f5e7239=""
+          >
+            <font-awesome-icon-stub
+              beat="false"
+              beatfade="false"
+              border="false"
+              bounce="false"
+              class="type-icon"
+              data-v-0f5e7239=""
+              fade="false"
+              fixedwidth="false"
+              flash="false"
+              flip="false"
+              icon=""
+              inverse="false"
+              listitem="false"
+              pulse="false"
+              shake="false"
+              size="sm"
+              spin="false"
+              spinpulse="false"
+              spinreverse="false"
+              swapopacity="false"
+              symbol="false"
+            />
+            <span
+              class="content title"
+              data-v-0f5e7239=""
+            >
+              
+              <span>
+                <!--v-if-->
+                ...
+              </span>
+              
+            </span>
+          </div>
+          <span
+            class="content text"
+            data-test-id="run-data-schema-item-value"
+            data-v-0f5e7239=""
+          >
+            <span />
+          </span>
+        </div>
+        
+        
+        
+      </div>
+      
+      <!--teleport start-->
+      <!--teleport end-->
+    </div>
+  </div>
+</div>
+`;
+
 exports[`VirtualSchema.vue > renders previous nodes schema for AI tools 1`] = `
 <div
   class="schema-header"
   data-test-id="run-data-schema-header"
   data-v-882a318e=""
-  data-v-d00cba9a=""
-  id="If"
-  type="header"
 >
   <div
     class="toggle"
@@ -80,9 +835,6 @@ exports[`VirtualSchema.vue > renders schema for correct output branch 1`] = `
   class="schema-header"
   data-test-id="run-data-schema-header"
   data-v-882a318e=""
-  data-v-d00cba9a=""
-  id="If"
-  type="header"
 >
   <div
     class="toggle"
@@ -603,103 +1355,111 @@ exports[`VirtualSchema.vue > renders schema with spaces and dots 1`] = `
       >
         
         
+        
         <div
-          class="schema-header"
-          data-test-id="run-data-schema-header"
+          class="schema-header-wrapper"
           data-v-882a318e=""
           data-v-d00cba9a=""
           id="Manual Trigger"
           type="header"
         >
           <div
-            class="toggle"
+            class="schema-header"
+            data-test-id="run-data-schema-header"
             data-v-882a318e=""
           >
+            <div
+              class="toggle"
+              data-v-882a318e=""
+            >
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-882a318e=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
+            </div>
+            <div
+              class="n8n-node-icon icon icon-trigger icon icon-trigger"
+              data-v-882a318e=""
+            >
+              <div
+                class="nodeIconWrapper"
+                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              >
+                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+                
+                <div
+                  class="icon"
+                >
+                  <img
+                    class="nodeIconImage"
+                  />
+                  <!--v-if-->
+                </div>
+                
+              </div>
+            </div>
+            <div
+              class="title"
+              data-v-882a318e=""
+            >
+              Manual Trigger 
+              <!--v-if-->
+            </div>
             <font-awesome-icon-stub
               beat="false"
               beatfade="false"
               border="false"
               bounce="false"
-              class="collapse-icon"
+              class="trigger-icon"
               data-v-882a318e=""
               fade="false"
               fixedwidth="false"
               flash="false"
               flip="false"
-              icon="angle-down"
+              icon="bolt"
               inverse="false"
               listitem="false"
               pulse="false"
               shake="false"
+              size="xs"
               spin="false"
               spinpulse="false"
               spinreverse="false"
               swapopacity="false"
               symbol="false"
             />
-          </div>
-          <div
-            class="n8n-node-icon icon icon-trigger icon icon-trigger"
-            data-v-882a318e=""
-          >
             <div
-              class="nodeIconWrapper"
-              style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              class="item-count"
+              data-test-id="run-data-schema-node-item-count"
+              data-v-882a318e=""
             >
-              <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-              
-              <div
-                class="icon"
-              >
-                <img
-                  class="nodeIconImage"
-                />
-                <!--v-if-->
-              </div>
-              
+              1 item
             </div>
           </div>
-          <div
-            class="title"
-            data-v-882a318e=""
-          >
-            Manual Trigger 
-            <!--v-if-->
-          </div>
-          <font-awesome-icon-stub
-            beat="false"
-            beatfade="false"
-            border="false"
-            bounce="false"
-            class="trigger-icon"
-            data-v-882a318e=""
-            fade="false"
-            fixedwidth="false"
-            flash="false"
-            flip="false"
-            icon="bolt"
-            inverse="false"
-            listitem="false"
-            pulse="false"
-            shake="false"
-            size="xs"
-            spin="false"
-            spinpulse="false"
-            spinreverse="false"
-            swapopacity="false"
-            symbol="false"
-          />
-          <div
-            class="item-count"
-            data-test-id="run-data-schema-node-item-count"
-            data-v-882a318e=""
-          >
-            1 item
-          </div>
+          <!--v-if-->
         </div>
         
         
         
+        
         <div
           class="schema-item draggable"
           data-test-id="run-data-schema-item"
@@ -1147,75 +1907,83 @@ exports[`VirtualSchema.vue > renders schema with spaces and dots 1`] = `
         
         
         
+        
         <div
-          class="schema-header"
-          data-test-id="run-data-schema-header"
+          class="schema-header-wrapper"
           data-v-882a318e=""
           data-v-d00cba9a=""
           id="Set2"
           type="header"
         >
           <div
-            class="toggle"
-            data-v-882a318e=""
-          >
-            <font-awesome-icon-stub
-              beat="false"
-              beatfade="false"
-              border="false"
-              bounce="false"
-              class="collapse-icon"
-              data-v-882a318e=""
-              fade="false"
-              fixedwidth="false"
-              flash="false"
-              flip="false"
-              icon="angle-down"
-              inverse="false"
-              listitem="false"
-              pulse="false"
-              shake="false"
-              spin="false"
-              spinpulse="false"
-              spinreverse="false"
-              swapopacity="false"
-              symbol="false"
-            />
-          </div>
-          <div
-            class="n8n-node-icon icon icon"
+            class="schema-header"
+            data-test-id="run-data-schema-header"
             data-v-882a318e=""
           >
             <div
-              class="nodeIconWrapper"
-              style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              class="toggle"
+              data-v-882a318e=""
             >
-              <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
-              
-              <div
-                class="icon"
-              >
-                <img
-                  class="nodeIconImage"
-                />
-                <!--v-if-->
-              </div>
-              
+              <font-awesome-icon-stub
+                beat="false"
+                beatfade="false"
+                border="false"
+                bounce="false"
+                class="collapse-icon"
+                data-v-882a318e=""
+                fade="false"
+                fixedwidth="false"
+                flash="false"
+                flip="false"
+                icon="angle-down"
+                inverse="false"
+                listitem="false"
+                pulse="false"
+                shake="false"
+                spin="false"
+                spinpulse="false"
+                spinreverse="false"
+                swapopacity="false"
+                symbol="false"
+              />
             </div>
-          </div>
-          <div
-            class="title"
-            data-v-882a318e=""
-          >
-            Set2 
+            <div
+              class="n8n-node-icon icon icon"
+              data-v-882a318e=""
+            >
+              <div
+                class="nodeIconWrapper"
+                style="width: 12px; height: 12px; font-size: 12px; line-height: 12px;"
+              >
+                <!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
+                
+                <div
+                  class="icon"
+                >
+                  <img
+                    class="nodeIconImage"
+                  />
+                  <!--v-if-->
+                </div>
+                
+              </div>
+            </div>
+            <div
+              class="title"
+              data-v-882a318e=""
+            >
+              Set2 
+              <!--v-if-->
+            </div>
+            <!--v-if-->
             <!--v-if-->
           </div>
           <!--v-if-->
-          <!--v-if-->
         </div>
         
         
         
+        
         <div
           class="schema-item draggable"
           data-test-id="run-data-schema-item"
diff --git a/packages/editor-ui/src/components/canvas/Canvas.test.ts b/packages/editor-ui/src/components/canvas/Canvas.test.ts
index bf7dae71a7..41f1f7ad0f 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.test.ts
+++ b/packages/editor-ui/src/components/canvas/Canvas.test.ts
@@ -6,7 +6,7 @@ import { createPinia, setActivePinia } from 'pinia';
 import type { CanvasConnection, CanvasNode } from '@/types';
 import { createCanvasConnection, createCanvasNodeElement } from '@/__tests__/data';
 import { NodeConnectionType } from 'n8n-workflow';
-import type { useDeviceSupport } from 'n8n-design-system';
+import type { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 
 const matchMedia = global.window.matchMedia;
 // @ts-expect-error Initialize window object
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index 729ecd782b..c414a0641f 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -1,19 +1,27 @@
 <script lang="ts" setup>
-import type {
-	CanvasConnection,
-	CanvasNode,
-	CanvasNodeMoveEvent,
-	CanvasEventBusEvents,
-	ConnectStartEvent,
+import {
+	type CanvasConnection,
+	type CanvasNode,
+	type CanvasNodeMoveEvent,
+	type CanvasEventBusEvents,
+	type ConnectStartEvent,
+	CanvasNodeRenderType,
 } from '@/types';
-import type { Connection, XYPosition, NodeDragEvent, GraphNode } from '@vue-flow/core';
+import type {
+	Connection,
+	XYPosition,
+	NodeDragEvent,
+	NodeMouseEvent,
+	GraphNode,
+} from '@vue-flow/core';
 import { useVueFlow, VueFlow, PanelPosition, MarkerType } from '@vue-flow/core';
 import { MiniMap } from '@vue-flow/minimap';
 import Node from './elements/nodes/CanvasNode.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
 import { computed, onMounted, onUnmounted, provide, ref, toRef, useCssModule, watch } from 'vue';
 import type { EventBus } from 'n8n-design-system';
-import { createEventBus, useDeviceSupport } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useContextMenu, type ContextMenuAction } from '@/composables/useContextMenu';
 import { useKeybindings } from '@/composables/useKeybindings';
 import ContextMenu from '@/components/ContextMenu/ContextMenu.vue';
@@ -27,6 +35,7 @@ import CanvasArrowHeadMarker from './elements/edges/CanvasArrowHeadMarker.vue';
 import CanvasBackground from './elements/background/CanvasBackground.vue';
 import { useCanvasTraversal } from '@/composables/useCanvasTraversal';
 import { NodeConnectionType } from 'n8n-workflow';
+import { useCanvasNodeHover } from '@/composables/useCanvasNodeHover';
 
 const $style = useCssModule();
 
@@ -79,7 +88,6 @@ const props = withDefaults(
 		readOnly?: boolean;
 		executing?: boolean;
 		keyBindings?: boolean;
-		showBugReportingButton?: boolean;
 		loading?: boolean;
 	}>(),
 	{
@@ -212,8 +220,9 @@ const keyMap = computed(() => ({
 	ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
 	enter: emitWithLastSelectedNode((id) => onSetNodeActive(id)),
 	ctrl_a: () => addSelectedNodes(graphNodes.value),
-	'shift_+|+|=': async () => await onZoomIn(),
-	'shift+_|-|_': async () => await onZoomOut(),
+	// Support both key and code for zooming in and out
+	'shift_+|+|=|shift_Equal|Equal': async () => await onZoomIn(),
+	'shift+_|-|_|shift_Minus|Minus': async () => await onZoomOut(),
 	0: async () => await onResetZoom(),
 	1: async () => await onFitView(),
 	ArrowUp: emitWithLastSelectedNode(selectUpperSiblingNode),
@@ -250,6 +259,20 @@ const hasSelection = computed(() => selectedNodes.value.length > 0);
 const selectedNodeIds = computed(() => selectedNodes.value.map((node) => node.id));
 
 const lastSelectedNode = ref<GraphNode>();
+const triggerNodes = computed(() =>
+	props.nodes.filter(
+		(node) =>
+			node.data?.render.type === CanvasNodeRenderType.Default && node.data.render.options.trigger,
+	),
+);
+
+const hoveredTriggerNode = useCanvasNodeHover(triggerNodes, vueFlow, (nodeRect) => ({
+	x: nodeRect.x - nodeRect.width * 2, // should cover the width of trigger button
+	y: nodeRect.y - nodeRect.height,
+	width: nodeRect.width * 4,
+	height: nodeRect.height * 3,
+}));
+
 watch(selectedNodes, (nodes) => {
 	if (!lastSelectedNode.value || !nodes.find((node) => node.id === lastSelectedNode.value?.id)) {
 		lastSelectedNode.value = nodes[nodes.length - 1];
@@ -272,6 +295,14 @@ function onNodeDragStop(event: NodeDragEvent) {
 	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
 }
 
+function onNodeClick({ event, node }: NodeMouseEvent) {
+	if (event.ctrlKey || event.metaKey || selectedNodes.value.length < 2) {
+		return;
+	}
+
+	onSelectNodes({ ids: [node.id] });
+}
+
 function onSelectionDragStop(event: NodeDragEvent) {
 	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
 }
@@ -505,6 +536,13 @@ function onOpenContextMenu(event: MouseEvent) {
 	});
 }
 
+function onOpenSelectionContextMenu({ event }: { event: MouseEvent }) {
+	contextMenu.open(event, {
+		source: 'canvas',
+		nodeIds: selectedNodeIds.value,
+	});
+}
+
 function onOpenNodeContextMenu(
 	id: string,
 	event: MouseEvent,
@@ -676,7 +714,9 @@ provide(CanvasKey, {
 		@move-start="onPaneMoveStart"
 		@move-end="onPaneMoveEnd"
 		@node-drag-stop="onNodeDragStop"
+		@node-click="onNodeClick"
 		@selection-drag-stop="onSelectionDragStop"
+		@selection-context-menu="onOpenSelectionContextMenu"
 		@dragover="onDragOver"
 		@drop="onDrop"
 	>
@@ -686,6 +726,7 @@ provide(CanvasKey, {
 				:read-only="readOnly"
 				:event-bus="eventBus"
 				:hovered="nodesHoveredById[nodeProps.id]"
+				:nearby-hovered="nodeProps.id === hoveredTriggerNode.id.value"
 				@delete="onDeleteNode"
 				@run="onRunNode"
 				@select="onSelectNode"
@@ -747,7 +788,6 @@ provide(CanvasKey, {
 			:class="$style.canvasControls"
 			:position="controlsPosition"
 			:show-interactive="false"
-			:show-bug-reporting-button="showBugReportingButton"
 			:zoom="viewport.zoom"
 			@zoom-to-fit="onFitView"
 			@zoom-in="onZoomIn"
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
index d32b974a40..1e6ee9972b 100644
--- a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
+++ b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
@@ -23,7 +23,6 @@ const props = withDefaults(
 		eventBus?: EventBus<CanvasEventBusEvents>;
 		readOnly?: boolean;
 		executing?: boolean;
-		showBugReportingButton?: boolean;
 	}>(),
 	{
 		id: 'canvas',
@@ -70,7 +69,6 @@ onNodesInitialized(() => {
 				:id="id"
 				:nodes="mappedNodes"
 				:connections="mappedConnections"
-				:show-bug-reporting-button="showBugReportingButton"
 				:event-bus="eventBus"
 				:read-only="readOnly"
 				v-bind="$attrs"
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
index 9b157da1b8..235f63e085 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
@@ -3,12 +3,6 @@ import CanvasControlButtons from './CanvasControlButtons.vue';
 import { setActivePinia } from 'pinia';
 import { createTestingPinia } from '@pinia/testing';
 
-const MOCK_URL = 'mock-url';
-
-vi.mock('@/composables/useBugReporting', () => ({
-	useBugReporting: () => ({ getReportingURL: () => MOCK_URL }),
-}));
-
 const renderComponent = createComponentRenderer(CanvasControlButtons);
 
 describe('CanvasControlButtons', () => {
@@ -17,27 +11,11 @@ describe('CanvasControlButtons', () => {
 	});
 
 	it('should render correctly', () => {
-		const wrapper = renderComponent({
-			props: {
-				showBugReportingButton: true,
-			},
-		});
-
-		expect(wrapper.getByTestId('zoom-in-button')).toBeVisible();
-		expect(wrapper.getByTestId('zoom-out-button')).toBeVisible();
-		expect(wrapper.getByTestId('zoom-to-fit')).toBeVisible();
-		expect(wrapper.getByTestId('report-bug')).toBeVisible();
-
-		expect(wrapper.html()).toMatchSnapshot();
-	});
-
-	it('should render correctly without bug reporting button', () => {
 		const wrapper = renderComponent();
 
 		expect(wrapper.getByTestId('zoom-in-button')).toBeVisible();
 		expect(wrapper.getByTestId('zoom-out-button')).toBeVisible();
 		expect(wrapper.getByTestId('zoom-to-fit')).toBeVisible();
-		expect(wrapper.queryByTestId('report-bug')).not.toBeInTheDocument();
 
 		expect(wrapper.html()).toMatchSnapshot();
 	});
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
index 72e1e6251c..5d9a7a3435 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
@@ -2,18 +2,14 @@
 import { Controls } from '@vue-flow/controls';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 import { computed } from 'vue';
-import { useBugReporting } from '@/composables/useBugReporting';
-import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 
 const props = withDefaults(
 	defineProps<{
 		zoom?: number;
-		showBugReportingButton?: boolean;
 	}>(),
 	{
 		zoom: 1,
-		showBugReportingButton: false,
 	},
 );
 
@@ -24,8 +20,6 @@ const emit = defineEmits<{
 	'zoom-to-fit': [];
 }>();
 
-const { getReportingURL } = useBugReporting();
-const telemetry = useTelemetry();
 const i18n = useI18n();
 
 const isResetZoomVisible = computed(() => props.zoom !== 1);
@@ -45,10 +39,6 @@ function onZoomOut() {
 function onZoomToFit() {
 	emit('zoom-to-fit');
 }
-
-function trackBugReport() {
-	telemetry.track('User clicked bug report button in canvas', {}, { withPostHog: true });
-}
 </script>
 <template>
 	<Controls :show-zoom="false" :show-fit-view="false">
@@ -95,14 +85,6 @@ function trackBugReport() {
 				@click="onResetZoom"
 			/>
 		</KeyboardShortcutTooltip>
-		<KeyboardShortcutTooltip
-			v-if="props.showBugReportingButton"
-			:label="i18n.baseText('nodeView.reportBug')"
-		>
-			<a :href="getReportingURL()" target="_blank" @click="trackBugReport">
-				<N8nIconButton type="tertiary" size="large" icon="bug" data-test-id="report-bug" />
-			</a>
-		</KeyboardShortcutTooltip>
 	</Controls>
 </template>
 
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
index cf8ea70a93..d5e55528b1 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
@@ -20,35 +20,6 @@ exports[`CanvasControlButtons > should render correctly 1`] = `
   </button>
   <!--teleport start-->
   <!--teleport end-->
-  <!--v-if--><a href="mock-url" target="_blank" class="el-tooltip__trigger"><button class="button button tertiary large withIcon square" aria-live="polite" data-test-id="report-bug"><span class="icon"><span class="n8n-text compact size-large regular n8n-icon n8n-icon"><svg class="svg-inline--fa fa-bug fa-w-16 large" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="bug" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="" fill="currentColor" d="M511.988 288.9c-.478 17.43-15.217 31.1-32.653 31.1H424v16c0 21.864-4.882 42.584-13.6 61.145l60.228 60.228c12.496 12.497 12.496 32.758 0 45.255-12.498 12.497-32.759 12.496-45.256 0l-54.736-54.736C345.886 467.965 314.351 480 280 480V236c0-6.627-5.373-12-12-12h-24c-6.627 0-12 5.373-12 12v244c-34.351 0-65.886-12.035-90.636-32.108l-54.736 54.736c-12.498 12.497-32.759 12.496-45.256 0-12.496-12.497-12.496-32.758 0-45.255l60.228-60.228C92.882 378.584 88 357.864 88 336v-16H32.666C15.23 320 .491 306.33.013 288.9-.484 270.816 14.028 256 32 256h56v-58.745l-46.628-46.628c-12.496-12.497-12.496-32.758 0-45.255 12.498-12.497 32.758-12.497 45.256 0L141.255 160h229.489l54.627-54.627c12.498-12.497 32.758-12.497 45.256 0 12.496 12.497 12.496 32.758 0 45.255L424 197.255V256h56c17.972 0 32.484 14.816 31.988 32.9zM257 0c-61.856 0-112 50.144-112 112h224C369 50.144 318.856 0 257 0z"></path></svg></span></span>
-      <!--v-if-->
-    </button></a>
-  <!--teleport start-->
-  <!--teleport end-->
-</div>"
-`;
-
-exports[`CanvasControlButtons > should render correctly without bug reporting button 1`] = `
-"<div class="vue-flow__panel bottom left vue-flow__controls" style="pointer-events: all;">
-  <!---->
-  <!----><button class="vue-flow__controls-button vue-flow__controls-interactive"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 32">
-      <path d="M21.333 10.667H19.81V7.619C19.81 3.429 16.38 0 12.19 0c-4.114 1.828-1.37 2.133.305 2.438 1.676.305 4.42 2.59 4.42 5.181v3.048H3.047A3.056 3.056 0 0 0 0 13.714v15.238A3.056 3.056 0 0 0 3.048 32h18.285a3.056 3.056 0 0 0 3.048-3.048V13.714a3.056 3.056 0 0 0-3.048-3.047zM12.19 24.533a3.056 3.056 0 0 1-3.047-3.047 3.056 3.056 0 0 1 3.047-3.048 3.056 3.056 0 0 1 3.048 3.048 3.056 3.056 0 0 1-3.048 3.047z"></path>
-    </svg>
-    <!---->
-  </button><button class="button button tertiary large withIcon square el-tooltip__trigger el-tooltip__trigger" aria-live="polite" data-test-id="zoom-to-fit"><span class="icon"><span class="n8n-text compact size-large regular n8n-icon n8n-icon"><svg class="svg-inline--fa fa-expand fa-w-14 large" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="expand" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path class="" fill="currentColor" d="M0 180V56c0-13.3 10.7-24 24-24h124c6.6 0 12 5.4 12 12v40c0 6.6-5.4 12-12 12H64v84c0 6.6-5.4 12-12 12H12c-6.6 0-12-5.4-12-12zM288 44v40c0 6.6 5.4 12 12 12h84v84c0 6.6 5.4 12 12 12h40c6.6 0 12-5.4 12-12V56c0-13.3-10.7-24-24-24H300c-6.6 0-12 5.4-12 12zm148 276h-40c-6.6 0-12 5.4-12 12v84h-84c-6.6 0-12 5.4-12 12v40c0 6.6 5.4 12 12 12h124c13.3 0 24-10.7 24-24V332c0-6.6-5.4-12-12-12zM160 468v-40c0-6.6-5.4-12-12-12H64v-84c0-6.6-5.4-12-12-12H12c-6.6 0-12 5.4-12 12v124c0 13.3 10.7 24 24 24h124c6.6 0 12-5.4 12-12z"></path></svg></span></span>
-    <!--v-if-->
-  </button>
-  <!--teleport start-->
-  <!--teleport end--><button class="button button tertiary large withIcon square el-tooltip__trigger el-tooltip__trigger" aria-live="polite" data-test-id="zoom-in-button"><span class="icon"><span class="n8n-text compact size-large regular n8n-icon n8n-icon"><svg class="svg-inline--fa fa-search-plus fa-w-16 large" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="search-plus" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="" fill="currentColor" d="M304 192v32c0 6.6-5.4 12-12 12h-56v56c0 6.6-5.4 12-12 12h-32c-6.6 0-12-5.4-12-12v-56h-56c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h56v-56c0-6.6 5.4-12 12-12h32c6.6 0 12 5.4 12 12v56h56c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"></path></svg></span></span>
-    <!--v-if-->
-  </button>
-  <!--teleport start-->
-  <!--teleport end--><button class="button button tertiary large withIcon square el-tooltip__trigger el-tooltip__trigger" aria-live="polite" data-test-id="zoom-out-button"><span class="icon"><span class="n8n-text compact size-large regular n8n-icon n8n-icon"><svg class="svg-inline--fa fa-search-minus fa-w-16 large" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="search-minus" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path class="" fill="currentColor" d="M304 192v32c0 6.6-5.4 12-12 12H124c-6.6 0-12-5.4-12-12v-32c0-6.6 5.4-12 12-12h168c6.6 0 12 5.4 12 12zm201 284.7L476.7 505c-9.4 9.4-24.6 9.4-33.9 0L343 405.3c-4.5-4.5-7-10.6-7-17V372c-35.3 27.6-79.7 44-128 44C93.1 416 0 322.9 0 208S93.1 0 208 0s208 93.1 208 208c0 48.3-16.4 92.7-44 128h16.3c6.4 0 12.5 2.5 17 7l99.7 99.7c9.3 9.4 9.3 24.6 0 34zM344 208c0-75.2-60.8-136-136-136S72 132.8 72 208s60.8 136 136 136 136-60.8 136-136z"></path></svg></span></span>
-    <!--v-if-->
-  </button>
-  <!--teleport start-->
-  <!--teleport end-->
-  <!--v-if-->
   <!--v-if-->
 </div>"
 `;
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
index 3a2defc6a0..e8075b82ec 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
@@ -1,10 +1,10 @@
-import CanvasEdge, { type CanvasEdgeProps } from './CanvasEdge.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import { setActivePinia } from 'pinia';
+import userEvent from '@testing-library/user-event';
 import { Position } from '@vue-flow/core';
 import { NodeConnectionType } from 'n8n-workflow';
-import userEvent from '@testing-library/user-event';
+import { setActivePinia } from 'pinia';
+import CanvasEdge, { type CanvasEdgeProps } from './CanvasEdge.vue';
 
 const DEFAULT_PROPS = {
 	sourceX: 0,
@@ -35,7 +35,7 @@ describe('CanvasEdge', () => {
 				hovered: true,
 			},
 		});
-		await userEvent.hover(getByTestId('edge-label-wrapper'));
+		await userEvent.hover(getByTestId('edge-label'));
 		const deleteButton = getByTestId('delete-connection-button');
 
 		await userEvent.click(deleteButton);
@@ -49,7 +49,7 @@ describe('CanvasEdge', () => {
 				hovered: true,
 			},
 		});
-		await userEvent.hover(getByTestId('edge-label-wrapper'));
+		await userEvent.hover(getByTestId('edge-label'));
 
 		const addButton = getByTestId('add-connection-button');
 
@@ -65,12 +65,36 @@ describe('CanvasEdge', () => {
 			},
 		});
 
-		await userEvent.hover(getByTestId('edge-label-wrapper'));
+		await userEvent.hover(getByTestId('edge-label'));
 
 		expect(() => getByTestId('add-connection-button')).toThrow();
 		expect(() => getByTestId('delete-connection-button')).toThrow();
 	});
 
+	it('should hide toolbar after delay', async () => {
+		vi.useFakeTimers();
+
+		const user = userEvent.setup({
+			advanceTimers: vi.advanceTimersByTime,
+		});
+
+		const { rerender, getByTestId, queryByTestId } = renderComponent({
+			props: { hovered: true },
+		});
+
+		await user.hover(getByTestId('edge-label'));
+		expect(queryByTestId('canvas-edge-toolbar')).toBeInTheDocument();
+
+		await rerender({ hovered: false });
+
+		await user.unhover(getByTestId('edge-label'));
+		expect(getByTestId('canvas-edge-toolbar')).toBeInTheDocument();
+
+		await vi.advanceTimersByTimeAsync(300);
+
+		expect(queryByTestId('canvas-edge-toolbar')).not.toBeInTheDocument();
+	});
+
 	it('should compute edgeStyle correctly', () => {
 		const { container } = renderComponent();
 
@@ -151,4 +175,32 @@ describe('CanvasEdge', () => {
 
 		expect(edge).toHaveAttribute('d', 'M0,0 C62.5,0 -162.5,-100 -100,-100');
 	});
+
+	it('should render a label above the connector when it is straight', () => {
+		const { container } = renderComponent({
+			props: {
+				...DEFAULT_PROPS,
+				sourceY: 50,
+				targetY: 50,
+			},
+		});
+
+		const label = container.querySelector('.vue-flow__edge-label')?.childNodes[0];
+
+		expect(label).toHaveAttribute('style', 'transform: translate(0, -100%);');
+	});
+
+	it("should render a label in the middle of the connector when it isn't straight", () => {
+		const { container } = renderComponent({
+			props: {
+				...DEFAULT_PROPS,
+				sourceY: 0,
+				targetY: 100,
+			},
+		});
+
+		const label = container.querySelector('.vue-flow__edge-label')?.childNodes[0];
+
+		expect(label).toHaveAttribute('style', 'transform: translate(0, 0%);');
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
index feb15a8cbf..4233bcd26f 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.vue
@@ -5,7 +5,7 @@ import { isValidNodeConnectionType } from '@/utils/typeGuards';
 import type { Connection, EdgeProps } from '@vue-flow/core';
 import { BaseEdge, EdgeLabelRenderer } from '@vue-flow/core';
 import { NodeConnectionType } from 'n8n-workflow';
-import { computed, useCssModule, toRef } from 'vue';
+import { computed, ref, toRef, useCssModule, watch } from 'vue';
 import CanvasEdgeToolbar from './CanvasEdgeToolbar.vue';
 import { getEdgeRenderData } from './utils';
 
@@ -33,7 +33,26 @@ const connectionType = computed(() =>
 		: NodeConnectionType.Main,
 );
 
-const renderToolbar = computed(() => props.hovered && !props.readOnly);
+const delayedHovered = ref(props.hovered);
+const delayedHoveredSetTimeoutRef = ref<NodeJS.Timeout | null>(null);
+const delayedHoveredTimeout = 300;
+
+watch(
+	() => props.hovered,
+	(isHovered) => {
+		if (isHovered) {
+			if (delayedHoveredSetTimeoutRef.value) clearTimeout(delayedHoveredSetTimeoutRef.value);
+			delayedHovered.value = true;
+		} else {
+			delayedHoveredSetTimeoutRef.value = setTimeout(() => {
+				delayedHovered.value = false;
+			}, delayedHoveredTimeout);
+		}
+	},
+	{ immediate: true },
+);
+
+const renderToolbar = computed(() => (props.selected || delayedHovered.value) && !props.readOnly);
 
 const isMainConnection = computed(() => data.value.source.type === NodeConnectionType.Main);
 
@@ -67,15 +86,16 @@ const edgeClasses = computed(() => ({
 }));
 
 const edgeLabelStyle = computed(() => ({
+	transform: `translate(0, ${isConnectorStraight.value ? '-100%' : '0%'})`,
 	color: edgeColor.value,
 }));
 
-const edgeToolbarStyle = computed(() => {
-	return {
-		transform: `translate(-50%, -50%) translate(${labelPosition.value[0]}px,${labelPosition.value[1]}px)`,
-		...(props.hovered ? { zIndex: 1 } : {}),
-	};
-});
+const isConnectorStraight = computed(() => renderData.value.isConnectorStraight);
+
+const edgeToolbarStyle = computed(() => ({
+	transform: `translate(-50%, -50%) translate(${labelPosition.value[0]}px, ${labelPosition.value[1]}px)`,
+	...(props.hovered ? { zIndex: 1 } : {}),
+}));
 
 const edgeToolbarClasses = computed(() => ({
 	[$style.edgeLabelWrapper]: true,
@@ -118,22 +138,28 @@ function onEdgeLabelMouseLeave() {
 </script>
 
 <template>
-	<BaseEdge
-		v-for="(segment, index) in segments"
-		:id="`${id}-${index}`"
-		:key="segment[0]"
-		:class="edgeClasses"
-		:style="edgeStyle"
-		:path="segment[0]"
-		:marker-end="markerEnd"
-		:interaction-width="40"
-	/>
+	<g
+		data-test-id="edge"
+		:data-source-node-name="data.source?.node"
+		:data-target-node-name="data.target?.node"
+	>
+		<BaseEdge
+			v-for="(segment, index) in segments"
+			:id="`${id}-${index}`"
+			:key="segment[0]"
+			:class="edgeClasses"
+			:style="edgeStyle"
+			:path="segment[0]"
+			:marker-end="markerEnd"
+			:interaction-width="40"
+		/>
+	</g>
 
 	<EdgeLabelRenderer>
 		<div
-			data-test-id="edge-label-wrapper"
-			:data-source-node-name="sourceNode?.label"
-			:data-target-node-name="targetNode?.label"
+			data-test-id="edge-label"
+			:data-source-node-name="data.source?.node"
+			:data-target-node-name="data.target?.node"
 			:data-edge-status="status"
 			:style="edgeToolbarStyle"
 			:class="edgeToolbarClasses"
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts b/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
index 848ce5a875..5fcfede7e4 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
@@ -21,12 +21,14 @@ export function getEdgeRenderData(
 	} = {},
 ) {
 	const { targetX, targetY, sourceX, sourceY, sourcePosition, targetPosition } = props;
+	const isConnectorStraight = sourceY === targetY;
 
 	if (!isRightOfSourceHandle(sourceX, targetX) || connectionType !== NodeConnectionType.Main) {
 		const segment = getBezierPath(props);
 		return {
 			segments: [segment],
 			labelPosition: [segment[1], segment[2]],
+			isConnectorStraight,
 		};
 	}
 
@@ -59,5 +61,6 @@ export function getEdgeRenderData(
 	return {
 		segments: [firstSegment, secondSegment],
 		labelPosition: [firstSegmentTargetX, firstSegmentTargetY],
+		isConnectorStraight,
 	};
 }
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
index 04a422ac74..f77e7fa86e 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
@@ -46,7 +46,7 @@ describe('CanvasHandleMainOutput', () => {
 			},
 		});
 
-		expect(queryByTestId('canvas-handle-plus')).toHaveClass('success');
+		expect(queryByTestId('canvas-handle-plus-wrapper')).toHaveClass('success');
 	});
 
 	it('should render run data label', async () => {
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
index 9945405dce..89c83b4887 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
@@ -83,7 +83,6 @@ function onClickAdd() {
 			<CanvasHandlePlus
 				v-if="!isConnected && !isReadOnly"
 				v-show="isHandlePlusVisible"
-				data-test-id="canvas-handle-plus"
 				:data-plus-type="plusType"
 				:line-size="plusLineSize"
 				:handle-classes="handleClasses"
@@ -133,9 +132,9 @@ function onClickAdd() {
 
 .runDataLabel {
 	position: absolute;
-	top: 0;
+	top: 50%;
 	left: 50%;
-	transform: translate(-50%, -50%);
+	transform: translate(-50%, -150%);
 	font-size: var(--font-size-xs);
 	color: var(--color-success);
 }
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
index 78f4d250af..880a9a0401 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
@@ -96,7 +96,12 @@ function onClick(event: MouseEvent) {
 </script>
 
 <template>
-	<svg :class="classes" :viewBox="`0 0 ${viewBox.width} ${viewBox.height}`" :style="styles">
+	<svg
+		data-test-id="canvas-handle-plus-wrapper"
+		:class="classes"
+		:viewBox="`0 0 ${viewBox.width} ${viewBox.height}`"
+		:style="styles"
+	>
 		<line
 			:class="[handleClasses, $style.line]"
 			:x1="linePosition[0][0]"
@@ -107,6 +112,7 @@ function onClick(event: MouseEvent) {
 			stroke-width="2"
 		/>
 		<g
+			data-test-id="canvas-handle-plus"
 			:class="[$style.plus, handleClasses, 'clickable']"
 			:transform="`translate(${plusPosition[0]}, ${plusPosition[1]})`"
 			@click="onClick"
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
index 1f9cd25c2b..681be89f62 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
@@ -1,9 +1,9 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`CanvasHandlePlus > should render with default props 1`] = `
-"<svg class="wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
+"<svg data-test-id="canvas-handle-plus-wrapper" class="wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
   <line class="line" x1="0" y1="12" x2="47" y2="12" stroke="var(--color-foreground-xdark)" stroke-width="2"></line>
-  <g class="plus clickable" transform="translate(46, 0)">
+  <g data-test-id="canvas-handle-plus" class="plus clickable" transform="translate(46, 0)">
     <rect class="clickable" x="2" y="2" width="20" height="20" stroke="var(--color-foreground-xdark)" stroke-width="2" rx="4" fill="var(--color-foreground-xlight)"></rect>
     <path class="clickable" fill="var(--color-foreground-xdark)" d="m16.40655,10.89837l-3.30491,0l0,-3.30491c0,-0.40555 -0.32889,-0.73443 -0.73443,-0.73443l-0.73443,0c-0.40554,0 -0.73442,0.32888 -0.73442,0.73443l0,3.30491l-3.30491,0c-0.40555,0 -0.73443,0.32888 -0.73443,0.73442l0,0.73443c0,0.40554 0.32888,0.73443 0.73443,0.73443l3.30491,0l0,3.30491c0,0.40554 0.32888,0.73442 0.73442,0.73442l0.73443,0c0.40554,0 0.73443,-0.32888 0.73443,-0.73442l0,-3.30491l3.30491,0c0.40554,0 0.73442,-0.32889 0.73442,-0.73443l0,-0.73443c0,-0.40554 -0.32888,-0.73442 -0.73442,-0.73442z"></path>
   </g>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
index a0b812489d..5b74b5cd7c 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.vue
@@ -16,7 +16,7 @@ import type {
 	CanvasNodeEventBusEvents,
 	CanvasEventBusEvents,
 } from '@/types';
-import { CanvasConnectionMode } from '@/types';
+import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 import NodeIcon from '@/components/NodeIcon.vue';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import CanvasNodeToolbar from '@/components/canvas/elements/nodes/CanvasNodeToolbar.vue';
@@ -35,11 +35,13 @@ import {
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
 import { isEqual } from 'lodash-es';
+import CanvasNodeTrigger from '@/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue';
 
 type Props = NodeProps<CanvasNodeData> & {
 	readOnly?: boolean;
 	eventBus?: EventBus<CanvasEventBusEvents>;
 	hovered?: boolean;
+	nearbyHovered?: boolean;
 };
 
 const slots = defineSlots<{
@@ -107,6 +109,14 @@ const classes = computed(() => ({
 	...Object.fromEntries([...nodeClasses.value].map((c) => [c, true])),
 }));
 
+const renderType = computed<CanvasNodeRenderType>(() => props.data.render.type);
+
+const dataTestId = computed(() =>
+	[CanvasNodeRenderType.StickyNote, CanvasNodeRenderType.AddNodes].includes(renderType.value)
+		? undefined
+		: 'canvas-node',
+);
+
 /**
  * Event bus
  */
@@ -330,7 +340,7 @@ onBeforeUnmount(() => {
 <template>
 	<div
 		:class="classes"
-		data-test-id="canvas-node"
+		:data-test-id="dataTestId"
 		:data-node-name="data.name"
 		:data-node-type="data.type"
 	>
@@ -345,7 +355,8 @@ onBeforeUnmount(() => {
 				:is-valid-connection="isValidConnection"
 				:data-node-name="data.name"
 				data-test-id="canvas-node-output-handle"
-				:data-handle-index="source.index"
+				:data-index="source.index"
+				:data-connection-type="source.type"
 				@add="onAdd"
 			/>
 		</template>
@@ -360,7 +371,8 @@ onBeforeUnmount(() => {
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
 				data-test-id="canvas-node-input-handle"
-				:data-handle-index="target.index"
+				:data-index="target.index"
+				:data-connection-type="target.type"
 				:data-node-name="data.name"
 				@add="onAdd"
 			/>
@@ -396,12 +408,23 @@ onBeforeUnmount(() => {
 			/>
 			<!-- @TODO :color-default="iconColorDefault"-->
 		</CanvasNodeRenderer>
+
+		<CanvasNodeTrigger
+			v-if="
+				props.data.render.type === CanvasNodeRenderType.Default && props.data.render.options.trigger
+			"
+			:name="data.name"
+			:type="data.type"
+			:hovered="nearbyHovered"
+			:disabled="isDisabled"
+			:class="$style.trigger"
+		/>
 	</div>
 </template>
 
 <style lang="scss" module>
 .canvasNode {
-	&:hover,
+	&:hover:not(:has(> .trigger:hover)), // exclude .trigger which has extended hit zone
 	&:focus-within,
 	&.showToolbar {
 		.canvasNodeToolbar {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue
index 37251c40bc..27cc433d2e 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.vue
@@ -13,8 +13,10 @@ const slots = defineSlots<{
 }>();
 
 const Render = () => {
+	const renderType = node?.data.value.render.type ?? CanvasNodeRenderType.Default;
 	let Component;
-	switch (node?.data.value.render.type) {
+
+	switch (renderType) {
 		case CanvasNodeRenderType.StickyNote:
 			Component = CanvasNodeStickyNote;
 			break;
@@ -25,7 +27,13 @@ const Render = () => {
 			Component = CanvasNodeDefault;
 	}
 
-	return h(Component, slots.default);
+	return h(
+		Component,
+		{
+			'data-canvas-node-render-type': renderType,
+		},
+		slots.default,
+	);
 };
 </script>
 
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
index d85a85b159..2c552d757c 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
@@ -24,7 +24,7 @@ const { isExecuting } = useCanvas();
 const { isDisabled, render } = useCanvasNode();
 
 const nodeDisabledTitle = computed(() => {
-	return isDisabled.value ? i18n.baseText('node.disable') : i18n.baseText('node.enable');
+	return isDisabled.value ? i18n.baseText('node.enable') : i18n.baseText('node.disable');
 });
 
 const isStickyColorSelectorOpen = ref(false);
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
index 2481831249..c6b8b15d9c 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.vue
@@ -3,9 +3,14 @@ import { computed, ref, useCssModule, watch } from 'vue';
 import { useNodeConnections } from '@/composables/useNodeConnections';
 import { useI18n } from '@/composables/useI18n';
 import { useCanvasNode } from '@/composables/useCanvasNode';
-import { NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS } from '@/constants';
+import {
+	LOCAL_STORAGE_CANVAS_TRIGGER_BUTTON_VARIANT,
+	NODE_INSERT_SPACER_BETWEEN_INPUT_GROUPS,
+} from '@/constants';
 import type { CanvasNodeDefaultRender } from '@/types';
 import { useCanvas } from '@/composables/useCanvas';
+import { useLocalStorage } from '@vueuse/core';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 const $style = useCssModule();
 const i18n = useI18n();
@@ -106,6 +111,8 @@ const isStrikethroughVisible = computed(() => {
 
 const showTooltip = ref(false);
 
+const triggerButtonVariant = useLocalStorage<1 | 2>(LOCAL_STORAGE_CANVAS_TRIGGER_BUTTON_VARIANT, 2);
+
 watch(initialized, () => {
 	if (initialized.value) {
 		showTooltip.value = true;
@@ -128,12 +135,14 @@ function openContextMenu(event: MouseEvent) {
 	<div :class="classes" :style="styles" :data-test-id="dataTestId" @contextmenu="openContextMenu">
 		<CanvasNodeTooltip v-if="renderOptions.tooltip" :visible="showTooltip" />
 		<slot />
-		<CanvasNodeTriggerIcon v-if="renderOptions.trigger" />
 		<CanvasNodeStatusIcons v-if="!isDisabled" :class="$style.statusIcons" />
 		<CanvasNodeDisabledStrikeThrough v-if="isStrikethroughVisible" />
 		<div :class="$style.description">
 			<div v-if="label" :class="$style.label">
 				{{ label }}
+				<div v-if="renderOptions.trigger && triggerButtonVariant === 1" :class="$style.triggerIcon">
+					<FontAwesomeIcon icon="bolt" size="lg" />
+				</div>
 			</div>
 			<div v-if="isDisabled" :class="$style.disabledLabel">
 				({{ i18n.baseText('node.disabled') }})
@@ -313,4 +322,11 @@ function openContextMenu(event: MouseEvent) {
 	bottom: var(--canvas-node--status-icons-offset);
 	right: var(--canvas-node--status-icons-offset);
 }
+
+.triggerIcon {
+	display: inline;
+	position: static;
+	color: var(--color-primary);
+	padding: var(--spacing-4xs);
+}
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
index e9aa65dd55..e725c9b6c0 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
@@ -9,7 +9,6 @@ exports[`CanvasNodeDefault > configurable > should render configurable node corr
   <!--v-if-->
   
   
-  <!--v-if-->
   <!--v-if-->
   <!--v-if-->
   <div
@@ -18,7 +17,8 @@ exports[`CanvasNodeDefault > configurable > should render configurable node corr
     <div
       class="label"
     >
-      Test Node
+      Test Node 
+      <!--v-if-->
     </div>
     <!--v-if-->
     <div
@@ -39,7 +39,6 @@ exports[`CanvasNodeDefault > configuration > should render configurable configur
   <!--v-if-->
   
   
-  <!--v-if-->
   <!--v-if-->
   <!--v-if-->
   <div
@@ -48,7 +47,8 @@ exports[`CanvasNodeDefault > configuration > should render configurable configur
     <div
       class="label"
     >
-      Test Node
+      Test Node 
+      <!--v-if-->
     </div>
     <!--v-if-->
     <div
@@ -69,7 +69,6 @@ exports[`CanvasNodeDefault > configuration > should render configuration node co
   <!--v-if-->
   
   
-  <!--v-if-->
   <!--v-if-->
   <!--v-if-->
   <div
@@ -78,7 +77,8 @@ exports[`CanvasNodeDefault > configuration > should render configuration node co
     <div
       class="label"
     >
-      Test Node
+      Test Node 
+      <!--v-if-->
     </div>
     <!--v-if-->
     <div
@@ -99,7 +99,6 @@ exports[`CanvasNodeDefault > should render node correctly 1`] = `
   <!--v-if-->
   
   
-  <!--v-if-->
   <!--v-if-->
   <!--v-if-->
   <div
@@ -108,7 +107,8 @@ exports[`CanvasNodeDefault > should render node correctly 1`] = `
     <div
       class="label"
     >
-      Test Node
+      Test Node 
+      <!--v-if-->
     </div>
     <!--v-if-->
     <div
@@ -129,30 +129,6 @@ exports[`CanvasNodeDefault > trigger > should render trigger node correctly 1`]
   <!--v-if-->
   
   
-  
-  <div
-    class="triggerIcon el-tooltip__trigger el-tooltip__trigger"
-  >
-    <svg
-      aria-hidden="true"
-      class="svg-inline--fa fa-bolt fa-w-10 fa-lg"
-      data-icon="bolt"
-      data-prefix="fas"
-      focusable="false"
-      role="img"
-      viewBox="0 0 320 512"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        class=""
-        d="M296 160H180.6l42.6-129.8C227.2 15 215.7 0 200 0H56C44 0 33.8 8.9 32.2 20.8l-32 240C-1.7 275.2 9.5 288 24 288h118.7L96.6 482.5c-3.6 15.2 8 29.5 23.3 29.5 8.4 0 16.4-4.4 20.8-12l176-304c9.3-15.9-2.2-36-20.7-36z"
-        fill="currentColor"
-      />
-    </svg>
-  </div>
-  <!--teleport start-->
-  <!--teleport end-->
-  
   <!--v-if-->
   <!--v-if-->
   <div
@@ -161,7 +137,8 @@ exports[`CanvasNodeDefault > trigger > should render trigger node correctly 1`]
     <div
       class="label"
     >
-      Test Node
+      Test Node 
+      <!--v-if-->
     </div>
     <!--v-if-->
     <div
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
index 876a1d4509..7577cbf78b 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTooltip.vue
@@ -10,6 +10,12 @@ defineProps<{
 const { render } = useCanvasNode();
 
 const renderOptions = computed(() => render.value.options as CanvasNodeDefaultRender['options']);
+
+const popperOptions = {
+	modifiers: [
+		{ name: 'flip', enabled: false }, // show tooltip always above the node
+	],
+};
 </script>
 
 <template>
@@ -19,6 +25,7 @@ const renderOptions = computed(() => render.value.options as CanvasNodeDefaultRe
 		:visible="true"
 		:teleported="false"
 		:popper-class="$style.popper"
+		:popper-options="popperOptions"
 	>
 		<template #content>
 			{{ renderOptions.tooltip }}
@@ -33,7 +40,7 @@ const renderOptions = computed(() => render.value.options as CanvasNodeDefaultRe
 	top: 0;
 	left: 0;
 	width: 100%;
-	height: 1px;
+	height: 100%;
 }
 
 .popper {
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
new file mode 100644
index 0000000000..69794dadaa
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTrigger.vue
@@ -0,0 +1,163 @@
+<script lang="ts" setup>
+import { useCanvasOperations } from '@/composables/useCanvasOperations';
+import { useI18n } from '@/composables/useI18n';
+import { useRunWorkflow } from '@/composables/useRunWorkflow';
+import { CHAT_TRIGGER_NODE_TYPE, LOCAL_STORAGE_CANVAS_TRIGGER_BUTTON_VARIANT } from '@/constants';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useLocalStorage } from '@vueuse/core';
+import { computed, useCssModule } from 'vue';
+import { useRouter } from 'vue-router';
+
+const {
+	name,
+	type,
+	hovered,
+	disabled,
+	class: cls,
+} = defineProps<{
+	name: string;
+	type: string;
+	hovered?: boolean;
+	disabled?: boolean;
+	class?: string;
+}>();
+
+const variant = useLocalStorage<1 | 2>(LOCAL_STORAGE_CANVAS_TRIGGER_BUTTON_VARIANT, 2);
+
+const style = useCssModule();
+const containerClass = computed(() => ({
+	[cls ?? '']: true,
+	[style.container]: true,
+	[style.interactive]: !disabled,
+	[style.hovered]: !!hovered,
+	[style.variant1]: variant.value === 1,
+	[style.variant2]: variant.value === 2,
+}));
+
+const router = useRouter();
+const i18n = useI18n();
+const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
+const { runEntireWorkflow } = useRunWorkflow({ router });
+const { toggleChatOpen } = useCanvasOperations({ router });
+
+const isChatOpen = computed(() => workflowsStore.isChatPanelOpen);
+const isExecuting = computed(() => uiStore.isActionActive.workflowRunning);
+const testId = computed(() => `execute-workflow-button-${name}`);
+</script>
+
+<template>
+	<!-- click and mousedown event are suppressed to avoid unwanted selection or dragging of the node -->
+	<div :class="containerClass" @click.stop.prevent @mousedown.stop.prevent>
+		<div>
+			<div v-if="variant === 2" :class="$style.bolt">
+				<FontAwesomeIcon icon="bolt" size="lg" />
+			</div>
+
+			<N8nButton
+				v-if="variant === 1 && type === CHAT_TRIGGER_NODE_TYPE"
+				type="secondary"
+				size="large"
+				:disabled="isExecuting"
+				:data-test-id="testId"
+				@click.capture="toggleChatOpen('node')"
+				>{{ isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.open') }}</N8nButton
+			>
+			<N8nButton
+				v-else-if="variant === 1"
+				type="secondary"
+				size="large"
+				:disabled="isExecuting"
+				:data-test-id="testId"
+				@click.capture="runEntireWorkflow('node', name)"
+				>{{ i18n.baseText('nodeView.runButtonText.executeWorkflow') }}</N8nButton
+			>
+			<N8nButton
+				v-else-if="variant === 2 && type === CHAT_TRIGGER_NODE_TYPE"
+				:type="isChatOpen ? 'secondary' : 'primary'"
+				size="large"
+				:disabled="isExecuting"
+				:data-test-id="testId"
+				:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.open')"
+				@click.capture="toggleChatOpen('node')"
+			/>
+			<N8nButton
+				v-else
+				type="primary"
+				size="large"
+				:disabled="isExecuting"
+				:data-test-id="testId"
+				:label="i18n.baseText('nodeView.runButtonText.executeWorkflow')"
+				@click.capture="runEntireWorkflow('node', name)"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	z-index: -1;
+	position: absolute;
+	display: flex;
+	align-items: center;
+	height: 100%;
+	right: 100%;
+	top: 0;
+	pointer-events: none;
+
+	& > div {
+		position: relative;
+		display: flex;
+		align-items: center;
+	}
+
+	&.hovered button {
+		pointer-events: all;
+	}
+}
+
+.variant1 {
+	& button {
+		margin-right: var(--spacing-xl);
+		display: none;
+	}
+
+	&.interactive button {
+		display: block;
+	}
+}
+
+.variant2 {
+	& button {
+		margin-right: var(--spacing-s);
+		opacity: 0;
+		translate: -12px 0;
+		transition:
+			translate 0.1s ease-in,
+			opacity 0.1s ease-in;
+	}
+
+	&.interactive.hovered button {
+		opacity: 1;
+		translate: 0 0;
+	}
+}
+
+.bolt {
+	position: absolute;
+	right: 0;
+	color: var(--color-primary);
+	padding: var(--spacing-s);
+	opacity: 1;
+	translate: 0 0;
+	transition:
+		translate 0.1s ease-in,
+		opacity 0.1s ease-in;
+
+	.container.interactive.hovered & {
+		translate: -12px 0;
+		opacity: 0;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.test.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.test.ts
deleted file mode 100644
index 2fadcc0aee..0000000000
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.test.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import CanvasNodeTriggerIcon from './CanvasNodeTriggerIcon.vue';
-import { createComponentRenderer } from '@/__tests__/render';
-
-vi.mock('@/composables/useI18n', () => ({
-	useI18n: vi.fn(() => ({
-		baseText: vi.fn().mockReturnValue('This is a trigger node'),
-	})),
-}));
-
-const renderComponent = createComponentRenderer(CanvasNodeTriggerIcon, {
-	global: {
-		stubs: {
-			FontAwesomeIcon: true,
-		},
-	},
-});
-
-describe('CanvasNodeTriggerIcon', () => {
-	it('should render trigger icon with tooltip', () => {
-		const { container } = renderComponent();
-
-		expect(container.querySelector('.triggerIcon')).toBeInTheDocument();
-
-		const icon = container.querySelector('font-awesome-icon-stub');
-		expect(icon).toBeInTheDocument();
-		expect(icon?.getAttribute('icon')).toBe('bolt');
-		expect(icon?.getAttribute('size')).toBe('lg');
-	});
-
-	it('should render tooltip with correct content', () => {
-		const { getByText } = renderComponent();
-
-		expect(getByText('This is a trigger node')).toBeInTheDocument();
-	});
-});
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.vue
deleted file mode 100644
index e37f384dba..0000000000
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeTriggerIcon.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script lang="ts" setup>
-import { useI18n } from '@/composables/useI18n';
-
-const i18n = useI18n();
-</script>
-
-<template>
-	<N8nTooltip placement="bottom">
-		<template #content>
-			<span v-n8n-html="i18n.baseText('node.thisIsATriggerNode')" />
-		</template>
-		<div :class="$style.triggerIcon">
-			<FontAwesomeIcon icon="bolt" size="lg" />
-		</div>
-	</N8nTooltip>
-</template>
-
-<style lang="scss" module>
-.triggerIcon {
-	position: absolute;
-	right: 100%;
-	margin: auto;
-	color: var(--color-primary);
-	padding: var(--spacing-2xs);
-}
-</style>
diff --git a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
index 0cf3c220ff..6c4b691507 100644
--- a/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
+import { WORKFLOW_EVALUATION_EXPERIMENT } from '@/constants';
+import { usePostHog } from '@/stores/posthog.store';
 
 const props = defineProps<{
 	runningExecutionsCount: number;
@@ -14,14 +16,22 @@ const emit = defineEmits<{
 
 const i18n = useI18n();
 
-const tooltipText = computed(() =>
-	i18n.baseText('executionsList.activeExecutions.tooltip', {
+const posthogStore = usePostHog();
+
+const tooltipText = computed(() => {
+	let text = i18n.baseText('executionsList.activeExecutions.tooltip', {
 		interpolate: {
 			running: props.runningExecutionsCount,
 			cap: props.concurrencyCap,
 		},
-	}),
-);
+	});
+
+	if (posthogStore.isFeatureEnabled(WORKFLOW_EVALUATION_EXPERIMENT)) {
+		text += '\n' + i18n.baseText('executionsList.activeExecutions.evaluationNote');
+	}
+
+	return text;
+});
 
 const headerText = computed(() => {
 	if (props.runningExecutionsCount === 0) {
@@ -38,6 +48,7 @@ const headerText = computed(() => {
 
 <template>
 	<div data-test-id="concurrent-executions-header">
+		<n8n-text>{{ headerText }}</n8n-text>
 		<n8n-tooltip>
 			<template #content>
 				<div :class="$style.tooltip">
@@ -60,9 +71,8 @@ const headerText = computed(() => {
 					>
 				</div>
 			</template>
-			<font-awesome-icon icon="info-circle" class="mr-2xs" />
+			<font-awesome-icon icon="info-circle" class="ml-2xs" />
 		</n8n-tooltip>
-		<n8n-text>{{ headerText }}</n8n-text>
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
index 77b23b605b..1ab314ee03 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -73,8 +73,15 @@ const isAnnotationEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
 
+/**
+ * Calculate the number of executions counted towards the production executions concurrency limit.
+ * Evaluation executions are not counted towards this limit and the evaluation limit isn't shown in the UI.
+ */
 const runningExecutionsCount = computed(() => {
-	return props.executions.filter((execution) => execution.status === 'running').length;
+	return props.executions.filter(
+		(execution) =>
+			execution.status === 'running' && ['webhook', 'trigger'].includes(execution.mode),
+	).length;
 });
 
 watch(
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index db8e7a6ef4..b164731436 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -229,6 +229,12 @@ async function handleActionItemClick(commandData: Command) {
 				</template>
 				<FontAwesomeIcon icon="flask" />
 			</N8nTooltip>
+			<N8nTooltip v-if="execution.mode === 'evaluation'" placement="top">
+				<template #content>
+					<span>{{ i18n.baseText('executionsList.evaluation') }}</span>
+				</template>
+				<FontAwesomeIcon icon="tasks" />
+			</N8nTooltip>
 		</td>
 		<td>
 			<div :class="$style.buttonCell">
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
index ff6631ab21..14df87fcf4 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
@@ -167,11 +167,13 @@ function onRetryMenuItemSelect(action: string): void {
 					<template #content>
 						<span>{{ locale.baseText('executionsList.test') }}</span>
 					</template>
-					<FontAwesomeIcon
-						v-if="execution.mode === 'manual'"
-						:class="[$style.icon, $style.manual]"
-						icon="flask"
-					/>
+					<FontAwesomeIcon :class="[$style.icon, $style.manual]" icon="flask" />
+				</N8nTooltip>
+				<N8nTooltip v-if="execution.mode === 'evaluation'" placement="top">
+					<template #content>
+						<span>{{ locale.baseText('executionsList.evaluation') }}</span>
+					</template>
+					<FontAwesomeIcon :class="[$style.icon, $style.evaluation]" icon="tasks" />
 				</N8nTooltip>
 			</div>
 		</router-link>
@@ -182,7 +184,7 @@ function onRetryMenuItemSelect(action: string): void {
 @import '@/styles/variables';
 
 .WorkflowExecutionsCard {
-	--execution-list-item-background: var(--color-foreground-xlight);
+	--execution-list-item-background: var(--execution-card-background);
 	--execution-list-item-highlight-background: var(--color-warning-tint-1);
 
 	display: flex;
@@ -200,7 +202,7 @@ function onRetryMenuItemSelect(action: string): void {
 	&:hover,
 	&.active {
 		.executionLink {
-			--execution-list-item-background: var(--color-foreground-light);
+			--execution-list-item-background: var(--execution-card-background-hover);
 		}
 	}
 
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
index afd8f96e13..444d1dd94c 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.vue
@@ -266,6 +266,7 @@ function onRetryButtonBlur(event: FocusEvent) {
 			</div>
 		</div>
 		<WorkflowPreview
+			:key="executionId"
 			mode="execution"
 			loader-type="spinner"
 			:execution-id="executionId"
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
index 0832ac39bf..1255320c40 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -54,8 +54,15 @@ const executionListRef = ref<HTMLElement | null>(null);
 
 const workflowPermissions = computed(() => getResourcePermissions(props.workflow?.scopes).workflow);
 
+/**
+ * Calculate the number of executions counted towards the production executions concurrency limit.
+ * Evaluation executions are not counted towards this limit and the evaluation limit isn't shown in the UI.
+ */
 const runningExecutionsCount = computed(() => {
-	return props.executions.filter((execution) => execution.status === 'running').length;
+	return props.executions.filter(
+		(execution) =>
+			execution.status === 'running' && ['webhook', 'trigger'].includes(execution.mode),
+	).length;
 });
 
 watch(
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 8bc6af756e..af0329cbe2 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -44,7 +44,18 @@ const filtersLength = computed(() => {
 		}
 
 		const value = props.modelValue[key];
-		length += (Array.isArray(value) ? value.length > 0 : value !== '') ? 1 : 0;
+
+		if (value === true) {
+			length += 1;
+		}
+
+		if (Array.isArray(value) && value.length) {
+			length += 1;
+		}
+
+		if (typeof value === 'string' && value !== '') {
+			length += 1;
+		}
 	});
 
 	return length;
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue b/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
index b46f58d284..963da7842e 100644
--- a/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
+++ b/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
@@ -1,11 +1,9 @@
 <script lang="ts" setup>
 interface Props {
-	overflow: boolean;
+	overflow?: boolean;
 }
 
-withDefaults(defineProps<Props>(), {
-	overflow: false,
-});
+defineProps<Props>();
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 33e165a650..92a41b77b2 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -17,7 +17,7 @@ import type { Scope } from '@n8n/permissions';
 
 export type IResource = {
 	id: string;
-	name: string;
+	name?: string;
 	value?: string;
 	key?: string;
 	updatedAt?: string;
@@ -42,7 +42,7 @@ const props = withDefaults(
 		displayName?: (resource: IResource) => string;
 		resources: IResource[];
 		disabled: boolean;
-		initialize: () => Promise<void>;
+		initialize?: () => Promise<void>;
 		filters?: IFilters;
 		additionalFiltersHandler?: (
 			resource: IResource,
@@ -58,7 +58,7 @@ const props = withDefaults(
 		loading: boolean;
 	}>(),
 	{
-		displayName: (resource: IResource) => resource.name,
+		displayName: (resource: IResource) => resource.name || '',
 		initialize: async () => {},
 		filters: () => ({ search: '', homeProject: '' }),
 		sortFns: () => ({}),
@@ -103,7 +103,7 @@ const sortBy = ref(props.sortOptions[0]);
 const hasFilters = ref(false);
 const filtersModel = ref(props.filters);
 const currentPage = ref(1);
-const rowsPerPage = ref<number>(10);
+const rowsPerPage = ref<number>(25);
 const resettingFilters = ref(false);
 const search = ref<HTMLElement | null>(null);
 
@@ -168,13 +168,19 @@ const focusSearchInput = () => {
 };
 
 const hasAppliedFilters = (): boolean => {
-	return !!filterKeys.value.find(
-		(key) =>
-			key !== 'search' &&
-			(Array.isArray(props.filters[key])
-				? props.filters[key].length > 0
-				: props.filters[key] !== ''),
-	);
+	return !!filterKeys.value.find((key) => {
+		if (key === 'search') return false;
+
+		if (typeof props.filters[key] === 'boolean') {
+			return props.filters[key];
+		}
+
+		if (Array.isArray(props.filters[key])) {
+			return props.filters[key].length > 0;
+		}
+
+		return props.filters[key] !== '';
+	});
 };
 
 const setRowsPerPage = (numberOfRowsPerPage: number) => {
@@ -302,6 +308,20 @@ watch(
 	() => callDebounced(sendFiltersTelemetry, { debounceTime: 1000, trailing: true }, 'search'),
 );
 
+watch(
+	() => filtersModel.value.setupNeeded,
+	() => {
+		sendFiltersTelemetry('setupNeeded');
+	},
+);
+
+watch(
+	() => filtersModel.value.incomplete,
+	() => {
+		sendFiltersTelemetry('incomplete');
+	},
+);
+
 watch(
 	() => sortBy.value,
 	(newValue) => {
@@ -365,7 +385,7 @@ onMounted(async () => {
 					</n8n-action-box>
 				</slot>
 			</div>
-			<PageViewLayoutList v-else :overflow="type !== 'list'">
+			<PageViewLayoutList v-else>
 				<template #header>
 					<div :class="$style['filters-row']">
 						<div :class="$style.filters">
diff --git a/packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap b/packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
index 1060a9a9fa..f073af549e 100644
--- a/packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
+++ b/packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
@@ -1,3 +1,3 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`useBugReporting > should generate the correct reporting URL 1`] = `"https://github.com/n8n-io/n8n/issues/new?labels=bug-report&body=%0A%3C%21--+Please+follow+the+template+below.+Skip+the+questions+that+are+not+relevant+to+you.+--%3E%0A%0A%23%23+Describe+the+problem%2Ferror%2Fquestion%0A%0A%0A%23%23+What+is+the+error+message+%28if+any%29%3F%0A%0A%0A%23%23+Please+share+your+workflow%2Fscreenshots%2Frecording%0A%0A%60%60%60%0A%28Select+the+nodes+on+your+canvas+and+use+the+keyboard+shortcuts+CMD%2BC%2FCTRL%2BC+and+CMD%2BV%2FCTRL%2BV+to+copy+and+paste+the+workflow.%29%0A%60%60%60%0A%0A%0A%23%23+Share+the+output+returned+by+the+last+node%0A%3C%21--+If+you+need+help+with+data+transformations%2C+please+also+share+your+expected+output.+--%3E%0A%0A%0Amocked+debug+info%7D"`;
+exports[`useBugReporting > should generate the correct reporting URL 1`] = `"https://github.com/n8n-io/n8n/issues/new?labels=bug-report&body=%0A%3C%21--+Please+follow+the+template+below.+Skip+the+questions+that+are+not+relevant+to+you.+--%3E%0A%0A%23%23+Describe+the+problem%2Ferror%2Fquestion%0A%0A%0A%23%23+What+is+the+error+message+%28if+any%29%3F%0A%0A%0A%23%23+Please+share+your+workflow%2Fscreenshots%2Frecording%0A%0A%60%60%60%0A%28Select+the+nodes+on+your+canvas+and+use+the+keyboard+shortcuts+CMD%2BC%2FCTRL%2BC+and+CMD%2BV%2FCTRL%2BV+to+copy+and+paste+the+workflow.%29%0A%E2%9A%A0%EF%B8%8F+WARNING+%E2%9A%A0%EF%B8%8F+If+you+have+sensitive+data+in+your+workflow+%28like+API+keys%29%2C+please+remove+it+before+sharing.%0A%60%60%60%0A%0A%0A%23%23+Share+the+output+returned+by+the+last+node%0A%3C%21--+If+you+need+help+with+data+transformations%2C+please+also+share+your+expected+output.+--%3E%0A%0A%0Amocked+debug+info%7D"`;
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts b/packages/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
new file mode 100644
index 0000000000..f09cf24ff3
--- /dev/null
+++ b/packages/editor-ui/src/composables/useAIAssistantHelpers.test.constants.ts
@@ -0,0 +1,430 @@
+import { VIEWS } from '@/constants';
+import type { ChatRequest } from '@/types/assistant.types';
+import { NodeConnectionType } from 'n8n-workflow';
+
+export const PAYLOAD_SIZE_FOR_1_PASS = 4;
+export const PAYLOAD_SIZE_FOR_2_PASSES = 2;
+
+export const ERROR_HELPER_TEST_PAYLOAD: ChatRequest.RequestPayload = {
+	payload: {
+		role: 'user',
+		type: 'init-error-helper',
+		user: {
+			firstName: 'Milorad',
+		},
+		error: {
+			name: 'NodeOperationError',
+			message: "Referenced node doesn't exist",
+			description:
+				"The node <strong>'Hey'</strong> doesn't exist, but it's used in an expression here.",
+		},
+		node: {
+			position: [0, 0],
+			parameters: {
+				mode: 'manual',
+				duplicateItem: false,
+				assignments: {
+					assignments: {
+						'0': {
+							id: '0957fbdb-a021-413b-9d42-fc847666f999',
+							name: 'text',
+							value: 'Lorem ipsum dolor sit amet',
+							type: 'string',
+						},
+						'1': {
+							id: '8efecfa7-8df7-492e-83e7-3d517ad03e60',
+							name: 'foo',
+							value: {
+								value: "={{ $('Hey').json.name }}",
+								resolvedExpressionValue: 'Error in expression: "Referenced node doesn\'t exist"',
+							},
+							type: 'string',
+						},
+					},
+				},
+				includeOtherFields: false,
+				options: {},
+			},
+			type: 'n8n-nodes-base.set',
+			typeVersion: 3.4,
+			id: '6dc70bf3-ba54-4481-b9f5-ce255bdd5fb8',
+			name: 'This is fine',
+		},
+		executionSchema: [],
+	},
+};
+
+export const SUPPORT_CHAT_TEST_PAYLOAD: ChatRequest.RequestPayload = {
+	payload: {
+		role: 'user',
+		type: 'init-support-chat',
+		user: {
+			firstName: 'Milorad',
+		},
+		context: {
+			currentView: {
+				name: VIEWS.WORKFLOW,
+				description:
+					'The user is currently looking at the current workflow in n8n editor, without any specific node selected.',
+			},
+			activeNodeInfo: {
+				node: {
+					position: [0, 0],
+					parameters: {
+						mode: 'manual',
+						duplicateItem: false,
+						assignments: {
+							assignments: {
+								'0': {
+									id: '969e86d0-76de-44f6-b07d-44a8a953f564',
+									name: 'name',
+									value: {
+										value: "={{ $('Edit Fields 2').name }}",
+										resolvedExpressionValue:
+											'Error in expression: "Referenced node doesn\'t exist"',
+									},
+									type: 'number',
+								},
+							},
+						},
+						includeOtherFields: false,
+						options: {},
+					},
+					type: 'n8n-nodes-base.set',
+					typeVersion: 3.4,
+					id: '8eac1591-ddc6-4d93-bec7-998cbfe27cc7',
+					name: 'Edit Fields1',
+				},
+				executionStatus: {
+					status: 'error',
+					error: {
+						name: 'NodeOperationError',
+						message: "Referenced node doesn't exist",
+						stack:
+							"NodeOperationError: Referenced node doesn't exist\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/Set/v2/manual.mode.ts:256:9)\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/Set/v2/SetV2.node.ts:351:48)\n    at WorkflowExecute.runNode (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1097:31)\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1505:38\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:2066:11",
+					},
+				},
+				referencedNodes: [],
+			},
+			currentWorkflow: {
+				name: '🧪 Assistant context test',
+				active: false,
+				connections: {
+					'When clicking ‘Test workflow’': {
+						main: [
+							[
+								{
+									node: 'Edit Fields',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+					'Edit Fields': {
+						main: [
+							[
+								{
+									node: 'Bad request no chat found',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+								{
+									node: 'Slack',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+								{
+									node: 'Edit Fields1',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+								{
+									node: 'Edit Fields2',
+									type: NodeConnectionType.Main,
+									index: 0,
+								},
+							],
+						],
+					},
+				},
+				nodes: [
+					{
+						parameters: {
+							notice: '',
+						},
+						id: 'c457ff96-3b0c-4dbc-b47f-dc88396a46ae',
+						name: 'When clicking ‘Test workflow’',
+						type: 'n8n-nodes-base.manualTrigger',
+						position: [-60, 200],
+						typeVersion: 1,
+					},
+					{
+						parameters: {
+							resource: 'chat',
+							operation: 'get',
+							chatId: '13',
+						},
+						id: '60ddc045-d4e3-4b62-9832-12ecf78937a6',
+						name: 'Bad request no chat found',
+						type: 'n8n-nodes-base.telegram',
+						typeVersion: 1.1,
+						position: [540, 0],
+						issues: {},
+						disabled: true,
+					},
+					{
+						parameters: {
+							mode: 'manual',
+							duplicateItem: false,
+							assignments: {
+								assignments: [
+									{
+										id: '70448b12-9b2b-4bfb-abee-6432c4c58de1',
+										name: 'name',
+										value: 'Joe',
+										type: 'string',
+									},
+								],
+							},
+							includeOtherFields: false,
+							options: {},
+						},
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [200, 200],
+						id: '0a831739-13cd-4541-b20b-7db73abbcaf0',
+						name: 'Edit Fields',
+					},
+					{
+						parameters: {
+							authentication: 'oAuth2',
+							resource: 'channel',
+							operation: 'archive',
+							channelId: {
+								__rl: true,
+								mode: 'list',
+								value: '',
+							},
+						},
+						type: 'n8n-nodes-base.slack',
+						typeVersion: 2.2,
+						position: [540, 200],
+						id: 'aff7471e-b2bc-4274-abe1-97897a17eaa6',
+						name: 'Slack',
+						webhookId: '7f8b574c-7729-4220-bbe9-bf5aa382406a',
+						credentials: {
+							slackOAuth2Api: {
+								id: 'mZRj4wi3gavIzu9b',
+								name: 'Slack account',
+							},
+						},
+						disabled: true,
+					},
+					{
+						parameters: {
+							mode: 'manual',
+							duplicateItem: false,
+							assignments: {
+								assignments: [
+									{
+										id: '969e86d0-76de-44f6-b07d-44a8a953f564',
+										name: 'name',
+										value: "={{ $('Edit Fields 2').name }}",
+										type: 'number',
+									},
+								],
+							},
+							includeOtherFields: false,
+							options: {},
+						},
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [540, 400],
+						id: '8eac1591-ddc6-4d93-bec7-998cbfe27cc7',
+						name: 'Edit Fields1',
+						issues: {
+							execution: true,
+						},
+					},
+					{
+						parameters: {
+							mode: 'manual',
+							duplicateItem: false,
+							assignments: {
+								assignments: [
+									{
+										id: '9bdfc283-64f7-41c5-9a55-b8d8ccbe3e9d',
+										name: 'age',
+										value: '={{ $json.name }}',
+										type: 'number',
+									},
+								],
+							},
+							includeOtherFields: false,
+							options: {},
+						},
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [440, 560],
+						id: '34e56e14-d1a9-4a73-9208-15d39771a9ba',
+						name: 'Edit Fields2',
+					},
+				],
+			},
+			executionData: {
+				runData: {
+					'When clicking ‘Test workflow’': [
+						{
+							hints: [],
+							startTime: 1737540693122,
+							executionTime: 1,
+							source: [],
+							executionStatus: 'success',
+						},
+					],
+					'Edit Fields': [
+						{
+							hints: [],
+							startTime: 1737540693124,
+							executionTime: 2,
+							source: [
+								{
+									previousNode: 'When clicking ‘Test workflow’',
+								},
+							],
+							executionStatus: 'success',
+						},
+					],
+					'Bad request no chat found': [
+						{
+							hints: [],
+							startTime: 1737540693126,
+							executionTime: 0,
+							source: [
+								{
+									previousNode: 'Edit Fields',
+								},
+							],
+							executionStatus: 'success',
+						},
+					],
+					Slack: [
+						{
+							hints: [],
+							startTime: 1737540693127,
+							executionTime: 0,
+							source: [
+								{
+									previousNode: 'Edit Fields',
+								},
+							],
+							executionStatus: 'success',
+						},
+					],
+					'Edit Fields1': [
+						{
+							hints: [],
+							startTime: 1737540693127,
+							executionTime: 28,
+							source: [
+								{
+									previousNode: 'Edit Fields',
+								},
+							],
+							executionStatus: 'error',
+							// @ts-expect-error Incomplete mock objects are expected
+							error: {
+								level: 'warning',
+								tags: {
+									packageName: 'workflow',
+								},
+								context: {
+									itemIndex: 0,
+									nodeCause: 'Edit Fields 2',
+									descriptionKey: 'nodeNotFound',
+									parameter: 'assignments',
+								},
+								functionality: 'regular',
+								name: 'NodeOperationError',
+								timestamp: 1737540693141,
+								node: {
+									parameters: {
+										mode: 'manual',
+										duplicateItem: false,
+										assignments: {
+											assignments: [
+												{
+													id: '969e86d0-76de-44f6-b07d-44a8a953f564',
+													name: 'name',
+													value: "={{ $('Edit Fields 2').name }}",
+													type: 'number',
+												},
+											],
+										},
+										includeOtherFields: false,
+										options: {},
+									},
+									type: 'n8n-nodes-base.set',
+									typeVersion: 3.4,
+									position: [540, 400],
+									id: '8eac1591-ddc6-4d93-bec7-998cbfe27cc7',
+									name: 'Edit Fields1',
+								},
+								messages: [],
+								message: "Referenced node doesn't exist",
+								stack:
+									"NodeOperationError: Referenced node doesn't exist\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/Set/v2/manual.mode.ts:256:9)\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/Set/v2/SetV2.node.ts:351:48)\n    at WorkflowExecute.runNode (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1097:31)\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1505:38\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:2066:11",
+							},
+						},
+					],
+				},
+				// @ts-expect-error Incomplete mock objects are expected
+				error: {
+					level: 'warning',
+					tags: {
+						packageName: 'workflow',
+					},
+					context: {
+						itemIndex: 0,
+						nodeCause: 'Edit Fields 2',
+						descriptionKey: 'nodeNotFound',
+						parameter: 'assignments',
+					},
+					functionality: 'regular',
+					name: 'NodeOperationError',
+					timestamp: 1737540693141,
+					node: {
+						parameters: {
+							mode: 'manual',
+							duplicateItem: false,
+							assignments: {
+								assignments: [
+									{
+										id: '969e86d0-76de-44f6-b07d-44a8a953f564',
+										name: 'name',
+										value: "={{ $('Edit Fields 2').name }}",
+										type: 'number',
+									},
+								],
+							},
+							includeOtherFields: false,
+							options: {},
+						},
+						type: 'n8n-nodes-base.set',
+						typeVersion: 3.4,
+						position: [540, 400],
+						id: '8eac1591-ddc6-4d93-bec7-998cbfe27cc7',
+						name: 'Edit Fields1',
+					},
+					messages: [],
+					message: "Referenced node doesn't exist",
+					stack:
+						"NodeOperationError: Referenced node doesn't exist\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/Set/v2/manual.mode.ts:256:9)\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/Set/v2/SetV2.node.ts:351:48)\n    at WorkflowExecute.runNode (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1097:31)\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1505:38\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:2066:11",
+				},
+				lastNodeExecuted: 'Edit Fields1',
+			},
+		},
+		question: 'Hey',
+	},
+};
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts b/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
index 7d0ac11398..09a72fc47f 100644
--- a/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
+++ b/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
@@ -4,6 +4,13 @@ import { useAIAssistantHelpers } from './useAIAssistantHelpers';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import type { IWorkflowDb } from '@/Interface';
+import type { ChatRequest } from '@/types/assistant.types';
+import {
+	ERROR_HELPER_TEST_PAYLOAD,
+	PAYLOAD_SIZE_FOR_1_PASS,
+	PAYLOAD_SIZE_FOR_2_PASSES,
+	SUPPORT_CHAT_TEST_PAYLOAD,
+} from './useAIAssistantHelpers.test.constants';
 
 const referencedNodesTestCases: Array<{ caseName: string; node: INode; expected: string[] }> = [
 	{
@@ -549,3 +556,67 @@ describe('Simplify assistant payloads', () => {
 		}
 	});
 });
+
+describe('Trim Payload Size', () => {
+	let aiAssistantHelpers: ReturnType<typeof useAIAssistantHelpers>;
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+		aiAssistantHelpers = useAIAssistantHelpers();
+	});
+
+	it('Should trim active node parameters in error helper payload', () => {
+		const payload = ERROR_HELPER_TEST_PAYLOAD;
+		aiAssistantHelpers.trimPayloadSize(payload);
+		expect((payload.payload as ChatRequest.InitErrorHelper).node.parameters).toEqual({});
+	});
+
+	it('Should trim all node parameters in support chat', () => {
+		// Testing the scenario where only one trimming pass is needed
+		// (payload is under the limit after removing all node parameters and execution data)
+		const payload: ChatRequest.RequestPayload = SUPPORT_CHAT_TEST_PAYLOAD;
+		const supportPayload: ChatRequest.InitSupportChat =
+			payload.payload as ChatRequest.InitSupportChat;
+
+		// Trimming to 4kb should be successful
+		expect(() =>
+			aiAssistantHelpers.trimPayloadSize(payload, PAYLOAD_SIZE_FOR_1_PASS),
+		).not.toThrow();
+		// All active node parameters should be removed
+		expect(supportPayload?.context?.activeNodeInfo?.node?.parameters).toEqual({});
+		// Also, all node parameters in the workflow should be removed
+		supportPayload.context?.currentWorkflow?.nodes?.forEach((node) => {
+			expect(node.parameters).toEqual({});
+		});
+		// Node parameters in the execution data should be removed
+		expect(supportPayload.context?.executionData?.runData).toEqual({});
+		if (
+			supportPayload.context?.executionData?.error &&
+			'node' in supportPayload.context.executionData.error
+		) {
+			expect(supportPayload.context?.executionData?.error?.node?.parameters).toEqual({});
+		}
+		// Context object should still be there
+		expect(supportPayload.context).to.be.an('object');
+	});
+
+	it('Should trim the whole context in support chat', () => {
+		// Testing the scenario where both trimming passes are needed
+		// (payload is over the limit after removing all node parameters and execution data)
+		const payload: ChatRequest.RequestPayload = SUPPORT_CHAT_TEST_PAYLOAD;
+		const supportPayload: ChatRequest.InitSupportChat =
+			payload.payload as ChatRequest.InitSupportChat;
+
+		// Trimming should be successful
+		expect(() =>
+			aiAssistantHelpers.trimPayloadSize(payload, PAYLOAD_SIZE_FOR_2_PASSES),
+		).not.toThrow();
+		// The whole context object should be removed
+		expect(supportPayload.context).not.toBeDefined();
+	});
+
+	it('Should throw an error if payload is too big after trimming', () => {
+		const payload = ERROR_HELPER_TEST_PAYLOAD;
+		expect(() => aiAssistantHelpers.trimPayloadSize(payload, 0.2)).toThrow();
+	});
+});
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.ts b/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
index b19f2817cd..4d0923a2ff 100644
--- a/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
+++ b/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
@@ -14,9 +14,10 @@ import { executionDataToJson, getMainAuthField, getNodeAuthOptions } from '@/uti
 import type { ChatRequest } from '@/types/assistant.types';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDataSchema } from './useDataSchema';
-import { VIEWS } from '@/constants';
+import { AI_ASSISTANT_MAX_CONTENT_LENGTH, VIEWS } from '@/constants';
 import { useI18n } from './useI18n';
 import type { IWorkflowDb } from '@/Interface';
+import { getObjectSizeInKB } from '@/utils/objectUtils';
 
 const CANVAS_VIEWS = [VIEWS.NEW_WORKFLOW, VIEWS.WORKFLOW, VIEWS.EXECUTION_DEBUG];
 const EXECUTION_VIEWS = [VIEWS.EXECUTION_PREVIEW];
@@ -251,6 +252,64 @@ export const useAIAssistantHelpers = () => {
 		nodes: workflow.nodes,
 	});
 
+	/**
+	 * Reduces AI Assistant request payload size to make it fit the specified content length.
+	 * If, after two passes, the payload is still too big, throws an error'
+	 * @param payload The request payload to trim
+	 * @param size The maximum size of the payload in KB
+	 */
+	const trimPayloadToSize = (
+		payload: ChatRequest.RequestPayload,
+		size = AI_ASSISTANT_MAX_CONTENT_LENGTH,
+	): void => {
+		const requestPayload = payload.payload;
+		// For support chat, remove parameters from the active node object and all nodes in the workflow
+		if (requestPayload.type === 'init-support-chat') {
+			if (requestPayload.context?.activeNodeInfo?.node) {
+				requestPayload.context.activeNodeInfo.node.parameters = {};
+			}
+			if (requestPayload.context?.currentWorkflow) {
+				requestPayload.context.currentWorkflow?.nodes?.forEach((node) => {
+					node.parameters = {};
+				});
+			}
+			if (requestPayload.context?.executionData?.runData) {
+				requestPayload.context.executionData.runData = {};
+			}
+			if (
+				requestPayload.context?.executionData?.error &&
+				'node' in requestPayload.context?.executionData?.error
+			) {
+				if (requestPayload.context?.executionData?.error?.node) {
+					requestPayload.context.executionData.error.node.parameters = {};
+				}
+			}
+			// If the payload is still too big, remove the whole context object
+			if (getRequestPayloadSize(payload) > size) {
+				requestPayload.context = undefined;
+			}
+			// For error helper, remove parameters from the active node object
+			// This will leave just the error, user info and basic node structure in the payload
+		} else if (requestPayload.type === 'init-error-helper') {
+			requestPayload.node.parameters = {};
+		}
+		// If the payload is still too big, throw an error that will be shown to the user
+		if (getRequestPayloadSize(payload) > size) {
+			throw new Error(locale.baseText('aiAssistant.payloadTooBig.message'));
+		}
+	};
+
+	/**
+	 * Get the size of the request payload in KB, returns 0 if the payload is not a valid object
+	 */
+	const getRequestPayloadSize = (payload: ChatRequest.RequestPayload): number => {
+		try {
+			return getObjectSizeInKB(payload.payload);
+		} catch (error) {
+			return 0;
+		}
+	};
+
 	return {
 		processNodeForAssistant,
 		getNodeInfoForAssistant,
@@ -261,5 +320,6 @@ export const useAIAssistantHelpers = () => {
 		getReferencedNodes,
 		simplifyResultData,
 		simplifyWorkflowForAssistant,
+		trimPayloadSize: trimPayloadToSize,
 	};
 };
diff --git a/packages/editor-ui/src/composables/useBugReporting.ts b/packages/editor-ui/src/composables/useBugReporting.ts
index 48c9f621f7..739dd4832b 100644
--- a/packages/editor-ui/src/composables/useBugReporting.ts
+++ b/packages/editor-ui/src/composables/useBugReporting.ts
@@ -15,6 +15,7 @@ const REPORT_TEMPLATE = `
 
 \`\`\`
 (Select the nodes on your canvas and use the keyboard shortcuts CMD+C/CTRL+C and CMD+V/CTRL+V to copy and paste the workflow.)
+⚠️ WARNING ⚠️ If you have sensitive data in your workflow (like API keys), please remove it before sharing.
 \`\`\`
 
 
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/editor-ui/src/composables/useCanvasMapping.ts
index 517463fc6c..087a18a662 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.ts
@@ -133,16 +133,6 @@ export function useCanvasMapping({
 		}, {}),
 	);
 
-	const activeTriggerNodeCount = computed(
-		() =>
-			nodes.value.filter(
-				(node) =>
-					nodeTypeDescriptionByNodeId.value[node.id]?.eventTriggerDescription !== '' &&
-					isTriggerNodeById.value[node.id] &&
-					!node.disabled,
-			).length,
-	);
-
 	const nodeSubtitleById = computed(() => {
 		return nodes.value.reduce<Record<string, string>>((acc, node) => {
 			try {
@@ -255,13 +245,28 @@ export function useCanvasMapping({
 		}, {}),
 	);
 
-	const nodeTooltipById = computed(() =>
-		nodes.value.reduce<Record<string, string | undefined>>((acc, node) => {
+	const nodeTooltipById = computed(() => {
+		if (!workflowsStore.isWorkflowRunning) {
+			return {};
+		}
+
+		const activeTriggerNodeCount = nodes.value.filter(
+			(node) => isTriggerNodeById.value[node.id] && !node.disabled,
+		).length;
+		const triggerNodeName = workflowsStore.getWorkflowExecution?.triggerNode;
+
+		// For workflows with multiple active trigger nodes, we show a tooltip only when
+		// trigger node name is known
+		if (triggerNodeName === undefined && activeTriggerNodeCount !== 1) {
+			return {};
+		}
+
+		return nodes.value.reduce<Record<string, string | undefined>>((acc, node) => {
 			const nodeTypeDescription = nodeTypeDescriptionByNodeId.value[node.id];
 			if (nodeTypeDescription && isTriggerNodeById.value[node.id]) {
 				if (
-					activeTriggerNodeCount.value !== 1 ||
-					!workflowsStore.isWorkflowRunning ||
+					!!node.disabled ||
+					(triggerNodeName !== undefined && triggerNodeName !== node.name) ||
 					!['new', 'unknown', 'waiting'].includes(nodeExecutionStatusById.value[node.id])
 				) {
 					return acc;
@@ -283,8 +288,8 @@ export function useCanvasMapping({
 			}
 
 			return acc;
-		}, {}),
-	);
+		}, {});
+	});
 
 	const nodeExecutionRunningById = computed(() =>
 		nodes.value.reduce<Record<string, boolean>>((acc, node) => {
diff --git a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
index 83c1edbe42..449edfd5db 100644
--- a/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
+++ b/packages/editor-ui/src/composables/useCanvasMouseSelect.ts
@@ -1,6 +1,6 @@
 import type { INodeUi, XYPosition } from '@/Interface';
 
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getMousePosition, getRelativePosition } from '@/utils/nodeViewUtils';
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHover.test.ts b/packages/editor-ui/src/composables/useCanvasNodeHover.test.ts
new file mode 100644
index 0000000000..9b63658642
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCanvasNodeHover.test.ts
@@ -0,0 +1,93 @@
+/* eslint-disable vue/one-component-per-file */
+import { renderComponent } from '@/__tests__/render';
+import { type CanvasNode } from '@/types';
+import { fireEvent } from '@testing-library/dom';
+import { type Rect, useVueFlow, VueFlow } from '@vue-flow/core';
+import { describe, expect, it } from 'vitest';
+import { computed, defineComponent, h } from 'vue';
+import { useCanvasNodeHover } from './useCanvasNodeHover';
+
+describe(useCanvasNodeHover, () => {
+	beforeEach(() => {
+		vi.useRealTimers();
+	});
+
+	function getHitBoxMargin10(rect: Rect): Rect {
+		return {
+			x: rect.x - 10,
+			y: rect.y - 10,
+			width: rect.width + 20,
+			height: rect.height + 20,
+		};
+	}
+
+	function getHitBoxMargin100(rect: Rect): Rect {
+		return {
+			x: rect.x - 100,
+			y: rect.y - 100,
+			width: rect.width + 200,
+			height: rect.height + 200,
+		};
+	}
+
+	const nodesRef = computed<CanvasNode[]>(() => [
+		{ id: 'node-1', position: { x: 100, y: 100 } },
+		{ id: 'node-2', position: { x: 100, y: 200 } },
+	]);
+
+	it('should return ID of the node which a mousemove event was emitted on', async () => {
+		vi.useFakeTimers();
+
+		const TestComponent = defineComponent({
+			setup() {
+				const store = useVueFlow();
+				return useCanvasNodeHover(nodesRef, store, getHitBoxMargin10);
+			},
+			render() {
+				return h('div', [
+					h('div', { 'data-test-id': 'hovered' }, this.id ?? 'no match'),
+					h(VueFlow, { 'data-test-id': 'canvas', nodes: nodesRef.value }),
+				]);
+			},
+		});
+		const wrapper = renderComponent(TestComponent);
+
+		expect(wrapper.getByTestId('hovered')).toHaveTextContent('no match');
+
+		fireEvent.mouseMove(wrapper.getByTestId('canvas'), { clientX: 90, clientY: 90 });
+		await wrapper.rerender({});
+		expect(wrapper.getByTestId('hovered')).toHaveTextContent('node-1');
+
+		vi.advanceTimersByTime(1000); // Advance timer to circumvent throttling
+
+		fireEvent.mouseMove(wrapper.getByTestId('canvas'), { clientX: 110, clientY: 210 });
+		await wrapper.rerender({});
+		expect(wrapper.getByTestId('hovered')).toHaveTextContent('node-2');
+
+		vi.advanceTimersByTime(1000); // Advance timer to circumvent throttling
+
+		fireEvent.mouseMove(wrapper.getByTestId('canvas'), { clientX: 0, clientY: 0 });
+		await wrapper.rerender({});
+		expect(wrapper.getByTestId('hovered')).toHaveTextContent('no match');
+	});
+
+	it('should return ID of the closest node if more than one node exist near the coordinate of mousemove event', async () => {
+		const TestComponent = defineComponent({
+			setup() {
+				const store = useVueFlow();
+				return useCanvasNodeHover(nodesRef, store, getHitBoxMargin100);
+			},
+			render() {
+				return h('div', [
+					h('div', { 'data-test-id': 'hovered' }, this.id ?? 'no match'),
+					h(VueFlow, { 'data-test-id': 'canvas', nodes: nodesRef.value }),
+				]);
+			},
+		});
+		const wrapper = renderComponent(TestComponent);
+
+		fireEvent.mouseMove(wrapper.getByTestId('canvas'), { clientX: 100, clientY: 160 });
+		await wrapper.rerender({});
+		expect(wrapper.getByTestId('hovered')).toHaveTextContent('node-2');
+	});
+});
diff --git a/packages/editor-ui/src/composables/useCanvasNodeHover.ts b/packages/editor-ui/src/composables/useCanvasNodeHover.ts
new file mode 100644
index 0000000000..e373d8b010
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCanvasNodeHover.ts
@@ -0,0 +1,82 @@
+import { type CanvasNode } from '@/types';
+import { getRectOfNodes, type Rect, type VueFlowStore } from '@vue-flow/core';
+import { useThrottleFn } from '@vueuse/core';
+import { type ComputedRef, onMounted, onUnmounted, ref } from 'vue';
+
+/**
+ * From a given node list, finds a node that the mouse cursor is within its hit box.
+ * If more than one node meets this condition, returns the closest one.
+ */
+export function useCanvasNodeHover(
+	nodesRef: ComputedRef<CanvasNode[]>,
+	store: VueFlowStore,
+	getHitBox: (rect: Rect) => Rect,
+) {
+	const id = ref<string | undefined>();
+
+	const recalculate = useThrottleFn(
+		(event: MouseEvent) => {
+			const bounds = store.viewportRef.value?.getBoundingClientRect();
+
+			if (!bounds) {
+				return;
+			}
+
+			const eventCoord = store.project({
+				x: event.clientX - bounds.x,
+				y: event.clientY - bounds.y,
+			});
+
+			const nearbyNodes = nodesRef.value
+				.flatMap((node) => {
+					if (node.data?.disabled) {
+						return [];
+					}
+
+					const vueFlowNode = store.nodeLookup.value.get(node.id);
+
+					if (!vueFlowNode) {
+						return [];
+					}
+
+					const nodeRect = getRectOfNodes([vueFlowNode]);
+					const hitBox = getHitBox(nodeRect);
+
+					if (
+						hitBox.x > eventCoord.x ||
+						eventCoord.x > hitBox.x + hitBox.width ||
+						hitBox.y > eventCoord.y ||
+						eventCoord.y > hitBox.y + hitBox.height
+					) {
+						return [];
+					}
+
+					const dx = nodeRect.x + nodeRect.width / 2 - eventCoord.x;
+					const dy = nodeRect.y + nodeRect.height / 2 - eventCoord.y;
+
+					return [
+						{
+							id: node.id,
+							squareDistance: dx ** 2 + dy ** 2,
+						},
+					];
+				})
+				.toSorted((nodeA, nodeB) => nodeA.squareDistance - nodeB.squareDistance);
+
+			id.value = nearbyNodes[0]?.id;
+		},
+		200,
+		true,
+		true,
+	);
+
+	onMounted(() => {
+		store.vueFlowRef.value?.addEventListener('mousemove', recalculate);
+	});
+
+	onUnmounted(() => {
+		store.vueFlowRef.value?.removeEventListener('mousemove', recalculate);
+	});
+
+	return { id };
+}
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.test.ts b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
index 1d20a020e0..bc6f94301b 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.test.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
@@ -995,6 +995,18 @@ describe('useCanvasOperations', () => {
 
 			expect(ndvStore.activeNodeName).toBe('Existing Node');
 		});
+
+		it('should set node as dirty when node is set active', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const node = createTestNode();
+
+			workflowsStore.getNodeById.mockImplementation(() => node);
+
+			const { setNodeActive } = useCanvasOperations({ router });
+			setNodeActive(node.id);
+
+			expect(workflowsStore.setNodePristine).toHaveBeenCalledWith(node.name, false);
+		});
 	});
 
 	describe('setNodeActiveByName', () => {
@@ -2612,6 +2624,230 @@ describe('useCanvasOperations', () => {
 			expect(workflowsStore.setWorkflowPinData).toHaveBeenCalledWith({});
 		});
 	});
+
+	describe('connectAdjacentNodes', () => {
+		it('should connect nodes that were connected through the removed node', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const historyStore = mockedStore(useHistoryStore);
+
+			// Create three nodes in a sequence: A -> B -> C
+			const nodeA = createTestNode({ id: 'A', name: 'Node A', position: [0, 0] });
+			const nodeB = createTestNode({ id: 'B', name: 'Node B', position: [100, 0] });
+			const nodeC = createTestNode({ id: 'C', name: 'Node C', position: [200, 0] });
+
+			const nodeTypeDescription = mockNodeTypeDescription({
+				name: nodeA.type,
+				inputs: [NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main],
+			});
+
+			nodeTypesStore.getNodeType = vi.fn(() => nodeTypeDescription);
+
+			// Set up the workflow connections A -> B -> C
+			workflowsStore.workflow.nodes = [nodeA, nodeB, nodeC];
+			workflowsStore.workflow.connections = {
+				[nodeA.name]: {
+					main: [[{ node: nodeB.name, type: NodeConnectionType.Main, index: 0 }]],
+				},
+				[nodeB.name]: {
+					main: [[{ node: nodeC.name, type: NodeConnectionType.Main, index: 0 }]],
+				},
+			};
+
+			// Mock store methods
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+			workflowsStore.getNodeById.mockImplementation(
+				(id: string) =>
+					({
+						[nodeA.id]: nodeA,
+						[nodeB.id]: nodeB,
+						[nodeC.id]: nodeC,
+					})[id],
+			);
+			workflowsStore.getNodeByName.mockImplementation(
+				(name: string) =>
+					({
+						[nodeA.name]: nodeA,
+						[nodeB.name]: nodeB,
+						[nodeC.name]: nodeC,
+					})[name],
+			);
+			workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({
+				main: [[{ node: nodeC.name, type: NodeConnectionType.Main, index: 0 }]],
+			});
+			workflowsStore.incomingConnectionsByNodeName.mockReturnValue({
+				main: [[{ node: nodeA.name, type: NodeConnectionType.Main, index: 0 }]],
+			});
+
+			const { connectAdjacentNodes } = useCanvasOperations({ router });
+			connectAdjacentNodes(nodeB.id, { trackHistory: true });
+
+			// Check that A was connected directly to C
+			expect(workflowsStore.addConnection).toHaveBeenCalledWith({
+				connection: [
+					{ node: nodeA.name, type: NodeConnectionType.Main, index: 0 },
+					{ node: nodeC.name, type: NodeConnectionType.Main, index: 0 },
+				],
+			});
+
+			// Verify the connection was tracked in history
+			expect(historyStore.pushCommandToUndo).toHaveBeenCalled();
+		});
+
+		it('should connect nodes that were connected through the removed node at different indices', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const historyStore = mockedStore(useHistoryStore);
+
+			// Create three nodes in a sequence: A -> B -> C
+			const nodeA = createTestNode({ id: 'A', name: 'Node A', position: [0, 0] });
+			const nodeB = createTestNode({ id: 'B', name: 'Node B', position: [100, 0] });
+			const nodeC = createTestNode({ id: 'C', name: 'Node C', position: [200, 0] });
+
+			const nodeTypeDescription = mockNodeTypeDescription({
+				name: nodeA.type,
+				inputs: [NodeConnectionType.Main, NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main, NodeConnectionType.Main],
+			});
+
+			nodeTypesStore.getNodeType = vi.fn(() => nodeTypeDescription);
+
+			// Set up the workflow connections A -> B -> C
+			workflowsStore.workflow.nodes = [nodeA, nodeB, nodeC];
+			workflowsStore.workflow.connections = {
+				[nodeA.name]: {
+					main: [[{ node: nodeB.name, type: NodeConnectionType.Main, index: 1 }]],
+				},
+				[nodeB.name]: {
+					main: [[{ node: nodeC.name, type: NodeConnectionType.Main, index: 0 }]],
+				},
+			};
+
+			// Mock store methods
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+			workflowsStore.getNodeById.mockImplementation(
+				(id: string) =>
+					({
+						[nodeA.id]: nodeA,
+						[nodeB.id]: nodeB,
+						[nodeC.id]: nodeC,
+					})[id],
+			);
+			workflowsStore.getNodeByName.mockImplementation(
+				(name: string) =>
+					({
+						[nodeA.name]: nodeA,
+						[nodeB.name]: nodeB,
+						[nodeC.name]: nodeC,
+					})[name],
+			);
+			workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({
+				main: [[{ node: nodeC.name, type: NodeConnectionType.Main, index: 1 }]],
+			});
+			workflowsStore.incomingConnectionsByNodeName.mockReturnValue({
+				main: [[{ node: nodeA.name, type: NodeConnectionType.Main, index: 0 }]],
+			});
+
+			const { connectAdjacentNodes } = useCanvasOperations({ router });
+			connectAdjacentNodes(nodeB.id, { trackHistory: true });
+
+			// Check that A was connected directly to C
+			expect(workflowsStore.addConnection).toHaveBeenCalledWith({
+				connection: [
+					{ node: nodeA.name, type: NodeConnectionType.Main, index: 0 },
+					{ node: nodeC.name, type: NodeConnectionType.Main, index: 1 },
+				],
+			});
+
+			// Verify the connection was tracked in history
+			expect(historyStore.pushCommandToUndo).toHaveBeenCalled();
+		});
+
+		it('should not create connections if middle node has no incoming connections', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+
+			// Create nodes: B -> C (no incoming to B)
+			const nodeB = createTestNode({ id: 'B', name: 'Node B', position: [100, 0] });
+			const nodeC = createTestNode({ id: 'C', name: 'Node C', position: [200, 0] });
+
+			workflowsStore.workflow.nodes = [nodeB, nodeC];
+			workflowsStore.workflow.connections = {
+				[nodeB.name]: {
+					main: [[{ node: nodeC.name, type: NodeConnectionType.Main, index: 0 }]],
+				},
+			};
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+			workflowsStore.getNodeById.mockReturnValue(nodeB);
+			workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({
+				main: [[{ node: nodeC.name, type: NodeConnectionType.Main, index: 0 }]],
+			});
+			workflowsStore.incomingConnectionsByNodeName.mockReturnValue({});
+
+			const { connectAdjacentNodes } = useCanvasOperations({ router });
+			connectAdjacentNodes(nodeB.id);
+
+			expect(workflowsStore.addConnection).not.toHaveBeenCalled();
+		});
+
+		it('should not create connections if middle node has no outgoing connections', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+
+			// Create nodes: A -> B (no outgoing from B)
+			const nodeA = createTestNode({ id: 'A', name: 'Node A', position: [0, 0] });
+			const nodeB = createTestNode({ id: 'B', name: 'Node B', position: [100, 0] });
+
+			workflowsStore.workflow.nodes = [nodeA, nodeB];
+			workflowsStore.workflow.connections = {
+				[nodeA.name]: {
+					main: [[{ node: nodeB.name, type: NodeConnectionType.Main, index: 0 }]],
+				},
+			};
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+			workflowsStore.getNodeById.mockReturnValue(nodeB);
+			workflowsStore.outgoingConnectionsByNodeName.mockReturnValue({});
+			workflowsStore.incomingConnectionsByNodeName.mockReturnValue({
+				main: [[{ node: nodeA.name, type: NodeConnectionType.Main, index: 0 }]],
+			});
+
+			const { connectAdjacentNodes } = useCanvasOperations({ router });
+			connectAdjacentNodes(nodeB.id);
+
+			expect(workflowsStore.addConnection).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('toggleChatOpen', () => {
+		it('should invoke workflowsStore#setPanelOpen with 2nd argument `true` if the chat panel is closed', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const { toggleChatOpen } = useCanvasOperations({ router });
+
+			workflowsStore.getCurrentWorkflow.mockReturnValue(createTestWorkflowObject());
+			workflowsStore.isChatPanelOpen = false;
+
+			await toggleChatOpen('main');
+
+			expect(workflowsStore.setPanelOpen).toHaveBeenCalledWith('chat', true);
+		});
+
+		it('should invoke workflowsStore#setPanelOpen with 2nd argument `false` if the chat panel is open', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const { toggleChatOpen } = useCanvasOperations({ router });
+
+			workflowsStore.getCurrentWorkflow.mockReturnValue(createTestWorkflowObject());
+			workflowsStore.isChatPanelOpen = true;
+
+			await toggleChatOpen('main');
+
+			expect(workflowsStore.setPanelOpen).toHaveBeenCalledWith('chat', false);
+		});
+	});
 });
 
 function buildImportNodes() {
diff --git a/packages/editor-ui/src/composables/useCanvasOperations.ts b/packages/editor-ui/src/composables/useCanvasOperations.ts
index dacac9cd2c..5f9d1c86f6 100644
--- a/packages/editor-ui/src/composables/useCanvasOperations.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.ts
@@ -281,12 +281,12 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 								{
 									node: incomingConnection.node,
 									type,
-									index: 0,
+									index: incomingConnection.index,
 								},
 								{
 									node: outgoingConnection.node,
 									type,
-									index: 0,
+									index: outgoingConnection.index,
 								},
 							]),
 						);
@@ -297,11 +297,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 						sourceHandle: createCanvasConnectionHandleString({
 							mode: CanvasConnectionMode.Output,
 							type,
+							index: incomingConnection.index,
 						}),
 						target: outgoingNodeId,
 						targetHandle: createCanvasConnectionHandleString({
 							mode: CanvasConnectionMode.Input,
 							type,
+							index: outgoingConnection.index,
 						}),
 					});
 				}
@@ -381,6 +383,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			return;
 		}
 
+		workflowsStore.setNodePristine(node.name, false);
 		setNodeActiveByName(node.name);
 	}
 
@@ -740,6 +743,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 	function trackAddDefaultNode(nodeData: INodeUi, options: AddNodeOptions) {
 		nodeCreatorStore.onNodeAddedToCanvas({
+			node_id: nodeData.id,
 			node_type: nodeData.type,
 			node_version: nodeData.typeVersion,
 			is_auto_add: options.isAutoAdd,
@@ -1923,7 +1927,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 		workflowsStore.setWorkflowExecutionData(data);
 
-		if (data.mode !== 'manual') {
+		if (!['manual', 'evaluation'].includes(data.mode)) {
 			workflowsStore.setWorkflowPinData({});
 		}
 
@@ -1932,6 +1936,20 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		return data;
 	}
 
+	async function toggleChatOpen(source: 'node' | 'main') {
+		const workflow = workflowsStore.getCurrentWorkflow();
+
+		workflowsStore.setPanelOpen('chat', !workflowsStore.isChatPanelOpen);
+
+		const payload = {
+			workflow_id: workflow.id,
+			button_type: source,
+		};
+
+		void externalHooks.run('nodeView.onOpenChat', payload);
+		telemetry.track('User clicked chat open button', payload);
+	}
+
 	return {
 		lastClickPosition,
 		editableWorkflow,
@@ -1971,11 +1989,13 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		revalidateNodeOutputConnections,
 		isConnectionAllowed,
 		filterConnectionsByNodes,
+		connectAdjacentNodes,
 		importWorkflowData,
 		fetchWorkflowDataFromUrl,
 		resetWorkspace,
 		initializeWorkspace,
 		resolveNodeWebhook,
 		openExecution,
+		toggleChatOpen,
 	};
 }
diff --git a/packages/editor-ui/src/composables/useCanvasPanning.ts b/packages/editor-ui/src/composables/useCanvasPanning.ts
index e260424cf5..88aee9ba09 100644
--- a/packages/editor-ui/src/composables/useCanvasPanning.ts
+++ b/packages/editor-ui/src/composables/useCanvasPanning.ts
@@ -3,7 +3,7 @@ import { ref, unref } from 'vue';
 
 import { getMousePosition } from '@/utils/nodeViewUtils';
 import { useUIStore } from '@/stores/ui.store';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { MOUSE_EVENT_BUTTON, MOUSE_EVENT_BUTTONS } from '@/constants';
 
 /**
diff --git a/packages/editor-ui/src/composables/useCodeEditor.test.ts b/packages/editor-ui/src/composables/useCodeEditor.test.ts
new file mode 100644
index 0000000000..7dbb31f110
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCodeEditor.test.ts
@@ -0,0 +1,103 @@
+import { renderComponent } from '@/__tests__/render';
+import { EditorView } from '@codemirror/view';
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor } from '@testing-library/vue';
+import { setActivePinia } from 'pinia';
+import { beforeEach, describe, vi } from 'vitest';
+import { defineComponent, h, ref, toValue } from 'vue';
+import { useCodeEditor } from './useCodeEditor';
+import userEvent from '@testing-library/user-event';
+
+describe('useCodeEditor', () => {
+	const defaultOptions: Omit<Parameters<typeof useCodeEditor>[0], 'editorRef'> = {
+		language: 'javaScript',
+	};
+
+	const renderCodeEditor = async (options: Partial<typeof defaultOptions> = defaultOptions) => {
+		let codeEditor!: ReturnType<typeof useCodeEditor>;
+		const renderResult = renderComponent(
+			defineComponent({
+				setup() {
+					const root = ref<HTMLElement>();
+					codeEditor = useCodeEditor({ ...defaultOptions, ...options, editorRef: root });
+
+					return () => h('div', { ref: root, 'data-test-id': 'editor-root' });
+				},
+			}),
+			{ props: { options } },
+		);
+		expect(renderResult.getByTestId('editor-root')).toBeInTheDocument();
+		await waitFor(() => toValue(codeEditor.editor));
+		return { renderResult, codeEditor };
+	};
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+		vi.useRealTimers();
+	});
+
+	it('should create an editor', async () => {
+		const { codeEditor } = await renderCodeEditor();
+
+		await waitFor(() => expect(toValue(codeEditor.editor)).toBeInstanceOf(EditorView));
+	});
+
+	it('should focus editor', async () => {
+		const { renderResult, codeEditor } = await renderCodeEditor({});
+
+		const root = renderResult.getByTestId('editor-root');
+		const input = root.querySelector('.cm-line') as HTMLDivElement;
+
+		await userEvent.click(input);
+
+		expect(codeEditor.editor.value?.hasFocus).toBe(true);
+	});
+
+	it('should emit changes', async () => {
+		vi.useFakeTimers();
+
+		const user = userEvent.setup({
+			advanceTimers: vi.advanceTimersByTime,
+		});
+
+		const onChange = vi.fn();
+		const { renderResult } = await renderCodeEditor({
+			onChange,
+		});
+
+		const root = renderResult.getByTestId('editor-root');
+		const input = root.querySelector('.cm-line') as HTMLDivElement;
+
+		await user.type(input, 'test');
+
+		vi.advanceTimersByTime(300);
+
+		expect(onChange.mock.calls[0][0].state.doc.toString()).toEqual('test');
+	});
+
+	it('should emit debounced changes before unmount', async () => {
+		vi.useFakeTimers();
+
+		const user = userEvent.setup({
+			advanceTimers: vi.advanceTimersByTime,
+		});
+
+		const onChange = vi.fn();
+		const { renderResult } = await renderCodeEditor({
+			onChange,
+		});
+
+		const root = renderResult.getByTestId('editor-root');
+		const input = root.querySelector('.cm-line') as HTMLDivElement;
+
+		await user.type(input, 'test');
+
+		renderResult.unmount();
+
+		expect(onChange.mock.calls[0][0].state.doc.toString()).toEqual('test');
+	});
+});
diff --git a/packages/editor-ui/src/composables/useCodeEditor.ts b/packages/editor-ui/src/composables/useCodeEditor.ts
index 0a63189eed..a470b72f77 100644
--- a/packages/editor-ui/src/composables/useCodeEditor.ts
+++ b/packages/editor-ui/src/composables/useCodeEditor.ts
@@ -30,7 +30,6 @@ import {
 } from '@codemirror/view';
 import { indentationMarkers } from '@replit/codemirror-indentation-markers';
 import { html } from 'codemirror-lang-html-n8n';
-import { debounce } from 'lodash-es';
 import { jsonParse, type CodeExecutionMode, type IDataObject } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import {
@@ -47,6 +46,8 @@ import {
 import { useCompleter } from '../components/CodeNodeEditor/completer';
 import { mappingDropCursor } from '../plugins/codemirror/dragAndDrop';
 import { languageFacet, type CodeEditorLanguage } from '../plugins/codemirror/format';
+import { debounce } from 'lodash-es';
+import { ignoreUpdateAnnotation } from '../utils/forceParse';
 
 export type CodeEditorLanguageParamsMap = {
 	json: {};
@@ -85,7 +86,6 @@ export const useCodeEditor = <L extends CodeEditorLanguage>({
 	const editor = ref<EditorView>();
 	const hasFocus = ref(false);
 	const hasChanges = ref(false);
-	const lastChange = ref<ViewUpdate>();
 	const selection = ref<SelectionRange>(EditorSelection.cursor(0)) as Ref<SelectionRange>;
 	const customExtensions = ref<Compartment>(new Compartment());
 	const readOnlyExtensions = ref<Compartment>(new Compartment());
@@ -154,17 +154,18 @@ export const useCodeEditor = <L extends CodeEditorLanguage>({
 		}
 	}
 
-	const emitChanges = debounce((update: ViewUpdate) => {
-		onChange(update);
-	}, 300);
+	const emitChanges = debounce(onChange, 300);
 
 	function onEditorUpdate(update: ViewUpdate) {
 		autocompleteStatus.value = completionStatus(update.view.state);
 		updateSelection(update);
 
-		if (update.docChanged) {
+		const shouldIgnoreUpdate = update.transactions.some((tr) =>
+			tr.annotation(ignoreUpdateAnnotation),
+		);
+
+		if (update.docChanged && !shouldIgnoreUpdate) {
 			hasChanges.value = true;
-			lastChange.value = update;
 			emitChanges(update);
 		}
 	}
@@ -369,7 +370,8 @@ export const useCodeEditor = <L extends CodeEditorLanguage>({
 				// Code is too large, localStorage quota exceeded
 				localStorage.removeItem(storedStateId.value);
 			}
-			if (lastChange.value) onChange(lastChange.value);
+
+			emitChanges.flush();
 			editor.value.destroy();
 		}
 	});
diff --git a/packages/editor-ui/src/composables/useDataSchema.test.ts b/packages/editor-ui/src/composables/useDataSchema.test.ts
index 212f767675..44fdb60f7c 100644
--- a/packages/editor-ui/src/composables/useDataSchema.test.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.test.ts
@@ -9,11 +9,13 @@ import {
 	type ITaskDataConnections,
 } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { JSONSchema7 } from 'json-schema';
 
 vi.mock('@/stores/workflows.store');
 
 describe('useDataSchema', () => {
 	const getSchema = useDataSchema().getSchema;
+
 	describe('getSchema', () => {
 		test.each([
 			[, { type: 'undefined', value: 'undefined', path: '' }],
@@ -534,6 +536,7 @@ describe('useDataSchema', () => {
 			expect(filterSchema(flatSchema, '')).toEqual(flatSchema);
 		});
 	});
+
 	describe('getNodeInputData', () => {
 		const getNodeInputData = useDataSchema().getNodeInputData;
 
@@ -648,6 +651,132 @@ describe('useDataSchema', () => {
 			},
 		);
 	});
+
+	describe('getSchemaForJsonSchema', () => {
+		const getSchemaForJsonSchema = useDataSchema().getSchemaForJsonSchema;
+
+		it('should convert JSON schema to Schema type', () => {
+			const jsonSchema: JSONSchema7 = {
+				type: 'object',
+				properties: {
+					id: {
+						type: 'string',
+					},
+					email: {
+						type: 'string',
+					},
+					address: {
+						type: 'object',
+						properties: {
+							line1: {
+								type: 'string',
+							},
+							country: {
+								type: 'string',
+							},
+						},
+					},
+					tags: {
+						type: 'array',
+						items: { type: 'string' },
+					},
+					workspaces: {
+						type: 'array',
+						items: {
+							type: 'object',
+							properties: {
+								id: {
+									type: 'string',
+								},
+								name: {
+									type: 'string',
+								},
+							},
+							required: ['gid', 'name', 'resource_type'],
+						},
+					},
+				},
+				required: ['gid', 'email', 'name', 'photo', 'resource_type', 'workspaces'],
+			};
+
+			expect(getSchemaForJsonSchema(jsonSchema)).toEqual({
+				path: '',
+				type: 'object',
+				value: [
+					{
+						key: 'id',
+						path: '.id',
+						type: 'string',
+						value: '',
+					},
+					{
+						key: 'email',
+						path: '.email',
+						type: 'string',
+						value: '',
+					},
+					{
+						key: 'address',
+						path: '.address',
+						type: 'object',
+						value: [
+							{
+								key: 'line1',
+								path: '.address.line1',
+								type: 'string',
+								value: '',
+							},
+							{
+								key: 'country',
+								path: '.address.country',
+								type: 'string',
+								value: '',
+							},
+						],
+					},
+					{
+						key: 'tags',
+						path: '.tags',
+						type: 'array',
+						value: [
+							{
+								key: '0',
+								path: '.tags[0]',
+								type: 'string',
+								value: '',
+							},
+						],
+					},
+					{
+						key: 'workspaces',
+						path: '.workspaces',
+						type: 'array',
+						value: [
+							{
+								key: '0',
+								path: '.workspaces[0]',
+								type: 'object',
+								value: [
+									{
+										key: 'id',
+										path: '.workspaces[0].id',
+										type: 'string',
+										value: '',
+									},
+									{
+										key: 'name',
+										path: '.workspaces[0].name',
+										type: 'string',
+										value: '',
+									},
+								],
+							},
+						],
+					},
+				],
+			});
+		});
+	});
 });
 
 describe('useFlattenSchema', () => {
@@ -684,4 +813,27 @@ describe('useFlattenSchema', () => {
 			}).length,
 		).toBe(3);
 	});
+
+	it('items ids should be unique', () => {
+		const { flattenSchema } = useFlattenSchema();
+		const schema: Schema = {
+			path: '',
+			type: 'object',
+			value: [
+				{
+					key: 'index',
+					type: 'number',
+					value: '0',
+					path: '.index',
+				},
+			],
+		};
+		const node1 = { name: 'First Node', type: 'any' };
+		const node2 = { name: 'Second Node', type: 'any' };
+
+		const node1Schema = flattenSchema({ schema, node: node1, depth: 1 });
+		const node2Schema = flattenSchema({ schema, node: node2, depth: 1 });
+
+		expect(node1Schema[0].id).not.toBe(node2Schema[0].id);
+	});
 });
diff --git a/packages/editor-ui/src/composables/useDataSchema.ts b/packages/editor-ui/src/composables/useDataSchema.ts
index 8896f8dd7e..ee4b617cfb 100644
--- a/packages/editor-ui/src/composables/useDataSchema.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.ts
@@ -1,5 +1,5 @@
 import { ref } from 'vue';
-import type { Optional, Primitives, Schema, INodeUi } from '@/Interface';
+import type { Optional, Primitives, Schema, INodeUi, SchemaType } from '@/Interface';
 import {
 	type ITaskDataConnections,
 	type IDataObject,
@@ -13,6 +13,8 @@ import { isObj } from '@/utils/typeGuards';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isPresent, shorten } from '@/utils/typesUtils';
 import { useI18n } from '@/composables/useI18n';
+import type { JSONSchema7, JSONSchema7Definition, JSONSchema7TypeName } from 'json-schema';
+import { isObject } from '@/utils/objectUtils';
 
 export function useDataSchema() {
 	function getSchema(
@@ -67,6 +69,58 @@ export function useDataSchema() {
 		return getSchema(merge({}, head, ...tail, head), undefined, excludeValues);
 	}
 
+	function getSchemaForJsonSchema(schema: JSONSchema7 | JSONSchema7Definition, path = ''): Schema {
+		if (typeof schema !== 'object') {
+			return {
+				type: 'null',
+				path,
+				value: 'null',
+			};
+		}
+		if (schema.type === 'array') {
+			return {
+				type: 'array',
+				value: isObject(schema.items)
+					? [{ ...getSchemaForJsonSchema(schema.items, `${path}[0]`), key: '0' }]
+					: [],
+				path,
+			};
+		}
+
+		if (schema.type === 'object') {
+			const properties = schema.properties ?? {};
+			const value = Object.entries(properties).map(([key, propSchema]) => {
+				const newPath = path ? `${path}.${key}` : `.${key}`;
+				const transformed = getSchemaForJsonSchema(propSchema, newPath);
+				return { ...transformed, key };
+			});
+
+			return {
+				type: 'object',
+				value,
+				path,
+			};
+		}
+
+		const type = Array.isArray(schema.type) ? schema.type[0] : schema.type;
+		return {
+			type: JsonSchemaTypeToSchemaType(type),
+			value: '',
+			path,
+		};
+	}
+
+	function JsonSchemaTypeToSchemaType(type: JSONSchema7TypeName | undefined): SchemaType {
+		switch (type) {
+			case undefined:
+				return 'undefined';
+			case 'integer':
+				return 'number';
+			default:
+				return type;
+		}
+	}
+
 	// Returns the data of the main input
 	function getMainInputData(
 		connectionsData: ITaskDataConnections,
@@ -164,6 +218,7 @@ export function useDataSchema() {
 	return {
 		getSchema,
 		getSchemaForExecutionData,
+		getSchemaForJsonSchema,
 		getNodeInputData,
 		getInputDataWithPinned,
 		filterSchema,
@@ -177,6 +232,7 @@ export type SchemaNode = {
 	connectedOutputIndexes: number[];
 	itemsCount: number;
 	schema: Schema;
+	preview: boolean;
 };
 
 export type RenderItem = {
@@ -190,6 +246,7 @@ export type RenderItem = {
 	icon: string;
 	collapsable?: boolean;
 	nodeType?: INodeUi['type'];
+	preview?: boolean;
 	type: 'item';
 };
 
@@ -201,6 +258,7 @@ export type RenderHeader = {
 	nodeType: INodeTypeDescription;
 	itemCount: number | null;
 	type: 'header';
+	preview?: boolean;
 };
 
 type Renders = RenderHeader | RenderItem;
@@ -227,6 +285,15 @@ const emptyItem = (): RenderItem => ({
 	type: 'item',
 });
 
+const dummyItem = (): RenderItem => ({
+	id: `dummy-${window.crypto.randomUUID()}`,
+	icon: '',
+	level: 1,
+	title: '...',
+	type: 'item',
+	preview: true,
+});
+
 const isDataEmpty = (schema: Schema) => {
 	// Utilize the generated schema instead of looping over the entire data again
 	// The schema for empty data is { type: 'object', value: [] }
@@ -264,12 +331,14 @@ export const useFlattenSchema = () => {
 		depth = 0,
 		prefix = '',
 		level = 0,
+		preview,
 	}: {
 		schema: Schema;
 		node?: { name: string; type: string };
 		depth?: number;
 		prefix?: string;
 		level?: number;
+		preview?: boolean;
 	}): RenderItem[] => {
 		// only show empty item for the first level
 		if (isDataEmpty(schema) && depth <= 0) {
@@ -282,6 +351,8 @@ export const useFlattenSchema = () => {
 			path: schema.path,
 		});
 
+		const id = `${node.name}-${expression}`;
+
 		if (Array.isArray(schema.value)) {
 			const items: RenderItem[] = [];
 
@@ -293,14 +364,15 @@ export const useFlattenSchema = () => {
 					depth,
 					level,
 					icon: getIconBySchemaType(schema.type),
-					id: expression,
+					id,
 					collapsable: true,
 					nodeType: node.type,
 					type: 'item',
+					preview,
 				});
 			}
 
-			if (closedNodes.value.has(expression)) {
+			if (closedNodes.value.has(id)) {
 				return items;
 			}
 
@@ -314,6 +386,7 @@ export const useFlattenSchema = () => {
 							depth,
 							prefix: itemPrefix,
 							level: level + 1,
+							preview,
 						});
 					})
 					.flat(),
@@ -327,11 +400,12 @@ export const useFlattenSchema = () => {
 					level,
 					depth,
 					value: shorten(schema.value, 600, 0),
-					id: expression,
+					id,
 					icon: getIconBySchemaType(schema.type),
 					collapsable: false,
 					nodeType: node.type,
 					type: 'item',
+					preview,
 				},
 			];
 		}
@@ -354,6 +428,7 @@ export const useFlattenSchema = () => {
 				itemCount: item.itemsCount,
 				info: additionalInfo(item.node),
 				type: 'header',
+				preview: item.preview,
 			});
 
 			headerIds.value.add(item.node.name);
@@ -368,9 +443,20 @@ export const useFlattenSchema = () => {
 			}
 
 			acc.push(...flattenSchema(item));
+
+			if (item.preview) {
+				acc.push(dummyItem());
+			}
+
 			return acc;
 		}, []);
 	};
 
-	return { closedNodes, toggleLeaf, toggleNode, flattenSchema, flattenMultipleSchemas };
+	return {
+		closedNodes,
+		toggleLeaf,
+		toggleNode,
+		flattenSchema,
+		flattenMultipleSchemas,
+	};
 };
diff --git a/packages/editor-ui/src/composables/useDebounce.ts b/packages/editor-ui/src/composables/useDebounce.ts
index 5ed9f221f0..d71b9b5c7d 100644
--- a/packages/editor-ui/src/composables/useDebounce.ts
+++ b/packages/editor-ui/src/composables/useDebounce.ts
@@ -1,24 +1,19 @@
 import { ref } from 'vue';
-import { debounce as _debounce } from 'lodash-es';
+import { debounce as _debounce, type DebouncedFunc } from 'lodash-es';
 
 export interface DebounceOptions {
 	debounceTime: number;
 	trailing?: boolean;
 }
 
-export type DebouncedFunction<Args extends unknown[] = unknown[], R = void> = (...args: Args) => R;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type AnyFunction = (...args: any) => any;
 
 export function useDebounce() {
 	// Create a ref for the WeakMap to store debounced functions.
-	const debounceCache = ref(
-		// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		new WeakMap<DebouncedFunction<any, any>, DebouncedFunction<any, any>>(),
-	);
+	const debounceCache = ref(new WeakMap<AnyFunction, DebouncedFunc<AnyFunction>>());
 
-	const debounce = <T extends DebouncedFunction<Parameters<T>, ReturnType<T>>>(
-		fn: T,
-		options: DebounceOptions,
-	): T => {
+	const debounce = <T extends AnyFunction>(fn: T, options: DebounceOptions): DebouncedFunc<T> => {
 		const { trailing, debounceTime } = options;
 
 		// Check if a debounced version of the function is already stored in the WeakMap.
@@ -37,14 +32,14 @@ export function useDebounce() {
 			debounceCache.value.set(fn, debouncedFn);
 		}
 
-		return debouncedFn as T;
+		return debouncedFn;
 	};
 
-	const callDebounced = <T extends DebouncedFunction<Parameters<T>, ReturnType<T>>>(
+	const callDebounced = <T extends AnyFunction>(
 		fn: T,
 		options: DebounceOptions,
 		...inputParameters: Parameters<T>
-	): ReturnType<T> => {
+	): ReturnType<T> | undefined => {
 		const debouncedFn = debounce(fn, options);
 
 		return debouncedFn(...inputParameters);
diff --git a/packages/editor-ui/src/composables/useDebugInfo.test.ts b/packages/editor-ui/src/composables/useDebugInfo.test.ts
index 7bcea3601d..35acae7279 100644
--- a/packages/editor-ui/src/composables/useDebugInfo.test.ts
+++ b/packages/editor-ui/src/composables/useDebugInfo.test.ts
@@ -49,7 +49,7 @@ vi.mock('@/stores/settings.store', () => ({
 	useSettingsStore,
 }));
 
-vi.mock('n8n-design-system', () => ({
+vi.mock('@n8n/composables/useDeviceSupport', () => ({
 	useDeviceSupport: () => ({
 		isTouchDevice: false,
 		userAgent: 'Mozilla/5.0',
diff --git a/packages/editor-ui/src/composables/useDebugInfo.ts b/packages/editor-ui/src/composables/useDebugInfo.ts
index 13bd94ec17..ebe48ec828 100644
--- a/packages/editor-ui/src/composables/useDebugInfo.ts
+++ b/packages/editor-ui/src/composables/useDebugInfo.ts
@@ -1,6 +1,6 @@
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import type { WorkflowSettings } from 'n8n-workflow';
 
 type DebugInfo = {
diff --git a/packages/editor-ui/src/composables/useExecutingNode.test.ts b/packages/editor-ui/src/composables/useExecutingNode.test.ts
new file mode 100644
index 0000000000..d844e66cdd
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExecutingNode.test.ts
@@ -0,0 +1,109 @@
+import { useExecutingNode } from '@/composables/useExecutingNode';
+
+describe('useExecutingNode', () => {
+	it('should always have at least one executing node during execution', () => {
+		const { executingNode, executingNodeCompletionQueue, addExecutingNode, removeExecutingNode } =
+			useExecutingNode();
+
+		addExecutingNode('node1');
+
+		expect(executingNode.value).toEqual(['node1']);
+		expect(executingNodeCompletionQueue.value).toEqual([]);
+
+		addExecutingNode('node2');
+
+		expect(executingNode.value).toEqual(['node1', 'node2']);
+		expect(executingNodeCompletionQueue.value).toEqual([]);
+
+		addExecutingNode('node3');
+
+		expect(executingNode.value).toEqual(['node1', 'node2', 'node3']);
+		expect(executingNodeCompletionQueue.value).toEqual([]);
+
+		removeExecutingNode('node1');
+
+		expect(executingNode.value).toEqual(['node2', 'node3']);
+		expect(executingNodeCompletionQueue.value).toEqual([]);
+
+		removeExecutingNode('node2');
+
+		expect(executingNode.value).toEqual(['node3']);
+		expect(executingNodeCompletionQueue.value).toEqual([]);
+
+		removeExecutingNode('node3');
+
+		expect(executingNode.value).toEqual(['node3']);
+		expect(executingNodeCompletionQueue.value).toEqual(['node3']);
+
+		addExecutingNode('node4');
+
+		expect(executingNode.value).toEqual(['node4']);
+		expect(executingNodeCompletionQueue.value).toEqual([]);
+	});
+
+	describe('resolveNodeExecutionQueue', () => {
+		it('should clear all nodes from the execution queue', () => {
+			const { executingNode, executingNodeCompletionQueue, resolveNodeExecutionQueue } =
+				useExecutingNode();
+
+			executingNode.value = ['node1', 'node2'];
+			executingNodeCompletionQueue.value = ['node1', 'node2'];
+
+			resolveNodeExecutionQueue();
+
+			expect(executingNode.value).toEqual([]);
+			expect(executingNodeCompletionQueue.value).toEqual([]);
+		});
+
+		it('should keep the last executing node if keepLastInQueue is true and only one node is executing', () => {
+			const { executingNode, executingNodeCompletionQueue, resolveNodeExecutionQueue } =
+				useExecutingNode();
+			executingNode.value = ['node1'];
+			executingNodeCompletionQueue.value = ['node1'];
+
+			resolveNodeExecutionQueue(true);
+
+			expect(executingNode.value).toEqual(['node1']);
+			expect(executingNodeCompletionQueue.value).toEqual(['node1']);
+		});
+
+		it('should remove all nodes except the last one if keepLastInQueue is true and more than one node is executing', () => {
+			const { executingNode, executingNodeCompletionQueue, resolveNodeExecutionQueue } =
+				useExecutingNode();
+
+			executingNode.value = ['node1', 'node2'];
+			executingNodeCompletionQueue.value = ['node1', 'node2'];
+
+			resolveNodeExecutionQueue(true);
+
+			expect(executingNode.value).toEqual(['node2']);
+			expect(executingNodeCompletionQueue.value).toEqual(['node2']);
+		});
+
+		it('should clear all nodes if keepLastInQueue is false', () => {
+			const { executingNode, executingNodeCompletionQueue, resolveNodeExecutionQueue } =
+				useExecutingNode();
+
+			executingNode.value = ['node1', 'node2'];
+			executingNodeCompletionQueue.value = ['node1', 'node2'];
+
+			resolveNodeExecutionQueue(false);
+
+			expect(executingNode.value).toEqual([]);
+			expect(executingNodeCompletionQueue.value).toEqual([]);
+		});
+
+		it('should handle empty execution queue gracefully', () => {
+			const { executingNode, executingNodeCompletionQueue, resolveNodeExecutionQueue } =
+				useExecutingNode();
+
+			executingNode.value = [];
+			executingNodeCompletionQueue.value = [];
+
+			resolveNodeExecutionQueue();
+
+			expect(executingNode.value).toEqual([]);
+			expect(executingNodeCompletionQueue.value).toEqual([]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useExecutingNode.ts b/packages/editor-ui/src/composables/useExecutingNode.ts
new file mode 100644
index 0000000000..fd037c2dba
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExecutingNode.ts
@@ -0,0 +1,52 @@
+import { ref } from 'vue';
+
+/**
+ * Composable to keep track of the currently executing node.
+ * The queue is used to keep track of the order in which nodes are completed and
+ * to ensure that there's always at least one node in the executing queue.
+ *
+ * The completion queue serves as a workaround for the fact that the execution status of a node
+ * is not updated in real-time when dealing with large amounts of data, meaning we can end up in a
+ * state where no node is actively executing, even though the workflow execution is not completed.
+ */
+export function useExecutingNode() {
+	const executingNode = ref<string[]>([]);
+	const executingNodeCompletionQueue = ref<string[]>([]);
+
+	function addExecutingNode(nodeName: string) {
+		resolveNodeExecutionQueue();
+		executingNode.value.push(nodeName);
+	}
+
+	function removeExecutingNode(nodeName: string) {
+		executingNodeCompletionQueue.value.push(nodeName);
+		resolveNodeExecutionQueue(
+			executingNode.value.length <= executingNodeCompletionQueue.value.length,
+		);
+	}
+
+	function resolveNodeExecutionQueue(keepLastInQueue = false) {
+		const lastExecutingNode = executingNodeCompletionQueue.value.at(-1);
+		const nodesToRemove = keepLastInQueue
+			? executingNodeCompletionQueue.value.slice(0, -1)
+			: executingNodeCompletionQueue.value;
+
+		executingNode.value = executingNode.value.filter((name) => !nodesToRemove.includes(name));
+		executingNodeCompletionQueue.value =
+			keepLastInQueue && lastExecutingNode ? [lastExecutingNode] : [];
+	}
+
+	function clearNodeExecutionQueue() {
+		executingNode.value = [];
+		executingNodeCompletionQueue.value = [];
+	}
+
+	return {
+		executingNode,
+		executingNodeCompletionQueue,
+		addExecutingNode,
+		removeExecutingNode,
+		resolveNodeExecutionQueue,
+		clearNodeExecutionQueue,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/editor-ui/src/composables/useExpressionEditor.ts
index c196988764..ed845e3501 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.ts
@@ -70,6 +70,7 @@ export const useExpressionEditor = ({
 	const telemetryExtensions = ref<Compartment>(new Compartment());
 	const autocompleteStatus = ref<'pending' | 'active' | null>(null);
 	const dragging = ref(false);
+	const isDirty = ref(false);
 
 	const updateSegments = (): void => {
 		const state = editor.value?.state;
@@ -156,6 +157,7 @@ export const useExpressionEditor = ({
 	const debouncedUpdateSegments = debounce(updateSegments, 200);
 
 	function onEditorUpdate(viewUpdate: ViewUpdate) {
+		isDirty.value = true;
 		autocompleteStatus.value = completionStatus(viewUpdate.view.state);
 		updateSelection(viewUpdate);
 
@@ -463,5 +465,6 @@ export const useExpressionEditor = ({
 		select,
 		selectAll,
 		focus,
+		isDirty,
 	};
 };
diff --git a/packages/editor-ui/src/composables/useHistoryHelper.ts b/packages/editor-ui/src/composables/useHistoryHelper.ts
index 98d80fd4d1..5ea09bd9bb 100644
--- a/packages/editor-ui/src/composables/useHistoryHelper.ts
+++ b/packages/editor-ui/src/composables/useHistoryHelper.ts
@@ -6,7 +6,7 @@ import { useHistoryStore } from '@/stores/history.store';
 import { useUIStore } from '@/stores/ui.store';
 
 import { onMounted, onUnmounted, nextTick } from 'vue';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { getNodeViewTab } from '@/utils/canvasUtils';
 import type { RouteLocationNormalizedLoaded } from 'vue-router';
 import { useTelemetry } from './useTelemetry';
diff --git a/packages/editor-ui/src/composables/useImportCurlCommand.test.ts b/packages/editor-ui/src/composables/useImportCurlCommand.test.ts
new file mode 100644
index 0000000000..aaa4b1f368
--- /dev/null
+++ b/packages/editor-ui/src/composables/useImportCurlCommand.test.ts
@@ -0,0 +1,296 @@
+import { toHttpNodeParameters } from '@/composables/useImportCurlCommand';
+
+describe('useImportCurlCommand', () => {
+	describe('toHttpNodeParameters', () => {
+		test('Should parse form-urlencoded content type correctly', () => {
+			const curl =
+				'curl -X POST https://reqbin.com/echo/post/form -H "Content-Type: application/x-www-form-urlencoded" -d "param1=value1&param2=value2"';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo/post/form');
+			expect(parameters.sendBody).toBe(true);
+			expect(parameters.bodyParameters?.parameters[0].name).toBe('param1');
+			expect(parameters.bodyParameters?.parameters[0].value).toBe('value1');
+			expect(parameters.bodyParameters?.parameters[1].name).toBe('param2');
+			expect(parameters.bodyParameters?.parameters[1].value).toBe('value2');
+			expect(parameters.contentType).toBe('form-urlencoded');
+			expect(parameters.sendHeaders).toBe(false);
+			expect(parameters.sendQuery).toBe(false);
+		});
+
+		test('Should parse JSON content type correctly', () => {
+			const curl =
+				'curl -X POST https://reqbin.com/echo/post/json -H \'Content-Type: application/json\' -d \'{"login":"my_login","password":"my_password"}\'';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
+			expect(parameters.sendBody).toBe(true);
+			expect(parameters.bodyParameters?.parameters[0].name).toBe('login');
+			expect(parameters.bodyParameters?.parameters[0].value).toBe('my_login');
+			expect(parameters.bodyParameters?.parameters[1].name).toBe('password');
+			expect(parameters.bodyParameters?.parameters[1].value).toBe('my_password');
+			expect(parameters.contentType).toBe('json');
+			expect(parameters.sendHeaders).toBe(false);
+			expect(parameters.sendQuery).toBe(false);
+		});
+
+		test('Should parse multipart-form-data content type correctly', () => {
+			const curl =
+				'curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
+			expect(parameters.sendBody).toBe(true);
+			expect(parameters.bodyParameters?.parameters[0].parameterType).toBe('formData');
+			expect(parameters.bodyParameters?.parameters[0].name).toBe('key1');
+			expect(parameters.bodyParameters?.parameters[0].value).toBe('value1');
+			expect(parameters.bodyParameters?.parameters[1].parameterType).toBe('formBinaryData');
+			expect(parameters.bodyParameters?.parameters[1].name).toBe('upload');
+			expect(parameters.contentType).toBe('multipart-form-data');
+			expect(parameters.sendHeaders).toBe(false);
+			expect(parameters.sendQuery).toBe(false);
+		});
+
+		test('Should parse binary request correctly', () => {
+			const curl =
+				"curl --location --request POST 'https://www.website.com' --header 'Content-Type: image/png' --data-binary '@/Users/image.png'";
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://www.website.com');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(true);
+			expect(parameters.contentType).toBe('binaryData');
+			expect(parameters.sendHeaders).toBe(false);
+			expect(parameters.sendQuery).toBe(false);
+		});
+
+		test('Should parse unknown content type correctly', () => {
+			const curl =
+				'curl -X POST https://reqbin.com/echo/post/xml -H "Content-Type: application/xml" -H "Accept: application/xml" -d "<Request><Login>my_login</Login><Password>my_password</Password></Request>"';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo/post/xml');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(true);
+			expect(parameters.contentType).toBe('raw');
+			expect(parameters.rawContentType).toBe('application/xml');
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('Accept');
+			expect(parameters.headerParameters?.parameters[0].value).toBe('application/xml');
+			expect(parameters.sendQuery).toBe(false);
+		});
+
+		test('Should parse header properties and keep the original case', () => {
+			const curl =
+				'curl -X POST https://reqbin.com/echo/post/json -v -F key1=value1 -F upload=@localfilename -H "ACCEPT: text/javascript" -H "content-type: multipart/form-data"';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo/post/json');
+			expect(parameters.sendBody).toBe(true);
+			expect(parameters.bodyParameters?.parameters[0].parameterType).toBe('formData');
+			expect(parameters.bodyParameters?.parameters[0].name).toBe('key1');
+			expect(parameters.bodyParameters?.parameters[0].value).toBe('value1');
+			expect(parameters.bodyParameters?.parameters[1].parameterType).toBe('formBinaryData');
+			expect(parameters.bodyParameters?.parameters[1].name).toBe('upload');
+			expect(parameters.contentType).toBe('multipart-form-data');
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('ACCEPT');
+			expect(parameters.headerParameters?.parameters[0].value).toBe('text/javascript');
+			expect(parameters.sendQuery).toBe(false);
+		});
+
+		test('Should parse querystring properties', () => {
+			const curl = "curl -G -d 'q=kitties' -d 'count=20' https://google.com/search";
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://google.com/search');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendHeaders).toBe(false);
+			expect(parameters.sendQuery).toBe(true);
+			expect(parameters.queryParameters?.parameters[0].name).toBe('q');
+			expect(parameters.queryParameters?.parameters[0].value).toBe('kitties');
+			expect(parameters.queryParameters?.parameters[1].name).toBe('count');
+			expect(parameters.queryParameters?.parameters[1].value).toBe('20');
+		});
+
+		test('Should parse basic authentication property and keep the original case', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password"';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+		});
+
+		test('Should parse location flag with --location', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password" --location';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.redirect.redirect.followRedirects).toBe(true);
+		});
+
+		test('Should parse location flag with --L', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password" -L';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.redirect.redirect.followRedirects).toBe(true);
+		});
+
+		test('Should parse location and max redirects flags with --location and --max-redirs 10', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password" --location --max-redirs 10';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.redirect.redirect.followRedirects).toBe(true);
+			expect(parameters.options.redirect.redirect.maxRedirects).toBe(10);
+		});
+
+		test('Should parse proxy flag -x', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.proxy).toBe('https://google.com');
+		});
+
+		test('Should parse proxy flag --proxy', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.proxy).toBe('https://google.com');
+		});
+
+		test('Should parse include headers on output flag --include', () => {
+			const curl =
+				'curl https://reqbin.com/echo -u "login:password" --include -x https://google.com';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.response.response.fullResponse).toBe(true);
+		});
+
+		test('Should parse include headers on output flag -i', () => {
+			const curl = 'curl https://reqbin.com/echo -u "login:password" -x https://google.com -i';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.contentType).toBeUndefined();
+			expect(parameters.sendQuery).toBe(false);
+			expect(parameters.sendHeaders).toBe(true);
+			expect(parameters.headerParameters?.parameters[0].name).toBe('authorization');
+			expect(parameters.headerParameters?.parameters[0].value).toBe(
+				`Basic ${Buffer.from('login:password').toString('base64')}`,
+			);
+			expect(parameters.options.response.response.fullResponse).toBe(true);
+		});
+
+		test('Should parse include request flag -X', () => {
+			const curl = 'curl -X POST https://reqbin.com/echo -u "login:password" -x https://google.com';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+		});
+
+		test('Should parse include request flag --request', () => {
+			const curl =
+				'curl --request POST https://reqbin.com/echo -u "login:password" -x https://google.com';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+		});
+
+		test('Should parse include timeout flag --connect-timeout', () => {
+			const curl =
+				'curl --request POST https://reqbin.com/echo -u "login:password" --connect-timeout 20';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.options.timeout).toBe(20000);
+		});
+
+		test('Should parse download file flag --output', () => {
+			const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" --output data';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.options.response.response.responseFormat).toBe('file');
+			expect(parameters.options.response.response.outputPropertyName).toBe('data');
+		});
+
+		test('Should parse download file flag -o', () => {
+			const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -o data';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.options.response.response.responseFormat).toBe('file');
+			expect(parameters.options.response.response.outputPropertyName).toBe('data');
+		});
+
+		test('Should parse ignore SSL flag -k', () => {
+			const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" -k';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.options.allowUnauthorizedCerts).toBe(true);
+		});
+
+		test('Should parse ignore SSL flag --insecure', () => {
+			const curl = 'curl --request POST https://reqbin.com/echo -u "login:password" --insecure';
+			const parameters = toHttpNodeParameters(curl);
+			expect(parameters.url).toBe('https://reqbin.com/echo');
+			expect(parameters.method).toBe('POST');
+			expect(parameters.sendBody).toBe(false);
+			expect(parameters.options.allowUnauthorizedCerts).toBe(true);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useImportCurlCommand.ts b/packages/editor-ui/src/composables/useImportCurlCommand.ts
index a9a2e6bd5b..35bbecce91 100644
--- a/packages/editor-ui/src/composables/useImportCurlCommand.ts
+++ b/packages/editor-ui/src/composables/useImportCurlCommand.ts
@@ -1,11 +1,362 @@
 import type { MaybeRef } from 'vue';
 import { unref } from 'vue';
+import get from 'lodash/get';
+import { toJsonObject as curlToJson, type JSONOutput } from 'curlconverter';
+
 import { CURL_IMPORT_NODES_PROTOCOLS, CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS } from '@/constants';
 import { useToast } from '@/composables/useToast';
-import { useUIStore } from '@/stores/ui.store';
 import { useI18n } from '@/composables/useI18n';
 import { importCurlEventBus } from '@/event-bus';
 import type { BaseTextKey } from '@/plugins/i18n';
+import { assert } from '@/utils/assert';
+import type { CurlToJSONResponse } from '@/Interface';
+
+interface Parameter {
+	parameterType?: string;
+	name: string;
+	value: string;
+}
+
+interface HttpNodeParameters extends Record<string, unknown> {
+	url?: string;
+	method: string;
+	sendBody?: boolean;
+	authentication: string;
+	contentType?: 'form-urlencoded' | 'multipart-form-data' | 'json' | 'raw' | 'binaryData';
+	rawContentType?: string;
+	specifyBody?: 'json' | 'keypair';
+	bodyParameters?: {
+		parameters: Parameter[];
+	};
+	jsonBody?: object;
+	options: {
+		allowUnauthorizedCerts?: boolean;
+		proxy?: string;
+		timeout?: number;
+		redirect: {
+			redirect: {
+				followRedirects?: boolean;
+				maxRedirects?: number;
+			};
+		};
+		response: {
+			response: {
+				fullResponse?: boolean;
+				responseFormat?: string;
+				outputPropertyName?: string;
+			};
+		};
+	};
+	sendHeaders?: boolean;
+	headerParameters?: {
+		parameters: Parameter[];
+	};
+	sendQuery?: boolean;
+	queryParameters?: {
+		parameters: Parameter[];
+	};
+}
+
+type HttpNodeHeaders = Pick<HttpNodeParameters, 'sendHeaders' | 'headerParameters'>;
+
+type HttpNodeQueries = Pick<HttpNodeParameters, 'sendQuery' | 'queryParameters'>;
+
+const SUPPORTED_CONTENT_TYPES = [
+	'application/json',
+	'application/x-www-form-urlencoded',
+	'multipart/form-data',
+] as const;
+type ContentTypes = (typeof SUPPORTED_CONTENT_TYPES)[number];
+
+const CONTENT_TYPE_KEY = 'content-type';
+
+const isContentType = (headers: JSONOutput['headers'], contentType: ContentTypes): boolean => {
+	return get(headers, CONTENT_TYPE_KEY) === contentType;
+};
+
+const isJsonRequest = (curlJson: JSONOutput): boolean => {
+	if (isContentType(curlJson.headers, 'application/json')) return true;
+
+	if (curlJson.data) {
+		const bodyKey = Object.keys(curlJson.data)[0];
+		try {
+			JSON.parse(bodyKey);
+			return true;
+		} catch {
+			return false;
+		}
+	}
+	return false;
+};
+
+const isFormUrlEncodedRequest = (curlJson: JSONOutput): boolean => {
+	if (isContentType(curlJson.headers, 'application/x-www-form-urlencoded')) return true;
+	if (curlJson.data && !curlJson.files) return true;
+	return false;
+};
+
+const isMultipartRequest = (curlJson: JSONOutput): boolean => {
+	if (isContentType(curlJson.headers, 'multipart/form-data')) return true;
+
+	if (curlJson.files)
+		// only multipart/form-data request include files
+		return true;
+	return false;
+};
+
+const isBinaryRequest = (curlJson: JSONOutput): boolean => {
+	if (curlJson?.headers?.[CONTENT_TYPE_KEY]) {
+		const contentType = curlJson?.headers?.[CONTENT_TYPE_KEY];
+		return ['image', 'video', 'audio'].some((d) => contentType.includes(d));
+	}
+	return false;
+};
+
+const toKeyValueArray = ([key, value]: [string, unknown]) => ({
+	name: key,
+	value: value?.toString() ?? '',
+});
+
+const extractHeaders = (headers: JSONOutput['headers'] = {}): HttpNodeHeaders => {
+	const emptyHeaders = !Object.keys(headers).length;
+
+	const onlyContentTypeHeaderDefined =
+		Object.keys(headers).length === 1 && headers[CONTENT_TYPE_KEY] !== undefined;
+
+	if (emptyHeaders || onlyContentTypeHeaderDefined) return { sendHeaders: false };
+
+	return {
+		sendHeaders: true,
+		headerParameters: {
+			parameters: Object.entries(headers)
+				.map(toKeyValueArray)
+				.filter((parameter) => parameter.name !== CONTENT_TYPE_KEY),
+		},
+	};
+};
+
+const extractQueries = (queries: JSONOutput['queries'] = {}): HttpNodeQueries => {
+	const emptyQueries = !Object.keys(queries).length;
+
+	if (emptyQueries) return { sendQuery: false };
+
+	return {
+		sendQuery: true,
+		queryParameters: {
+			parameters: Object.entries(queries).map(toKeyValueArray),
+		},
+	};
+};
+
+const jsonBodyToNodeParameters = (body: JSONOutput['data'] = {}): Parameter[] | [] => {
+	return Object.entries(body).map(toKeyValueArray);
+};
+
+const multipartToNodeParameters = (
+	body: JSONOutput['data'] = {},
+	files: JSONOutput['files'] = {},
+): Parameter[] | [] => {
+	return [
+		...Object.entries(body)
+			.map(toKeyValueArray)
+			.map((e) => ({ parameterType: 'formData', ...e })),
+		...Object.entries(files)
+			.map(toKeyValueArray)
+			.map((e) => ({ parameterType: 'formBinaryData', ...e })),
+	];
+};
+
+const keyValueBodyToNodeParameters = (body: JSONOutput['data'] = {}): Parameter[] | [] => {
+	return Object.entries(body).map(toKeyValueArray);
+};
+
+const lowerCaseContentTypeKey = (obj: JSONOutput['headers']): void => {
+	if (!obj) return;
+
+	const regex = new RegExp(CONTENT_TYPE_KEY, 'gi');
+
+	const contentTypeKey = Object.keys(obj).find((key) => !!Array.from(key.matchAll(regex)).length);
+
+	if (!contentTypeKey) return;
+
+	const value = obj[contentTypeKey];
+	delete obj[contentTypeKey];
+	obj[CONTENT_TYPE_KEY] = value;
+};
+
+const encodeBasicAuthentication = (username: string, password: string) =>
+	btoa(`${username}:${password}`);
+const jsonHasNestedObjects = (json: { [key: string]: string | number | object }) =>
+	Object.values(json).some((e) => typeof e === 'object');
+
+const mapCookies = (cookies: JSONOutput['cookies']): { cookie: string } | {} => {
+	if (!cookies) return {};
+
+	const cookiesValues = Object.entries(cookies).reduce(
+		(accumulator: string, entry: [string, string]) => {
+			accumulator += `${entry[0]}=${entry[1]};`;
+			return accumulator;
+		},
+		'',
+	);
+
+	if (!cookiesValues) return {};
+
+	return {
+		cookie: cookiesValues,
+	};
+};
+
+export const flattenObject = <T extends Record<string, unknown>>(obj: T, prefix = '') =>
+	Object.keys(obj).reduce(
+		(acc, k) => {
+			const pre = prefix.length ? prefix + '.' : '';
+			if (typeof obj[k] === 'object') Object.assign(acc, flattenObject(obj[k] as T, pre + k));
+			else acc[pre + k] = obj[k];
+			return acc;
+		},
+		{} as Record<string, unknown>,
+	);
+
+export const toHttpNodeParameters = (curlCommand: string): HttpNodeParameters => {
+	const curlJson = curlToJson(curlCommand);
+
+	const headers = curlJson.headers ?? {};
+
+	lowerCaseContentTypeKey(headers);
+
+	// set basic authentication
+	if (curlJson.auth) {
+		const { user, password: pass } = curlJson.auth;
+		headers.authorization = `Basic ${encodeBasicAuthentication(user, pass)}`;
+	}
+
+	const httpNodeParameters: HttpNodeParameters = {
+		url: curlJson.url,
+		authentication: 'none',
+		method: curlJson.method.toUpperCase(),
+		...extractHeaders({ ...headers, ...mapCookies(curlJson.cookies) }),
+		...extractQueries(curlJson.queries),
+		options: {
+			redirect: {
+				redirect: {},
+			},
+			response: {
+				response: {},
+			},
+		},
+	};
+
+	if (curlJson.follow_redirects) {
+		httpNodeParameters.options.redirect.redirect.followRedirects = true;
+		if (curlJson.max_redirects) {
+			httpNodeParameters.options.redirect.redirect.maxRedirects = curlJson.max_redirects;
+		}
+	}
+
+	if (curlJson.proxy) {
+		httpNodeParameters.options.proxy = curlJson.proxy;
+	}
+
+	if (curlJson.connect_timeout !== undefined) {
+		httpNodeParameters.options.timeout = Math.floor(curlJson.connect_timeout * 1000);
+	}
+
+	if (curlJson.output) {
+		httpNodeParameters.options.response.response = {
+			responseFormat: 'file',
+			outputPropertyName: curlJson.output ?? 'data',
+		};
+	}
+
+	if (curlJson.insecure !== undefined) {
+		httpNodeParameters.options.allowUnauthorizedCerts = true;
+	}
+
+	if (curlJson.include) {
+		httpNodeParameters.options.response.response.fullResponse = true;
+		httpNodeParameters.options.response.response.responseFormat = 'autodetect';
+	}
+
+	const contentType = curlJson?.headers?.[CONTENT_TYPE_KEY] as ContentTypes;
+
+	if (isBinaryRequest(curlJson)) {
+		return Object.assign(httpNodeParameters, {
+			contentType: 'binaryData',
+			sendBody: true,
+		});
+	}
+
+	if (contentType && !SUPPORTED_CONTENT_TYPES.includes(contentType)) {
+		return Object.assign(httpNodeParameters, {
+			sendBody: true,
+			contentType: 'raw',
+			rawContentType: contentType,
+			body: Object.keys(curlJson?.data ?? {})[0],
+		});
+	}
+
+	if (isJsonRequest(curlJson)) {
+		Object.assign(httpNodeParameters, {
+			contentType: 'json',
+			sendBody: true,
+		});
+
+		if (curlJson.data) {
+			const json = curlJson.data;
+
+			if (jsonHasNestedObjects(json)) {
+				// json body
+				Object.assign(httpNodeParameters, {
+					specifyBody: 'json',
+					jsonBody: JSON.stringify(json, null, 2),
+				});
+			} else {
+				// key-value body
+				Object.assign(httpNodeParameters, {
+					specifyBody: 'keypair',
+					bodyParameters: {
+						parameters: jsonBodyToNodeParameters(curlJson.data),
+					},
+				});
+			}
+		}
+	} else if (isFormUrlEncodedRequest(curlJson)) {
+		Object.assign(httpNodeParameters, {
+			contentType: 'form-urlencoded',
+			sendBody: true,
+			specifyBody: 'keypair',
+			bodyParameters: {
+				parameters: keyValueBodyToNodeParameters(curlJson.data),
+			},
+		});
+	} else if (isMultipartRequest(curlJson)) {
+		Object.assign(httpNodeParameters, {
+			contentType: 'multipart-form-data',
+			sendBody: true,
+			bodyParameters: {
+				parameters: multipartToNodeParameters(curlJson.data, curlJson.files),
+			},
+		});
+	} else {
+		// could not figure the content type so do not set the body
+		Object.assign(httpNodeParameters, {
+			sendBody: false,
+		});
+	}
+
+	if (!Object.keys(httpNodeParameters.options?.redirect.redirect).length) {
+		// @ts-ignore
+		delete httpNodeParameters.options.redirect;
+	}
+
+	if (!Object.keys(httpNodeParameters.options.response.response).length) {
+		// @ts-ignore
+		delete httpNodeParameters.options.response;
+	}
+
+	return httpNodeParameters;
+};
 
 export function useImportCurlCommand(options?: {
 	onImportSuccess?: () => void;
@@ -18,7 +369,6 @@ export function useImportCurlCommand(options?: {
 		};
 	};
 }) {
-	const uiStore = useUIStore();
 	const toast = useToast();
 	const i18n = useI18n();
 
@@ -30,20 +380,28 @@ export function useImportCurlCommand(options?: {
 		...options?.i18n,
 	};
 
-	async function importCurlCommand(curlCommandRef: MaybeRef<string>): Promise<void> {
+	function importCurlCommand(curlCommandRef: MaybeRef<string>): void {
 		const curlCommand = unref(curlCommandRef);
 		if (curlCommand === '') return;
 
 		try {
-			const parameters = await uiStore.getCurlToJson(curlCommand);
-			const url = parameters['parameters.url'];
+			const parameters = flattenObject(toHttpNodeParameters(curlCommand), 'parameters');
+			assert(typeof parameters['parameters.url'] === 'string', 'parameters.url has to be string');
+			// Normalize placeholder values
+			const url: string = parameters['parameters.url']
+				.replaceAll('%7B', '{')
+				.replaceAll('%7D', '}');
 
 			const invalidProtocol = CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS.find((p) =>
 				url.includes(`${p}://`),
 			);
 
 			if (!invalidProtocol) {
-				importCurlEventBus.emit('setHttpNodeParameters', parameters);
+				parameters['parameters.url'] = url;
+				importCurlEventBus.emit(
+					'setHttpNodeParameters',
+					parameters as unknown as CurlToJSONResponse,
+				);
 
 				options?.onImportSuccess?.();
 
diff --git a/packages/editor-ui/src/composables/useKeybindings.test.ts b/packages/editor-ui/src/composables/useKeybindings.test.ts
index 6f4ef4f179..9a3965412c 100644
--- a/packages/editor-ui/src/composables/useKeybindings.test.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.test.ts
@@ -136,4 +136,31 @@ describe('useKeybindings', () => {
 		document.dispatchEvent(eventB);
 		expect(handler).toHaveBeenCalledTimes(2);
 	});
+
+	it("should prefer the 'key' over 'code' for dvorak to work correctly", () => {
+		const cHandler = vi.fn();
+		const iHandler = vi.fn();
+		const keymap = ref({
+			'ctrl+c': cHandler,
+			'ctrl+i': iHandler,
+		});
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'c', code: 'KeyI', ctrlKey: true });
+		document.dispatchEvent(event);
+		expect(cHandler).toHaveBeenCalled();
+		expect(iHandler).not.toHaveBeenCalled();
+	});
+
+	it("should fallback to 'code' for non-ansi layouts", () => {
+		const handler = vi.fn();
+		const keymap = ref({ 'ctrl+c': handler });
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'ב', code: 'KeyC', ctrlKey: true });
+		document.dispatchEvent(event);
+		expect(handler).toHaveBeenCalled();
+	});
 });
diff --git a/packages/editor-ui/src/composables/useKeybindings.ts b/packages/editor-ui/src/composables/useKeybindings.ts
index 990cc0b03d..3de381fd6c 100644
--- a/packages/editor-ui/src/composables/useKeybindings.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.ts
@@ -1,10 +1,24 @@
 import { useActiveElement, useEventListener } from '@vueuse/core';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import type { MaybeRef, Ref } from 'vue';
 import { computed, unref } from 'vue';
 
 type KeyMap = Record<string, (event: KeyboardEvent) => void>;
 
+/**
+ * Binds a `keydown` event to `document` and calls the approriate
+ * handlers based on the given `keymap`. The keymap is a map from
+ * shortcut strings to handlers. The shortcut strings can contain
+ * multiple shortcuts separated by `|`.
+ *
+ * @example
+ * ```ts
+ * {
+ * 	'ctrl+a': () => console.log('ctrl+a'),
+ * 	'ctrl+b|ctrl+c': () => console.log('ctrl+b or ctrl+c'),
+ * }
+ * ```
+ */
 export const useKeybindings = (
 	keymap: Ref<KeyMap>,
 	options?: {
@@ -29,12 +43,10 @@ export const useKeybindings = (
 
 	const normalizedKeymap = computed(() =>
 		Object.fromEntries(
-			Object.entries(keymap.value)
-				.map(([shortcut, handler]) => {
-					const shortcuts = shortcut.split('|');
-					return shortcuts.map((s) => [normalizeShortcutString(s), handler]);
-				})
-				.flat(),
+			Object.entries(keymap.value).flatMap(([shortcut, handler]) => {
+				const shortcuts = shortcut.split('|');
+				return shortcuts.map((s) => [normalizeShortcutString(s), handler]);
+			}),
 		),
 	);
 
@@ -62,10 +74,36 @@ export const useKeybindings = (
 		return shortcutPartsToString(shortcut.split(new RegExp(`[${splitCharsRegEx}]`)));
 	}
 
+	/**
+	 * Converts a keyboard event code to a key string.
+	 *
+	 * @example
+	 * keyboardEventCodeToKey('Digit0') -> '0'
+	 * keyboardEventCodeToKey('KeyA') -> 'a'
+	 */
+	function keyboardEventCodeToKey(code: string) {
+		if (code.startsWith('Digit')) {
+			return code.replace('Digit', '').toLowerCase();
+		} else if (code.startsWith('Key')) {
+			return code.replace('Key', '').toLowerCase();
+		}
+
+		return code.toLowerCase();
+	}
+
+	/**
+	 * Converts a keyboard event to a shortcut string for both
+	 * `key` and `code`.
+	 *
+	 * @example
+	 * keyboardEventToShortcutString({ key: 'a', code: 'KeyA', ctrlKey: true })
+	 * // --> { byKey: 'ctrl+a', byCode: 'ctrl+a' }
+	 */
 	function toShortcutString(event: KeyboardEvent) {
 		const { shiftKey, altKey } = event;
 		const ctrlKey = isCtrlKeyPressed(event);
-		const keys = [event.key];
+		const keys = 'key' in event ? [event.key] : [];
+		const codes = 'code' in event ? [keyboardEventCodeToKey(event.code)] : [];
 		const modifiers: string[] = [];
 
 		if (shiftKey) {
@@ -80,15 +118,22 @@ export const useKeybindings = (
 			modifiers.push('alt');
 		}
 
-		return shortcutPartsToString([...modifiers, ...keys]);
+		return {
+			byKey: shortcutPartsToString([...modifiers, ...keys]),
+			byCode: shortcutPartsToString([...modifiers, ...codes]),
+		};
 	}
 
 	function onKeyDown(event: KeyboardEvent) {
 		if (ignoreKeyPresses.value || isDisabled.value) return;
 
-		const shortcutString = toShortcutString(event);
+		const { byKey, byCode } = toShortcutString(event);
 
-		const handler = normalizedKeymap.value[shortcutString];
+		// Prefer `byKey` over `byCode` so that:
+		// - ANSI layouts work correctly
+		// - Dvorak works correctly
+		// - Non-ansi layouts work correctly
+		const handler = normalizedKeymap.value[byKey] ?? normalizedKeymap.value[byCode];
 
 		if (handler) {
 			event.preventDefault();
diff --git a/packages/editor-ui/src/composables/useNodeBase.ts b/packages/editor-ui/src/composables/useNodeBase.ts
index 970594bb7e..e051422b45 100644
--- a/packages/editor-ui/src/composables/useNodeBase.ts
+++ b/packages/editor-ui/src/composables/useNodeBase.ts
@@ -22,7 +22,7 @@ import type { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
 import type { Endpoint, EndpointOptions } from '@jsplumb/core';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
 import type { EndpointSpec } from '@jsplumb/common';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import type { N8nEndpointLabelLength } from '@/plugins/jsplumb/N8nPlusEndpointType';
 import { isValidNodeConnectionType } from '@/utils/typeGuards';
 import { useI18n } from '@/composables/useI18n';
diff --git a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
index b0ef4a4f4c..16e1f06977 100644
--- a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
+++ b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
@@ -15,7 +15,7 @@ export function useNodeViewVersionSwitcher() {
 
 	const defaultVersion = settingsStore.isCanvasV2Enabled ? '2' : '1';
 	const nodeViewVersion = useLocalStorage('NodeView.version', defaultVersion);
-	const nodeViewVersionMigrated = useLocalStorage('NodeView.migrated', false);
+	const nodeViewVersionMigrated = useLocalStorage('NodeView.migrated.release', false);
 
 	function setNodeViewSwitcherDropdownOpened(visible: boolean) {
 		if (!visible) {
diff --git a/packages/editor-ui/src/composables/usePushConnection.test.ts b/packages/editor-ui/src/composables/usePushConnection.test.ts
index 63592afd79..76b9c0ee86 100644
--- a/packages/editor-ui/src/composables/usePushConnection.test.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.test.ts
@@ -35,8 +35,6 @@ vi.mock('@/composables/useToast', () => {
 	};
 });
 
-vi.useFakeTimers();
-
 describe('usePushConnection()', () => {
 	let router: ReturnType<typeof useRouter>;
 	let pushStore: ReturnType<typeof usePushConnectionStore>;
diff --git a/packages/editor-ui/src/composables/usePushConnection.ts b/packages/editor-ui/src/composables/usePushConnection.ts
index 1c4d0c4b48..3bf9cd4cc1 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -36,7 +36,7 @@ import type { PushMessageQueueItem } from '@/types';
 import { useAssistantStore } from '@/stores/assistant.store';
 import NodeExecutionErrorMessage from '@/components/NodeExecutionErrorMessage.vue';
 import type { IExecutionResponse } from '@/Interface';
-import { clearPopupWindowState } from '../utils/executionUtils';
+import { clearPopupWindowState, hasTrimmedData, hasTrimmedItem } from '../utils/executionUtils';
 import { usePostHog } from '@/stores/posthog.store';
 import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
@@ -237,18 +237,51 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				return false;
 			}
 
+			let showedSuccessToast = false;
+
 			let executionData: Pick<IExecutionResponse, 'workflowId' | 'data' | 'status'>;
 			if (receivedData.type === 'executionFinished' && receivedData.data.rawData) {
 				const { workflowId, status, rawData } = receivedData.data;
 				executionData = { workflowId, data: parse(rawData), status };
 			} else {
-				const execution = await workflowsStore.fetchExecutionDataById(executionId);
-				if (!execution?.data) return false;
-				executionData = {
-					workflowId: execution.workflowId,
-					data: parse(execution.data as unknown as string),
-					status: execution.status,
-				};
+				uiStore.setProcessingExecutionResults(true);
+
+				/**
+				 * On successful completion without data, we show a success toast
+				 * immediately, even though we still need to fetch and deserialize the
+				 * full execution data, to minimize perceived latency.
+				 */
+				if (receivedData.type === 'executionFinished' && receivedData.data.status === 'success') {
+					workflowHelpers.setDocumentTitle(
+						workflowsStore.getWorkflowById(receivedData.data.workflowId)?.name,
+						'IDLE',
+					);
+					uiStore.removeActiveAction('workflowRunning');
+					toast.showMessage({
+						title: i18n.baseText('pushConnection.workflowExecutedSuccessfully'),
+						type: 'success',
+					});
+					showedSuccessToast = true;
+				}
+
+				let execution: IExecutionResponse | null;
+
+				try {
+					execution = await workflowsStore.fetchExecutionDataById(executionId);
+					if (!execution?.data) {
+						uiStore.setProcessingExecutionResults(false);
+						return false;
+					}
+
+					executionData = {
+						workflowId: execution.workflowId,
+						data: parse(execution.data as unknown as string),
+						status: execution.status,
+					};
+				} catch {
+					uiStore.setProcessingExecutionResults(false);
+					return false;
+				}
 			}
 
 			const iRunExecutionData: IRunExecutionData = {
@@ -261,11 +294,14 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				const activeRunData = workflowsStore.workflowExecutionData?.data?.resultData?.runData;
 				if (activeRunData) {
 					for (const key of Object.keys(activeRunData)) {
+						if (hasTrimmedItem(activeRunData[key])) continue;
 						iRunExecutionData.resultData.runData[key] = activeRunData[key];
 					}
 				}
 			}
 
+			uiStore.setProcessingExecutionResults(false);
+
 			let runDataExecutedErrorMessage = getExecutionError(iRunExecutionData);
 
 			if (executionData.status === 'crashed') {
@@ -410,7 +446,6 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 					}
 				}
 			} else {
-				// Workflow did execute without a problem
 				workflowHelpers.setDocumentTitle(workflow.name as string, 'IDLE');
 
 				const execution = workflowsStore.getWorkflowExecution;
@@ -441,7 +476,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 							type: 'success',
 						});
 					}
-				} else {
+				} else if (!showedSuccessToast) {
 					toast.showMessage({
 						title: i18n.baseText('pushConnection.workflowExecutedSuccessfully'),
 						type: 'success',
@@ -451,8 +486,9 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 
 			// It does not push the runData as it got already pushed with each
 			// node that did finish. For that reason copy in here the data
-			// which we already have.
-			if (workflowsStore.getWorkflowRunData) {
+			// which we already have. But if the run data in the store is trimmed,
+			// we skip copying so we use the full data from the final message.
+			if (workflowsStore.getWorkflowRunData && !hasTrimmedData(workflowsStore.getWorkflowRunData)) {
 				iRunExecutionData.resultData.runData = workflowsStore.getWorkflowRunData;
 			}
 
@@ -493,6 +529,22 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 		} else if (receivedData.type === 'nodeExecuteAfter') {
 			// A node finished to execute. Add its data
 			const pushData = receivedData.data;
+
+			/**
+			 * When we receive a placeholder in `nodeExecuteAfter`, we fake the items
+			 * to be the same count as the data the placeholder is standing in for.
+			 * This prevents the items count from jumping up when the execution
+			 * finishes and the full data replaces the placeholder.
+			 */
+			if (
+				pushData.itemCount &&
+				pushData.data?.data?.main &&
+				Array.isArray(pushData.data.data.main[0]) &&
+				pushData.data.data.main[0].length < pushData.itemCount
+			) {
+				pushData.data.data.main[0]?.push(...new Array(pushData.itemCount - 1).fill({ json: {} }));
+			}
+
 			workflowsStore.updateNodeExecutionData(pushData);
 			void assistantStore.onNodeExecution(pushData);
 		} else if (receivedData.type === 'nodeExecuteBefore') {
diff --git a/packages/editor-ui/src/composables/useResolvedExpression.test.ts b/packages/editor-ui/src/composables/useResolvedExpression.test.ts
new file mode 100644
index 0000000000..41db7557ac
--- /dev/null
+++ b/packages/editor-ui/src/composables/useResolvedExpression.test.ts
@@ -0,0 +1,102 @@
+import { defineComponent, h, nextTick, ref, toValue } from 'vue';
+import { useResolvedExpression } from './useResolvedExpression';
+import * as workflowHelpers from '@/composables/useWorkflowHelpers';
+import { renderComponent } from '../__tests__/render';
+import { useRouter } from 'vue-router';
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+
+async function renderTestComponent(...options: Parameters<typeof useResolvedExpression>) {
+	let resolvedExpression!: ReturnType<typeof useResolvedExpression>;
+
+	const renderResult = renderComponent(
+		defineComponent({
+			setup() {
+				resolvedExpression = useResolvedExpression(...options);
+				return () => h('div');
+			},
+		}),
+		{ props: { options } },
+	);
+
+	return { renderResult, ...resolvedExpression };
+}
+
+const mockResolveExpression = () => {
+	const mock = vi.fn();
+	vi.spyOn(workflowHelpers, 'useWorkflowHelpers').mockReturnValueOnce({
+		...workflowHelpers.useWorkflowHelpers({ router: useRouter() }),
+		resolveExpression: mock,
+	});
+
+	return mock;
+};
+
+describe('useResolvedExpression', () => {
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+		vi.useFakeTimers();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+		vi.clearAllTimers();
+		vi.useRealTimers();
+	});
+
+	it('should resolve a simple expression', async () => {
+		mockResolveExpression().mockReturnValue(4);
+		const { isExpression, resolvedExpression, resolvedExpressionString } =
+			await renderTestComponent({
+				expression: '={{ testValue }}',
+			});
+
+		expect(toValue(isExpression)).toBe(true);
+		expect(toValue(resolvedExpression)).toBe(4);
+		expect(toValue(resolvedExpressionString)).toBe('4');
+	});
+
+	it('should return an empty string for non-expressions', async () => {
+		const { isExpression, resolvedExpression, resolvedExpressionString } =
+			await renderTestComponent({
+				expression: 'test',
+			});
+
+		expect(toValue(isExpression)).toBe(false);
+		expect(toValue(resolvedExpression)).toBe('');
+		expect(toValue(resolvedExpressionString)).toBe('[empty]');
+	});
+
+	it('should handle errors', async () => {
+		mockResolveExpression().mockImplementation(() => {
+			throw new Error('Test error');
+		});
+		const { isExpression, resolvedExpression, resolvedExpressionString } =
+			await renderTestComponent({
+				expression: '={{ testValue }}',
+			});
+
+		expect(toValue(isExpression)).toBe(true);
+		expect(toValue(resolvedExpression)).toBe(null);
+		expect(toValue(resolvedExpressionString)).toBe('[ERROR: Test error]');
+	});
+
+	it('should debounce updates', async () => {
+		const resolveExpressionSpy = mockResolveExpression().mockReturnValue(4);
+		const expression = ref('={{ testValue }}');
+
+		await renderTestComponent({ expression });
+
+		expect(resolveExpressionSpy).toHaveBeenCalledTimes(1);
+
+		// Multiple fast updates should only resolve the expression once
+		expression.value = '={{ testValue1 }}';
+		expression.value = '={{ testValue2 }}';
+		expression.value = '={{ testValue3 }}';
+		await nextTick();
+
+		expect(resolveExpressionSpy).toHaveBeenCalledTimes(1);
+		vi.advanceTimersByTime(200);
+		expect(resolveExpressionSpy).toHaveBeenCalledTimes(2);
+	});
+});
diff --git a/packages/editor-ui/src/composables/useResolvedExpression.ts b/packages/editor-ui/src/composables/useResolvedExpression.ts
new file mode 100644
index 0000000000..a5c5784593
--- /dev/null
+++ b/packages/editor-ui/src/composables/useResolvedExpression.ts
@@ -0,0 +1,97 @@
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { isExpression as isExpressionUtil, stringifyExpressionResult } from '@/utils/expressions';
+
+import { debounce } from 'lodash-es';
+import { createResultError, createResultOk, type IDataObject, type Result } from 'n8n-workflow';
+import { computed, onMounted, ref, toRef, toValue, watch, type MaybeRefOrGetter } from 'vue';
+import { useRouter } from 'vue-router';
+import { useWorkflowHelpers, type ResolveParameterOptions } from './useWorkflowHelpers';
+
+export function useResolvedExpression({
+	expression,
+	additionalData,
+	isForCredential,
+	stringifyObject,
+}: {
+	expression: MaybeRefOrGetter<unknown>;
+	additionalData?: MaybeRefOrGetter<IDataObject>;
+	isForCredential?: MaybeRefOrGetter<boolean>;
+	stringifyObject?: MaybeRefOrGetter<boolean>;
+}) {
+	const ndvStore = useNDVStore();
+	const workflowsStore = useWorkflowsStore();
+
+	const router = useRouter();
+	const { resolveExpression } = useWorkflowHelpers({ router });
+
+	const resolvedExpression = ref<unknown>();
+	const resolvedExpressionString = ref('');
+
+	const targetItem = computed(() => ndvStore.expressionTargetItem ?? undefined);
+	const activeNode = computed(() => ndvStore.activeNode);
+	const hasRunData = computed(() =>
+		Boolean(
+			workflowsStore.workflowExecutionData?.data?.resultData?.runData[activeNode.value?.name ?? ''],
+		),
+	);
+	const isExpression = computed(() => isExpressionUtil(toValue(expression)));
+
+	function resolve(): Result<unknown, Error> {
+		const expressionString = toValue(expression);
+
+		if (!isExpression.value || typeof expressionString !== 'string') {
+			return { ok: true, result: '' };
+		}
+
+		let options: ResolveParameterOptions = {
+			isForCredential: toValue(isForCredential),
+			additionalKeys: toValue(additionalData),
+		};
+
+		if (ndvStore.isInputParentOfActiveNode) {
+			options = {
+				...options,
+				targetItem: targetItem.value ?? undefined,
+				inputNodeName: ndvStore.ndvInputNodeName,
+				inputRunIndex: ndvStore.ndvInputRunIndex,
+				inputBranchIndex: ndvStore.ndvInputBranchIndex,
+			};
+		}
+
+		try {
+			const resolvedValue = resolveExpression(
+				expressionString,
+				undefined,
+				options,
+				toValue(stringifyObject) ?? true,
+			) as unknown;
+
+			return createResultOk(resolvedValue);
+		} catch (error) {
+			return createResultError(error);
+		}
+	}
+
+	const debouncedUpdateExpression = debounce(updateExpression, 200);
+
+	function updateExpression() {
+		const resolved = resolve();
+		resolvedExpression.value = resolved.ok ? resolved.result : null;
+		resolvedExpressionString.value = stringifyExpressionResult(resolved, hasRunData.value);
+	}
+
+	watch(
+		[
+			toRef(expression),
+			() => workflowsStore.getWorkflowExecution,
+			() => workflowsStore.getWorkflowRunData,
+			targetItem,
+		],
+		debouncedUpdateExpression,
+	);
+
+	onMounted(updateExpression);
+
+	return { resolvedExpression, resolvedExpressionString, isExpression };
+}
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.test.ts b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
index e6b8c586f5..662ea8d44f 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.test.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
@@ -11,7 +11,6 @@ import {
 	type ITaskData,
 } from 'n8n-workflow';
 
-import { useRootStore } from '@/stores/root.store';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
 import type { IStartRunData, IWorkflowData } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -19,9 +18,9 @@ import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useToast } from './useToast';
 import { useI18n } from '@/composables/useI18n';
-import { useLocalStorage } from '@vueuse/core';
-import { ref } from 'vue';
-import { mock } from 'vitest-mock-extended';
+import { captor, mock } from 'vitest-mock-extended';
+import { useSettingsStore } from '@/stores/settings.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
 
 vi.mock('@/stores/workflows.store', () => ({
 	useWorkflowsStore: vi.fn().mockReturnValue({
@@ -41,15 +40,11 @@ vi.mock('@/stores/workflows.store', () => ({
 	}),
 }));
 
-vi.mock('@vueuse/core', async () => {
-	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-	const originalModule = await vi.importActual<typeof import('@vueuse/core')>('@vueuse/core');
-
-	return {
-		...originalModule, // Keep all original exports
-		useLocalStorage: vi.fn().mockReturnValue({ value: undefined }), // Mock useLocalStorage
-	};
-});
+vi.mock('@/stores/pushConnection.store', () => ({
+	usePushConnectionStore: vi.fn().mockReturnValue({
+		isConnected: true,
+	}),
+}));
 
 vi.mock('@/composables/useTelemetry', () => ({
 	useTelemetry: vi.fn().mockReturnValue({ track: vi.fn() }),
@@ -80,6 +75,7 @@ vi.mock('@/composables/useWorkflowHelpers', () => ({
 		getWorkflowDataToSave: vi.fn(),
 		setDocumentTitle: vi.fn(),
 		executeData: vi.fn(),
+		getNodeTypes: vi.fn().mockReturnValue([]),
 	}),
 }));
 
@@ -101,20 +97,22 @@ vi.mock('vue-router', async (importOriginal) => {
 });
 
 describe('useRunWorkflow({ router })', () => {
-	let rootStore: ReturnType<typeof useRootStore>;
+	let pushConnectionStore: ReturnType<typeof usePushConnectionStore>;
 	let uiStore: ReturnType<typeof useUIStore>;
 	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
 	let router: ReturnType<typeof useRouter>;
 	let workflowHelpers: ReturnType<typeof useWorkflowHelpers>;
+	let settingsStore: ReturnType<typeof useSettingsStore>;
 
 	beforeAll(() => {
 		const pinia = createTestingPinia({ stubActions: false });
 
 		setActivePinia(pinia);
 
-		rootStore = useRootStore();
+		pushConnectionStore = usePushConnectionStore();
 		uiStore = useUIStore();
 		workflowsStore = useWorkflowsStore();
+		settingsStore = useSettingsStore();
 
 		router = useRouter();
 		workflowHelpers = useWorkflowHelpers({ router });
@@ -129,7 +127,7 @@ describe('useRunWorkflow({ router })', () => {
 		it('should throw an error if push connection is not active', async () => {
 			const { runWorkflowApi } = useRunWorkflow({ router });
 
-			rootStore.setPushConnectionInactive();
+			vi.mocked(pushConnectionStore).isConnected = false;
 
 			await expect(runWorkflowApi({} as IStartRunData)).rejects.toThrow(
 				'workflowRun.noActiveConnectionToTheServer',
@@ -139,7 +137,7 @@ describe('useRunWorkflow({ router })', () => {
 		it('should successfully run a workflow', async () => {
 			const { runWorkflowApi } = useRunWorkflow({ router });
 
-			rootStore.setPushConnectionActive();
+			vi.mocked(pushConnectionStore).isConnected = true;
 
 			const mockResponse = { executionId: '123', waitingForWebhook: false };
 			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockResponse);
@@ -170,7 +168,7 @@ describe('useRunWorkflow({ router })', () => {
 		it('should handle workflow run failure', async () => {
 			const { runWorkflowApi } = useRunWorkflow({ router });
 
-			rootStore.setPushConnectionActive();
+			vi.mocked(pushConnectionStore).isConnected = true;
 			vi.mocked(workflowsStore).runWorkflow.mockRejectedValue(new Error('Failed to run workflow'));
 
 			await expect(runWorkflowApi({} as IStartRunData)).rejects.toThrow('Failed to run workflow');
@@ -180,7 +178,7 @@ describe('useRunWorkflow({ router })', () => {
 		it('should set waitingForWebhook if response indicates waiting', async () => {
 			const { runWorkflowApi } = useRunWorkflow({ router });
 
-			rootStore.setPushConnectionActive();
+			vi.mocked(pushConnectionStore).isConnected = true;
 			const mockResponse = { executionId: '123', waitingForWebhook: true };
 			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockResponse);
 
@@ -219,6 +217,7 @@ describe('useRunWorkflow({ router })', () => {
 				type: 'error',
 			});
 		});
+
 		it('should execute workflow has pin data and is active with single webhook trigger', async () => {
 			const pinia = createTestingPinia({ stubActions: false });
 			setActivePinia(pinia);
@@ -304,7 +303,7 @@ describe('useRunWorkflow({ router })', () => {
 			const mockExecutionResponse = { executionId: '123' };
 			const { runWorkflow } = useRunWorkflow({ router });
 
-			vi.mocked(rootStore).pushConnectionActive = true;
+			vi.mocked(pushConnectionStore).isConnected = true;
 			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
 			vi.mocked(workflowsStore).nodesIssuesExist = false;
 			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
@@ -322,8 +321,8 @@ describe('useRunWorkflow({ router })', () => {
 			expect(result).toEqual(mockExecutionResponse);
 		});
 
-		it('should send dirty nodes for partial executions', async () => {
-			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(1));
+		it('should send dirty nodes for partial executions v2', async () => {
+			vi.mocked(settingsStore).partialExecutionVersion = 2;
 			const composable = useRunWorkflow({ router });
 			const parentName = 'When clicking';
 			const executeName = 'Code';
@@ -404,53 +403,107 @@ describe('useRunWorkflow({ router })', () => {
 			);
 		});
 
-		it('does not use the original run data if `PartialExecution.version` is set to 0', async () => {
+		it('should send triggerToStartFrom if triggerNode is passed in without nodeData', async () => {
+			// ARRANGE
+			const { runWorkflow } = useRunWorkflow({ router });
+			const triggerNode = 'Chat Trigger';
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(
+				mock<Workflow>({ getChildNodes: vi.fn().mockReturnValue([]) }),
+			);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
+				mock<IWorkflowData>({ nodes: [] }),
+			);
+
+			// ACT
+			await runWorkflow({ triggerNode });
+
+			// ASSERT
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith(
+				expect.objectContaining({
+					triggerToStartFrom: {
+						name: triggerNode,
+					},
+				}),
+			);
+		});
+
+		it('does not use the original run data if `partialExecutionVersion` is set to 1', async () => {
 			// ARRANGE
 			const mockExecutionResponse = { executionId: '123' };
 			const mockRunData = { nodeName: [] };
 			const { runWorkflow } = useRunWorkflow({ router });
+			const dataCaptor = captor();
+			const workflow = mock<Workflow>({ name: 'Test Workflow' });
+			workflow.getParentNodes.mockReturnValue([]);
 
-			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(0));
-			vi.mocked(rootStore).pushConnectionActive = true;
+			vi.mocked(settingsStore).partialExecutionVersion = 1;
+			vi.mocked(pushConnectionStore).isConnected = true;
 			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
 			vi.mocked(workflowsStore).nodesIssuesExist = false;
-			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
-				name: 'Test Workflow',
-			} as Workflow);
-			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
-				id: 'workflowId',
-				nodes: [],
-			} as unknown as IWorkflowData);
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
+				mock<IWorkflowData>({ id: 'workflowId', nodes: [] }),
+			);
 			vi.mocked(workflowsStore).getWorkflowRunData = mockRunData;
 
 			// ACT
-			const result = await runWorkflow({});
+			const result = await runWorkflow({ destinationNode: 'some node name' });
 
 			// ASSERT
 			expect(result).toEqual(mockExecutionResponse);
 			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledTimes(1);
-			expect(vi.mocked(workflowsStore.setWorkflowExecutionData).mock.calls[0][0]).toMatchObject({
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledWith(dataCaptor);
+			expect(dataCaptor.value).toMatchObject({
 				data: { resultData: { runData: {} } },
 			});
 		});
 
-		it('retains the original run data if `PartialExecution.version` is set to 1', async () => {
+		it('retains the original run data if `partialExecutionVersion` is set to 2', async () => {
 			// ARRANGE
 			const mockExecutionResponse = { executionId: '123' };
 			const mockRunData = { nodeName: [] };
 			const { runWorkflow } = useRunWorkflow({ router });
+			const dataCaptor = captor();
+			const workflow = mock<Workflow>({ name: 'Test Workflow' });
+			workflow.getParentNodes.mockReturnValue([]);
 
-			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(1));
-			vi.mocked(rootStore).pushConnectionActive = true;
+			vi.mocked(settingsStore).partialExecutionVersion = 2;
+			vi.mocked(pushConnectionStore).isConnected = true;
 			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
 			vi.mocked(workflowsStore).nodesIssuesExist = false;
-			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
-				name: 'Test Workflow',
-			} as Workflow);
-			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
-				id: 'workflowId',
-				nodes: [],
-			} as unknown as IWorkflowData);
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
+				mock<IWorkflowData>({ id: 'workflowId', nodes: [] }),
+			);
+			vi.mocked(workflowsStore).getWorkflowRunData = mockRunData;
+
+			// ACT
+			const result = await runWorkflow({ destinationNode: 'some node name' });
+
+			// ASSERT
+			expect(result).toEqual(mockExecutionResponse);
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledTimes(1);
+			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledWith(dataCaptor);
+			expect(dataCaptor.value).toMatchObject({ data: { resultData: { runData: mockRunData } } });
+		});
+
+		it("does not send run data if it's not a partial execution even if `partialExecutionVersion` is set to 2", async () => {
+			// ARRANGE
+			const mockExecutionResponse = { executionId: '123' };
+			const mockRunData = { nodeName: [] };
+			const { runWorkflow } = useRunWorkflow({ router });
+			const dataCaptor = captor();
+			const workflow = mock<Workflow>({ name: 'Test Workflow' });
+			workflow.getParentNodes.mockReturnValue([]);
+
+			vi.mocked(settingsStore).partialExecutionVersion = 2;
+			vi.mocked(pushConnectionStore).isConnected = true;
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).nodesIssuesExist = false;
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
+				mock<IWorkflowData>({ id: 'workflowId', nodes: [] }),
+			);
 			vi.mocked(workflowsStore).getWorkflowRunData = mockRunData;
 
 			// ACT
@@ -458,10 +511,9 @@ describe('useRunWorkflow({ router })', () => {
 
 			// ASSERT
 			expect(result).toEqual(mockExecutionResponse);
-			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalledTimes(1);
-			expect(vi.mocked(workflowsStore.setWorkflowExecutionData).mock.calls[0][0]).toMatchObject({
-				data: { resultData: { runData: mockRunData } },
-			});
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledTimes(1);
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith(dataCaptor);
+			expect(dataCaptor.value).toHaveProperty('runData', undefined);
 		});
 	});
 
@@ -568,4 +620,33 @@ describe('useRunWorkflow({ router })', () => {
 			expect(result.runData).toEqual(undefined);
 		});
 	});
+
+	describe('runEntireWorkflow()', () => {
+		it('should invoke runWorkflow with expected arguments', async () => {
+			const runWorkflowComposable = useRunWorkflow({ router });
+
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				id: 'workflowId',
+			} as unknown as Workflow);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				id: 'workflowId',
+				nodes: [],
+			} as unknown as IWorkflowData);
+
+			await runWorkflowComposable.runEntireWorkflow('main', 'foo');
+
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith({
+				runData: undefined,
+				startNodes: [],
+				triggerToStartFrom: {
+					data: undefined,
+					name: 'foo',
+				},
+				workflowData: {
+					id: 'workflowId',
+					nodes: [],
+				},
+			});
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index a5489af869..184359cde6 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -15,9 +15,10 @@ import type {
 	IRun,
 	INode,
 	IDataObject,
+	IWorkflowBase,
 } from 'n8n-workflow';
 
-import { NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType, TelemetryHelpers } from 'n8n-workflow';
 
 import { useToast } from '@/composables/useToast';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
@@ -35,7 +36,9 @@ import { isEmpty } from '@/utils/typesUtils';
 import { useI18n } from '@/composables/useI18n';
 import { get } from 'lodash-es';
 import { useExecutionsStore } from '@/stores/executions.store';
-import { useLocalStorage } from '@vueuse/core';
+import { useTelemetry } from './useTelemetry';
+import { useSettingsStore } from '@/stores/settings.store';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
 
 const getDirtyNodeNames = (
 	runData: IRunData,
@@ -61,14 +64,18 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 	const workflowHelpers = useWorkflowHelpers({ router: useRunWorkflowOpts.router });
 	const i18n = useI18n();
 	const toast = useToast();
+	const telemetry = useTelemetry();
+	const externalHooks = useExternalHooks();
+	const settingsStore = useSettingsStore();
 
 	const rootStore = useRootStore();
+	const pushConnectionStore = usePushConnectionStore();
 	const uiStore = useUIStore();
 	const workflowsStore = useWorkflowsStore();
 	const executionsStore = useExecutionsStore();
 	// Starts to execute a workflow on server
 	async function runWorkflowApi(runData: IStartRunData): Promise<IExecutionPushResponse> {
-		if (!rootStore.pushConnectionActive) {
+		if (!pushConnectionStore.isConnected) {
 			// Do not start if the connection to server is not active
 			// because then it can not receive the data as it executes.
 			throw new Error(i18n.baseText('workflowRun.noActiveConnectionToTheServer'));
@@ -164,6 +171,9 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				);
 				newRunData = { [options.triggerNode]: [options.nodeData] };
 				executedNode = options.triggerNode;
+			}
+
+			if (options.triggerNode) {
 				triggerToStartFrom = {
 					name: options.triggerNode,
 					data: options.nodeData,
@@ -174,7 +184,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			if (
 				options.destinationNode &&
 				(workflowsStore.checkIfNodeHasChatParent(options.destinationNode) ||
-					destinationNodeType === CHAT_TRIGGER_NODE_TYPE)
+					destinationNodeType === CHAT_TRIGGER_NODE_TYPE) &&
+				options.source !== 'RunData.ManualChatMessage'
 			) {
 				const startNode = workflow.getStartNode(options.destinationNode);
 				if (startNode && startNode.type === CHAT_TRIGGER_NODE_TYPE) {
@@ -186,6 +197,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 					// If the chat node has no input data or pin data, open the chat modal
 					// and halt the execution
 					if (!chatHasInputData && !chatHasPinData) {
+						workflowsStore.chatPartialExecutionDestinationNode = options.destinationNode;
 						workflowsStore.setPanelOpen('chat', true);
 						return;
 					}
@@ -255,18 +267,27 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				return undefined;
 			}
 
-			// -1 means the backend chooses the default
-			// 0 is the old flow
-			// 1 is the new flow
-			const partialExecutionVersion = useLocalStorage('PartialExecution.version', -1);
+			// partial executions must have a destination node
+			const isPartialExecution = options.destinationNode !== undefined;
+			const settingsStore = useSettingsStore();
+			const version = settingsStore.partialExecutionVersion;
 			const startRunData: IStartRunData = {
 				workflowData,
 				// With the new partial execution version the backend decides what run
 				// data to use and what to ignore.
-				runData: partialExecutionVersion.value === 1 ? (runData ?? undefined) : newRunData,
+				runData: !isPartialExecution
+					? // if it's a full execution we don't want to send any run data
+						undefined
+					: version === 2
+						? // With the new partial execution version the backend decides
+							//what run data to use and what to ignore.
+							(runData ?? undefined)
+						: // for v0 we send the run data the FE constructed
+							newRunData,
 				startNodes,
 				triggerToStartFrom,
 			};
+
 			if ('destinationNode' in options) {
 				startRunData.destinationNode = options.destinationNode;
 			}
@@ -291,6 +312,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				stoppedAt: undefined,
 				workflowId: workflow.id,
 				executedNode,
+				triggerNode: triggerToStartFrom?.name,
 				data: {
 					resultData: {
 						runData: startRunData.runData ?? {},
@@ -336,7 +358,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				});
 			} catch (error) {}
 
-			await useExternalHooks().run('workflowRun.runWorkflow', {
+			await externalHooks.run('workflowRun.runWorkflow', {
 				nodeName: options.destinationNode,
 				source: options.source,
 			});
@@ -451,8 +473,31 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 		}
 	}
 
+	async function runEntireWorkflow(source: 'node' | 'main', triggerNode?: string) {
+		const workflow = workflowHelpers.getCurrentWorkflow();
+
+		void workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
+			const telemetryPayload = {
+				workflow_id: workflow.id,
+				node_graph_string: JSON.stringify(
+					TelemetryHelpers.generateNodesGraph(
+						workflowData as IWorkflowBase,
+						workflowHelpers.getNodeTypes(),
+						{ isCloudDeployment: settingsStore.isCloudDeployment },
+					).nodeGraph,
+				),
+				button_type: source,
+			};
+			telemetry.track('User clicked execute workflow button', telemetryPayload);
+			void externalHooks.run('nodeView.onRunWorkflow', telemetryPayload);
+		});
+
+		void runWorkflow({ triggerNode });
+	}
+
 	return {
 		consolidateRunDataAndStartNodes,
+		runEntireWorkflow,
 		runWorkflow,
 		runWorkflowApi,
 		stopCurrentExecution,
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index 39a67b06e0..c2c46ab0b5 100644
--- a/packages/editor-ui/src/composables/useWorkflowHelpers.ts
+++ b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
@@ -70,7 +70,7 @@ import { useTagsStore } from '@/stores/tags.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 
-type ResolveParameterOptions = {
+export type ResolveParameterOptions = {
 	targetItem?: TargetItem;
 	inputNodeName?: string;
 	inputRunIndex?: number;
@@ -1000,9 +1000,10 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			}
 
 			if (redirect) {
-				void router.replace({
+				await router.replace({
 					name: VIEWS.WORKFLOW,
-					params: { name: workflowData.id, action: 'workflowSave' },
+					params: { name: workflowData.id },
+					query: { action: 'workflowSave' },
 				});
 			}
 
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index b1d5546183..2f2f59322d 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -42,6 +42,7 @@ export const ABOUT_MODAL_KEY = 'about';
 export const CHAT_EMBED_MODAL_KEY = 'chatEmbed';
 export const CHANGE_PASSWORD_MODAL_KEY = 'changePassword';
 export const CREDENTIAL_EDIT_MODAL_KEY = 'editCredential';
+export const API_KEY_CREATE_OR_EDIT_MODAL_KEY = 'createOrEditApiKey';
 export const CREDENTIAL_SELECT_MODAL_KEY = 'selectCredential';
 export const DELETE_USER_MODAL_KEY = 'deleteUser';
 export const INVITE_USER_MODAL_KEY = 'inviteUser';
@@ -261,6 +262,7 @@ export const NODE_CREATOR_OPEN_SOURCES: Record<
 	'': '',
 };
 export const CORE_NODES_CATEGORY = 'Core Nodes';
+export const HUMAN_IN_THE_LOOP_CATEGORY = 'HITL';
 export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
 export const DEFAULT_SUBCATEGORY = '*';
 export const AI_OTHERS_NODE_CREATOR_VIEW = 'AI Other';
@@ -273,6 +275,7 @@ export const FILES_SUBCATEGORY = 'Files';
 export const FLOWS_CONTROL_SUBCATEGORY = 'Flow';
 export const AI_SUBCATEGORY = 'AI';
 export const HELPERS_SUBCATEGORY = 'Helpers';
+export const HITL_SUBCATEGORY = 'Human in the Loop';
 export const AI_CATEGORY_AGENTS = 'Agents';
 export const AI_CATEGORY_CHAINS = 'Chains';
 export const AI_CATEGORY_LANGUAGE_MODELS = 'Language Models';
@@ -438,6 +441,7 @@ export const LOCAL_STORAGE_EXPERIMENT_OVERRIDES = 'N8N_EXPERIMENT_OVERRIDES';
 export const LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON = 'N8N_HIDE_HIDE_GITHUB_STAR_BUTTON';
 export const LOCAL_STORAGE_NDV_INPUT_PANEL_DISPLAY_MODE = 'N8N_NDV_INPUT_PANEL_DISPLAY_MODE';
 export const LOCAL_STORAGE_NDV_OUTPUT_PANEL_DISPLAY_MODE = 'N8N_NDV_OUTPUT_PANEL_DISPLAY_MODE';
+export const LOCAL_STORAGE_CANVAS_TRIGGER_BUTTON_VARIANT = 'Canvas.TriggerButtonVariant';
 export const BASE_NODE_SURVEY_URL = 'https://n8n-community.typeform.com/to/BvmzxqYv#nodename=';
 
 export const HIRING_BANNER = `
@@ -660,6 +664,7 @@ export const enum STORES {
 	ASSISTANT = 'assistant',
 	BECOME_TEMPLATE_CREATOR = 'becomeTemplateCreator',
 	PROJECTS = 'projects',
+	API_KEYS = 'apiKeys',
 	TEST_DEFINITION = 'testDefinition',
 }
 
@@ -727,6 +732,7 @@ export const EXPERIMENTS_TO_TRACK = [
 ];
 
 export const WORKFLOW_EVALUATION_EXPERIMENT = '025_workflow_evaluation';
+export const SCHEMA_PREVIEW_EXPERIMENT = '028_schema_preview';
 
 export const MFA_FORM = {
 	MFA_TOKEN: 'MFA_TOKEN',
@@ -904,6 +910,6 @@ export const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
 
 export const APP_MODALS_ELEMENT_ID = 'app-modals';
 
-export const NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL = 'new-sample-sub-workflow-created';
-
 export const AI_NODES_PACKAGE_NAME = '@n8n/n8n-nodes-langchain';
+
+export const AI_ASSISTANT_MAX_CONTENT_LENGTH = 100; // in kilobytes
diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/editor-ui/src/constants.workflows.ts
index 3816ea80a8..3a397d4416 100644
--- a/packages/editor-ui/src/constants.workflows.ts
+++ b/packages/editor-ui/src/constants.workflows.ts
@@ -1,16 +1,13 @@
 import { NodeConnectionType } from 'n8n-workflow';
-import type { INodeUi, WorkflowDataWithTemplateId } from './Interface';
+import type { INodeUi, IWorkflowDataCreate } from './Interface';
 
-export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
+export const SAMPLE_SUBWORKFLOW_WORKFLOW: IWorkflowDataCreate = {
 	name: 'My Sub-Workflow',
-	meta: {
-		templateId: 'VMiAxXa3lCAizGB5f7dVZQSFfg3FtHkdTKvLuupqBls=',
-	},
 	nodes: [
 		{
 			id: 'c055762a-8fe7-4141-a639-df2372f30060',
 			typeVersion: 1.1,
-			name: 'Workflow Input Trigger',
+			name: 'When Executed by Another Workflow',
 			type: 'n8n-nodes-base.executeWorkflowTrigger',
 			position: [260, 340],
 			parameters: {},
@@ -24,7 +21,7 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 		},
 	] as INodeUi[],
 	connections: {
-		'Workflow Input Trigger': {
+		'When Executed by Another Workflow': {
 			main: [
 				[
 					{
@@ -41,3 +38,137 @@ export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
 	},
 	pinData: {},
 };
+
+export const SAMPLE_EVALUATION_WORKFLOW: IWorkflowDataCreate = {
+	name: 'My Evaluation Sub-Workflow',
+	nodes: [
+		{
+			parameters: {
+				inputSource: 'passthrough',
+			},
+			id: 'ad3156ed-3007-4a09-8527-920505339812',
+			name: 'When called by a test run',
+			type: 'n8n-nodes-base.executeWorkflowTrigger',
+			typeVersion: 1.1,
+			position: [620, 380],
+		},
+		{
+			parameters: {},
+			id: '5ff0deaf-6ec9-4a0f-a906-70f1d8375e7c',
+			name: 'Replace me',
+			type: 'n8n-nodes-base.noOp',
+			typeVersion: 1,
+			position: [860, 380],
+		},
+		{
+			parameters: {
+				assignments: {
+					assignments: [
+						{
+							id: 'a748051d-ebdb-4fcf-aaed-02756130ce2a',
+							name: 'my_metric',
+							value: 1,
+							type: 'number',
+						},
+					],
+				},
+				options: {},
+			},
+			id: '2cae7e85-7808-4cab-85c0-d233f47701a1',
+			name: 'Return metric(s)',
+			type: 'n8n-nodes-base.set',
+			typeVersion: 3.4,
+			position: [1100, 380],
+		},
+		{
+			parameters: {
+				content:
+					"### 1. Receive execution data\n\nThis workflow will be passed:\n- A past execution from the test\n- The execution produced by re-running it\n\n\nWe've pinned some example data to get you started",
+				height: 438,
+				width: 217,
+				color: 7,
+			},
+			id: 'ecb90156-30a3-4a90-93d5-6aca702e2f6b',
+			name: 'Sticky Note',
+			type: 'n8n-nodes-base.stickyNote',
+			typeVersion: 1,
+			position: [560, 105],
+		},
+		{
+			parameters: {
+				content: '### 2. Compare actual and expected result\n',
+				height: 439,
+				width: 217,
+				color: 7,
+			},
+			id: '556464f8-b86d-41e2-9249-ca6d541c9147',
+			name: 'Sticky Note1',
+			type: 'n8n-nodes-base.stickyNote',
+			typeVersion: 1,
+			position: [800, 104],
+		},
+		{
+			parameters: {
+				content: '### 3. Return metrics\n\nMetrics should always be numerical',
+				height: 439,
+				width: 217,
+				color: 7,
+			},
+			id: '04c96a00-b360-423a-90a6-b3943c7d832f',
+			name: 'Sticky Note2',
+			type: 'n8n-nodes-base.stickyNote',
+			typeVersion: 1,
+			position: [1040, 104],
+		},
+		{
+			parameters: {
+				content:
+					'## Evaluation workflow\nThis workflow is used to check whether a single past execution being tested gives similar results when re-run',
+				height: 105,
+				width: 694,
+			},
+			id: '2250a6ec-7c4f-45e4-8dfe-c4b50c98b34b',
+			name: 'Sticky Note3',
+			type: 'n8n-nodes-base.stickyNote',
+			typeVersion: 1,
+			position: [560, -25],
+		},
+	],
+	pinData: {
+		'When called by a test run': [
+			{
+				json: {
+					newExecution: {},
+					originalExecution: {},
+				},
+			},
+		],
+	},
+	connections: {
+		'When called by a test run': {
+			[NodeConnectionType.Main]: [
+				[
+					{
+						node: 'Replace me',
+						type: NodeConnectionType.Main,
+						index: 0,
+					},
+				],
+			],
+		},
+		'Replace me': {
+			[NodeConnectionType.Main]: [
+				[
+					{
+						node: 'Return metric(s)',
+						type: NodeConnectionType.Main,
+						index: 0,
+					},
+				],
+			],
+		},
+	},
+	settings: {
+		executionOrder: 'v1',
+	},
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/constants.ts b/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
index 3cc673147d..e2a292550a 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/constants.ts
@@ -284,6 +284,7 @@ export const ROOT_DOLLAR_COMPLETIONS: Completion[] = [
 				name: '$fromAI',
 				returnType: 'any',
 				description: 'Populate this with the parameter passed from the large language model',
+				docURL: 'https://docs.n8n.io/advanced-ai/examples/using-the-fromai-function/',
 				args: [
 					{
 						name: 'key',
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 146b8948a7..3743355e25 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -155,7 +155,8 @@
 	"aiAssistant.newSessionModal.message": "You already have an active AI Assistant session. Starting a new session will clear your current conversation history.",
 	"aiAssistant.newSessionModal.question": "Are you sure you want to start a new session?",
 	"aiAssistant.newSessionModal.confirm": "Start new session",
-	"aiAssistant.serviceError.message": "Unable to connect to n8n's AI service",
+	"aiAssistant.serviceError.message": "Unable to connect to n8n's AI service ({message})",
+	"aiAssistant.payloadTooBig.message": "Payload size is too large",
 	"aiAssistant.codeUpdated.message.title": "Assistant modified workflow",
 	"aiAssistant.codeUpdated.message.body1": "Open the",
 	"aiAssistant.codeUpdated.message.body2": "node to see the changes",
@@ -181,6 +182,7 @@
 	"binaryDataDisplay.noDataFoundToDisplay": "No data found to display",
 	"binaryDataDisplay.yourBrowserDoesNotSupport": "Your browser does not support the video element. Kindly update it to latest version.",
 	"chat.hide": "Hide chat",
+	"chat.open": "Open chat",
 	"chat.window.title": "Chat",
 	"chat.window.logs": "Latest Logs",
 	"chat.window.logsFromNode": "from {nodeName} node",
@@ -597,7 +599,6 @@
 	"credentialsList.confirmMessage.confirmButtonText": "Yes, delete",
 	"credentialsList.confirmMessage.headline": "Delete Credential?",
 	"credentialsList.confirmMessage.message": "Are you sure you want to delete {credentialName}?",
-	"credentialsList.createNewCredential": "Create New Credential",
 	"credentialsList.created": "Created",
 	"credentialsList.credentials": "Credentials",
 	"credentialsList.deleteCredential": "Delete Credential",
@@ -625,8 +626,11 @@
 	"credentials.item.created": "Created",
 	"credentials.item.owner": "Owner",
 	"credentials.item.readonly": "Read only",
+	"credentials.item.needsSetup": "Needs first setup",
 	"credentials.search.placeholder": "Search credentials...",
 	"credentials.filters.type": "Type",
+	"credentials.filters.setup": "Needs first setup",
+	"credentials.filters.status": "Status",
 	"credentials.filters.active": "Some credentials may be hidden since filters are applied.",
 	"credentials.filters.active.reset": "Remove filters",
 	"credentials.sort.lastUpdated": "Sort by last updated",
@@ -653,6 +657,8 @@
 	"dataMapping.schemaView.emptyData": "No fields - item(s) exist, but they're empty",
 	"dataMapping.schemaView.disabled": "This node is disabled and will just pass data through",
 	"dataMapping.schemaView.noMatches": "No results for '{search}'",
+	"dataMapping.schemaView.preview": "This is a preview of the schema, execute the node to see the exact schema and data. {link}",
+	"dataMapping.schemaView.previewNode": "(schema preview)",
 	"displayWithChange.cancelEdit": "Cancel Edit",
 	"displayWithChange.clickToChange": "Click to Change",
 	"displayWithChange.setValue": "Set Value",
@@ -712,6 +718,7 @@
 	"executionsList.activeExecutions.none": "No active executions",
 	"executionsList.activeExecutions.header": "{running}/{cap} active executions",
 	"executionsList.activeExecutions.tooltip": "Current active executions: {running} out of {cap}. This instance is limited to {cap} concurrent production executions.",
+	"executionsList.activeExecutions.evaluationNote": "Evaluation runs appear in the list of executions but do not count towards your execution concurrency.",
 	"executionsList.allWorkflows": "All Workflows",
 	"executionsList.anyStatus": "Any Status",
 	"executionsList.autoRefresh": "Auto refresh",
@@ -748,6 +755,7 @@
 	"executionsList.selected": "{count} execution selected: | {count} executions selected:",
 	"executionsList.selectAll": "Select {executionNum} finished execution | Select all {executionNum} finished executions",
 	"executionsList.test": "Test execution",
+	"executionsList.evaluation": "Evaluation execution",
 	"executionsList.showError.handleDeleteSelected.title": "Problem deleting executions",
 	"executionsList.showError.loadMore.title": "Problem loading executions",
 	"executionsList.showError.loadWorkflows.title": "Problem loading workflows",
@@ -935,13 +943,6 @@
 	"menuActions.importFromUrl": "Import from URL...",
 	"menuActions.importFromFile": "Import from File...",
 	"menuActions.delete": "Delete",
-	"menuActions.switchToNewNodeViewVersion": "Switch to new canvas",
-	"menuActions.switchToOldNodeViewVersion": "Switch to old canvas",
-	"menuActions.badge.new": "NEW",
-	"menuActions.badge.alpha": "ALPHA",
-	"menuActions.badge.beta": "BETA",
-	"menuActions.nodeViewDiscovery.tooltip": "You're currently using our new, more performant canvas.",
-	"menuActions.nodeViewDiscovery.tooltip.switchBack": "You can switch back to the old version using this menu.",
 	"multipleParameter.addItem": "Add item",
 	"multipleParameter.currentlyNoItemsExist": "Currently no items exist",
 	"multipleParameter.deleteItem": "Delete item",
@@ -980,12 +981,17 @@
 	"ndv.input.noOutputData.executePrevious": "Execute previous nodes",
 	"ndv.input.noOutputData.title": "No input data yet",
 	"ndv.input.noOutputData.hint": "(From the earliest node that has no output data yet)",
+	"ndv.input.noOutputData.schemaPreviewHint": "switch to {schema} to use the schema preview",
+	"ndv.input.noOutputData.or": "or",
 	"ndv.input.executingPrevious": "Executing previous nodes...",
 	"ndv.input.notConnected.title": "Wire me up",
 	"ndv.input.notConnected.message": "This node can only receive input data if you connect it to another node.",
 	"ndv.input.notConnected.learnMore": "Learn more",
 	"ndv.input.disabled": "The '{nodeName}' node is disabled and won’t execute.",
 	"ndv.input.disabled.cta": "Enable it",
+	"ndv.input.rootNodeHasNotRun.title": "Parent node hasn’t run yet",
+	"ndv.input.rootNodeHasNotRun.description": "Inputs that the parent node sends to this one will appear here. To map data in from previous nodes, use the {link} view.",
+	"ndv.input.rootNodeHasNotRun.description.link": "mapping",
 	"ndv.output": "Output",
 	"ndv.output.ai.empty": "👈 Use these logs to see information on how the {node} node completed processing. You can click on a node to see the input it received and data it output.",
 	"ndv.output.ai.waiting": "Waiting for message",
@@ -1114,6 +1120,7 @@
 	"nodeCreator.subcategoryDescriptions.tools": "Utility components providing various functionalities.",
 	"nodeCreator.subcategoryDescriptions.vectorStores": "Handles storage and retrieval of vector representations.",
 	"nodeCreator.subcategoryDescriptions.miscellaneous": "Other AI related nodes.",
+	"nodeCreator.subcategoryDescriptions.humanInTheLoop": "Wait for approval or human input before continuing",
 	"nodeCreator.subcategoryInfos.languageModels": "Chat models are designed for interactive conversations and follow instructions well, while text completion models focus on generating continuations of a given text input",
 	"nodeCreator.subcategoryInfos.memory": "Memory allows an AI model to remember and reference past interactions with it",
 	"nodeCreator.subcategoryInfos.vectorStores": "Vector stores allow an AI model to reference relevant pieces of documents, useful for question answering and document search",
@@ -1136,8 +1143,10 @@
 	"nodeCreator.subcategoryNames.tools": "Tools",
 	"nodeCreator.subcategoryNames.vectorStores": "Vector Stores",
 	"nodeCreator.subcategoryNames.miscellaneous": "Miscellaneous",
+	"nodeCreator.subcategoryNames.humanInTheLoop": "Human in the loop",
 	"nodeCreator.sectionNames.popular": "Popular",
 	"nodeCreator.sectionNames.other": "Other",
+	"nodeCreator.sectionNames.sendAndWait": "Send and wait for response",
 	"nodeCreator.sectionNames.transform.combine": "Combine items",
 	"nodeCreator.sectionNames.transform.addOrRemove": "Add or remove items",
 	"nodeCreator.sectionNames.transform.convert": "Convert data",
@@ -1162,7 +1171,7 @@
 	"nodeCreator.triggerHelperPanel.whatHappensNext": "What happens next?",
 	"nodeCreator.triggerHelperPanel.selectATrigger": "What triggers this workflow?",
 	"nodeCreator.triggerHelperPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
-	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When called by another workflow",
+	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When Executed by Another Workflow",
 	"nodeCreator.triggerHelperPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCreator.aiPanel.aiNodes": "AI Nodes",
 	"nodeCreator.aiPanel.aiOtherNodes": "Other AI Nodes",
@@ -1183,11 +1192,11 @@
 	"nodeCreator.aiPanel.whatHappensNext": "What happens next?",
 	"nodeCreator.aiPanel.selectATrigger": "Select an AI Component",
 	"nodeCreator.aiPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
-	"nodeCreator.aiPanel.workflowTriggerDisplayName": "When called by another workflow",
+	"nodeCreator.aiPanel.workflowTriggerDisplayName": "When Executed by Another Workflow",
 	"nodeCreator.aiPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCreator.nodeItem.triggerIconTitle": "Trigger Node",
 	"nodeCreator.nodeItem.aiIconTitle": "LangChain AI Node",
-	"nodeCredentials.createNew": "Create New Credential",
+	"nodeCredentials.createNew": "Create new credential",
 	"nodeCredentials.credentialFor": "Credential for {credentialType}",
 	"nodeCredentials.credentialsLabel": "Credential to connect with",
 	"nodeCredentials.issues": "Issues",
@@ -1318,7 +1327,6 @@
 	"nodeView.redirecting": "Redirecting",
 	"nodeView.refresh": "Refresh",
 	"nodeView.resetZoom": "Reset Zoom",
-	"nodeView.reportBug": "Report a bug",
 	"nodeView.runButtonText.executeWorkflow": "Test workflow",
 	"nodeView.runButtonText.executingWorkflow": "Executing workflow",
 	"nodeView.runButtonText.waitingForTriggerEvent": "Waiting for trigger event",
@@ -1443,6 +1451,9 @@
 	"parameterInputList.parameterOptions": "Parameter Options",
 	"parameterInputList.loadingFields": "Loading fields...",
 	"parameterInputList.loadingError": "Error loading fields. Refresh you page and try again.",
+	"parameterOverride.overridePanelText": "Defined automatically by the <b>model</b>",
+	"parameterOverride.applyOverrideButtonTooltip": "Let the model define this parameter",
+	"parameterOverride.descriptionTooltip": "Explain to the LLM how it should generate this value, a good, specific description would allow LLMs to produce expected results much more often",
 	"personalizationModal.businessOwner": "Business Owner",
 	"personalizationModal.continue": "Continue",
 	"personalizationModal.cicd": "CI/CD",
@@ -1598,7 +1609,7 @@
 	"resourceMapper.refreshFieldList": "Refresh {fieldWord} List",
 	"resourceMapper.staleDataWarning.tooltip": "{fieldWord} are outdated. Refresh to see the changes.",
 	"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
-	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
+	"resourceMapper.attemptToConvertTypes.displayName": "Attempt To Convert Types",
 	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
 	"runData.openSubExecutionSingle": "View sub-execution",
 	"runData.openSubExecutionWithId": "View sub-execution {id}",
@@ -1661,9 +1672,9 @@
 	"runData.aiContentBlock.tokens": "{count} Tokens",
 	"runData.aiContentBlock.tokens.prompt": "Prompt:",
 	"runData.aiContentBlock.tokens.completion": "Completion:",
-	"runData.trimmedData.title": "Data too large to display",
-	"runData.trimmedData.message": "The data is too large to be shown here. View the full details in 'Executions' tab.",
-	"runData.trimmedData.button": "See execution",
+	"runData.trimmedData.title": "Data not viewable yet",
+	"runData.trimmedData.message": "It will be available here once the execution has finished.",
+	"runData.trimmedData.loading": "Loading data",
 	"saveButton.save": "@:_reusableBaseText.save",
 	"saveButton.saved": "Saved",
 	"saveWorkflowButton.hint": "Save workflow",
@@ -1828,12 +1839,19 @@
 	"settings.api.create.description": "Control n8n programmatically using the <a href=\"https://docs.n8n.io/api\" target=\"_blank\">n8n API</a>",
 	"settings.api.create.button": "Create an API Key",
 	"settings.api.create.button.loading": "Creating API Key...",
-	"settings.api.create.error": "Creating the API Key failed.",
+	"settings.api.create.error": "API Key creation failed.",
+	"settings.api.edit.error": "API Key update failed.",
 	"settings.api.delete.title": "Delete this API Key?",
 	"settings.api.delete.description": "Any application using this API Key will no longer have access to n8n. This operation cannot be undone.",
 	"settings.api.delete.button": "Delete Forever",
 	"settings.api.delete.error": "Deleting the API Key failed.",
 	"settings.api.delete.toast": "API Key deleted",
+	"settings.api.create.toast": "API Key created",
+	"settings.api.update.toast": "API Key updated",
+	"settings.api.creationTime": "API key was created on {time}",
+	"settings.api.expirationTime": "Expires on {time}",
+	"settings.api.expired": "This API key has expired",
+	"settings.api.neverExpires": "Never expires",
 	"settings.api.view.copy.toast": "API Key copied to clipboard",
 	"settings.api.view.apiPlayground": "API Playground",
 	"settings.api.view.info": "Use your API Key to control n8n programmatically using the {apiAction}. But if you only want to trigger workflows, consider using the {webhookAction} instead.",
@@ -1844,6 +1862,19 @@
 	"settings.api.view.more-details": "You can find more details in",
 	"settings.api.view.external-docs": "the API documentation",
 	"settings.api.view.error": "Could not check if an api key already exists.",
+	"settings.api.view.modal.form.label": "Label",
+	"settings.api.view.modal.form.expiration": "Expiration",
+	"settings.api.view.modal.form.expirationText": "The API key will expire on {expirationDate}",
+	"settings.api.view.modal.form.label.placeholder": "e.g Internal Project",
+	"settings.api.view.modal.form.expiration.custom": "Custom",
+	"settings.api.view.modal.form.expiration.days": "{numberOfDays} days",
+	"settings.api.view.modal.form.expiration.none": "No Expiration",
+	"settings.api.view.modal.title.created": "API Key Created",
+	"settings.api.view.modal.title.create": "Create API Key",
+	"settings.api.view.modal.title.edit": "Edit API Key",
+	"settings.api.view.modal.done.button": "Done",
+	"settings.api.view.modal.edit.button": "Edit",
+	"settings.api.view.modal.save.button": "Save",
 	"settings.version": "Version",
 	"settings.usageAndPlan.title": "Usage and plan",
 	"settings.usageAndPlan.description": "You’re on the {name} {type}",
@@ -1968,8 +1999,12 @@
 	"settings.sourceControl.pull.success.title": "Pulled successfully",
 	"settings.sourceControl.pull.upToDate.title": "Up to date",
 	"settings.sourceControl.pull.upToDate.description": "No workflow changes to pull from Git",
+	"settings.sourceControl.pull.upToDate.variables.title": "Finish setting up your new variables to use in workflows",
+	"settings.sourceControl.pull.upToDate.variables.description": "Review Variables",
+	"settings.sourceControl.pull.upToDate.credentials.title": "Finish setting up your new credentials to use in workflows",
+	"settings.sourceControl.pull.upToDate.credentials.description": "Review Credentials",
 	"settings.sourceControl.modals.pull.title": "Pull changes",
-	"settings.sourceControl.modals.pull.description": "These workflows will be updated, and any local changes to them will be overridden. To keep the local version, push it before pulling.",
+	"settings.sourceControl.modals.pull.description": "These resources will be updated or deleted, and any local changes to them will be lost. To keep the local version, push it before pulling.",
 	"settings.sourceControl.modals.pull.description.learnMore": "More info",
 	"settings.sourceControl.modals.pull.buttons.cancel": "@:_reusableBaseText.cancel",
 	"settings.sourceControl.modals.pull.buttons.save": "Pull and override",
@@ -2355,6 +2390,7 @@
 	"workflows.create.personal.toast.text": "This workflow has been created inside your personal space.",
 	"workflows.create.project.toast.title": "Workflow successfully created in {projectName}",
 	"workflows.create.project.toast.text": "All members from {projectName} will have access to this workflow.",
+	"workflowSelectorParameterInput.createNewSubworkflow.name": "My Sub-Workflow",
 	"importCurlModal.title": "Import cURL command",
 	"importCurlModal.input.label": "cURL Command",
 	"importCurlModal.input.placeholder": "Paste the cURL command here",
@@ -2378,6 +2414,8 @@
 	"variables.empty.button.disabled.tooltip": "Your current role in the project does not allow you to create variables",
 	"variables.empty.notAllowedToCreate.heading": "{name}, start using variables",
 	"variables.empty.notAllowedToCreate.description": "Ask your n8n instance owner to create the variables you need. Once configured, you can utilize them in your workflows using the syntax $vars.MY_VAR.",
+	"variables.filters.active": "Some variables may be hidden since filters are applied.",
+	"variables.filters.active.reset": "Remove filters",
 	"variables.noResults": "No variables found",
 	"variables.sort.nameAsc": "Sort by name (A-Z)",
 	"variables.sort.nameDesc": "Sort by name (Z-A)",
@@ -2765,9 +2803,11 @@
 	"communityPlusModal.input.email.label": "Enter email to receive your license key",
 	"communityPlusModal.button.skip": "Skip",
 	"communityPlusModal.button.confirm": "Send me a free license key",
-	"executeWorkflowTrigger.createNewSubworkflow": "Create a sub-workflow in {projectName}",
-	"executeWorkflowTrigger.createNewSubworkflow.noProject": "Create a new sub-workflow",
-	"testDefinition.edit.descriptionPlaceholder": "",
+	"executeWorkflowTrigger.createNewSubworkflow": "Create a Sub-Workflow in {projectName}",
+	"executeWorkflowTrigger.createNewSubworkflow.noProject": "Create a New Sub-Workflow",
+	"testDefinition.edit.descriptionPlaceholder": "Enter test description",
+	"testDefinition.edit.showConfig": "Show config",
+	"testDefinition.edit.hideConfig": "Hide config",
 	"testDefinition.edit.backButtonTitle": "Back to Workflow Evaluation",
 	"testDefinition.edit.namePlaceholder": "Enter test name",
 	"testDefinition.edit.metricsTitle": "Metrics",
@@ -2782,24 +2822,26 @@
 	"testDefinition.edit.workflowSelectorTitle": "Workflow to make comparisons",
 	"testDefinition.edit.workflowSelectorHelpText": "This workflow will be called once for each test case.",
 	"testDefinition.edit.updateTest": "Update test",
-	"testDefinition.edit.saveTest": "Run test",
+	"testDefinition.edit.saveTest": "Save test",
+	"testDefinition.edit.runTest": "Run test",
 	"testDefinition.edit.testSaved": "Test saved",
 	"testDefinition.edit.testSaveFailed": "Failed to save test",
 	"testDefinition.edit.description": "Description",
-	"testDefinition.edit.description.tooltip": "Add details about what this test evaluates and what success looks like",
+	"testDefinition.edit.description.description": "Add details about what this test evaluates and what success looks like",
+	"testDefinition.edit.pinNodes.noNodes.title": "No nodes to pin",
+	"testDefinition.edit.pinNodes.noNodes.description": "Your workflow needs to have at least one node to run a test",
 	"testDefinition.edit.tagName": "Tag name",
 	"testDefinition.edit.step.intro": "When running a test",
-	"testDefinition.edit.step.executions": "Fetch past executions | Fetch {count} past execution | Fetch {count} past executions",
-	"testDefinition.edit.step.executions.tooltip": "Select which tagged executions to use as test cases. Each execution will be replayed to compare performance",
-	"testDefinition.edit.step.nodes": "Mock nodes",
-	"testDefinition.edit.step.mockedNodes": "No nodes mocked | {count} node mocked | {count} nodes mocked",
-	"testDefinition.edit.step.nodes.tooltip": "Replace specific nodes with test data to isolate what you're testing",
-	"testDefinition.edit.step.reRunExecutions": "Re-run executions",
-	"testDefinition.edit.step.reRunExecutions.tooltip": "Each test case will be re-run using the current workflow version",
-	"testDefinition.edit.step.compareExecutions": "Compare each past and new execution",
-	"testDefinition.edit.step.compareExecutions.tooltip": "Select which workflow to use for running the comparison tests",
-	"testDefinition.edit.step.metrics": "Summarise metrics",
-	"testDefinition.edit.step.metrics.tooltip": "Define which output fields to track and compare between test runs",
+	"testDefinition.edit.step.executions": "1. Fetch N past executions tagged | 1. Fetch {count} past execution tagged | 1. Fetch {count} past executions tagged",
+	"testDefinition.edit.step.executions.description": "Use a tag to select past executions for use as test cases in evaluation. The trigger data from each of these past executions will be used as input to run your workflow. The outputs of past executions are used as benchmark and compared against to check whether performance has changed based on logic and metrics that you define below.",
+	"testDefinition.edit.step.mockedNodes": "2. Mock N nodes |2. Mock {count} node |2. Mock {count} nodes",
+	"testDefinition.edit.step.nodes.description": "Mocked nodes have their data replayed rather than being re-executed. Do this to avoid calling external services, save time executing, and isolate what you are evaluating. If a node is mocked, the tagged past execution's output data for that node is used in the evaluation instead.",
+	"testDefinition.edit.step.reRunExecutions": "3. Simulation",
+	"testDefinition.edit.step.reRunExecutions.description": "Each past execution is re-run using the latest version of the workflow being tested. Outputs from both the evaluated and comparison data will be passed to evaluation logic.",
+	"testDefinition.edit.step.compareExecutions": "4. Compare each past and new execution",
+	"testDefinition.edit.step.compareExecutions.description": "Each past execution is compared with its new equivalent to check for changes in performance. This is done using a separate evaluation workflow: it receives the two execution versions as input, and outputs metrics based on logic that you define.",
+	"testDefinition.edit.step.metrics": "5. Summarise metrics",
+	"testDefinition.edit.step.metrics.description": "The names of metrics fields returned by the evaluation workflow (defined above). If included in this section, they are displayed in the test run results and averaged to give a score for the entire test run.",
 	"testDefinition.edit.step.collapse": "Collapse",
 	"testDefinition.edit.step.expand": "Expand",
 	"testDefinition.edit.selectNodes": "Select nodes",
@@ -2807,21 +2849,30 @@
 	"testDefinition.edit.pastRuns": "Past runs",
 	"testDefinition.edit.pastRuns.total": "No runs | {count} run | {count} runs",
 	"testDefinition.edit.nodesPinning.pinButtonTooltip": "Pin execution data of this node during test run",
+	"testDefinition.edit.saving": "Saving...",
+	"testDefinition.edit.saved": "Changes saved",
 	"testDefinition.list.testDeleted": "Test deleted",
 	"testDefinition.list.tests": "Tests",
+	"testDefinition.list.evaluations": "Evaluations",
+	"testDefinition.list.unitTests.title": "Unit tests",
+	"testDefinition.list.unitTests.description": "Test sections of your workflow in isolation",
+	"testDefinition.list.unitTests.cta": "Register interest",
 	"testDefinition.list.createNew": "Create new test",
 	"testDefinition.list.actionDescription": "Replay past executions to check whether performance has changed",
-	"testDefinition.list.actionButton": "Create Test",
+	"testDefinition.list.actionButton": "Create an Evaluation",
 	"testDefinition.list.testRuns": "No test runs | {count} test run | {count} test runs",
 	"testDefinition.list.lastRun": "Ran",
 	"testDefinition.list.running": "Running",
 	"testDefinition.list.errorRate": "Error rate: {errorRate}",
 	"testDefinition.list.testStartError": "Failed to start test run",
 	"testDefinition.list.testStarted": "Test run started",
+	"testDefinition.list.testCancelled": "Test run cancelled",
 	"testDefinition.list.loadError": "Failed to load tests",
 	"testDefinition.listRuns.status.new": "New",
 	"testDefinition.listRuns.status.running": "Running",
+	"testDefinition.listRuns.status.evaluating": "Evaluating",
 	"testDefinition.listRuns.status.completed": "Completed",
+	"testDefinition.listRuns.status.cancelled": "Cancelled",
 	"testDefinition.listRuns.status.error": "Error",
 	"testDefinition.listRuns.status.success": "Success",
 	"testDefinition.listRuns.metricsOverTime": "Metrics over time",
@@ -2839,15 +2890,27 @@
 	"testDefinition.runDetail.testCase.status": "Test case status",
 	"testDefinition.runDetail.totalCases": "Total cases",
 	"testDefinition.runTest": "Run Test",
+	"testDefinition.cancelTestRun": "Cancel Test Run",
 	"testDefinition.notImplemented": "This feature is not implemented yet!",
 	"testDefinition.viewDetails": "View Details",
 	"testDefinition.editTest": "Edit Test",
 	"testDefinition.deleteTest": "Delete Test",
+	"testDefinition.deleteTest.warning": "The test and all associated runs will be removed. This cannot be undone",
+	"testDefinition.testIsRunning": "Test is running. Please wait for it to finish.",
+	"testDefinition.completeConfig": "Complete the configuration below to run the test:",
+	"testDefinition.configError.noEvaluationTag": "No evaluation tag set",
+	"testDefinition.configError.noExecutionsAddedToTag": "No executions added to this tag",
+	"testDefinition.configError.noEvaluationWorkflow": "No evaluation workflow set",
+	"testDefinition.configError.noMetrics": "No metrics set",
+	"testDefinition.workflowInput.subworkflowName": "Evaluation workflow for {name}",
+	"testDefinition.workflowInput.subworkflowName.default": "My Evaluation Sub-Workflow",
 	"freeAi.credits.callout.claim.title": "Get {credits} free OpenAI API credits",
 	"freeAi.credits.callout.claim.button.label": "Claim credits",
 	"freeAi.credits.callout.success.title.part1": "Claimed {credits} free OpenAI API credits! Please note these free credits are only for the following models:",
 	"freeAi.credits.callout.success.title.part2": "gpt-4o-mini, text-embedding-3-small, dall-e-3, tts-1, whisper-1, and text-moderation-latest",
 	"freeAi.credits.credentials.edit": "This is a managed credential and cannot be edited.",
 	"freeAi.credits.showError.claim.title": "Free AI credits",
-	"freeAi.credits.showError.claim.message": "Enable to claim credits"
+	"freeAi.credits.showError.claim.message": "Enable to claim credits",
+	"freeAi.credits.showWarning.workflow.activation.title": "You're using free OpenAI API credits",
+	"freeAi.credits.showWarning.workflow.activation.description": "To make sure your workflow runs smoothly in the future, replace the free OpenAI API credits with your own API key."
 }
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 187ab6d623..18e8113fca 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -53,6 +53,7 @@ import {
 	faEnvelope,
 	faEquals,
 	faEye,
+	faEyeSlash,
 	faExclamationTriangle,
 	faExpand,
 	faExpandAlt,
@@ -81,6 +82,7 @@ import {
 	faHandScissors,
 	faHandPointLeft,
 	faHandshake,
+	faUserCheck,
 	faHashtag,
 	faHdd,
 	faHistory,
@@ -228,6 +230,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faEnvelope);
 		addIcon(faEquals);
 		addIcon(faEye);
+		addIcon(faEyeSlash);
 		addIcon(faExclamationTriangle);
 		addIcon(faExclamationCircle);
 		addIcon(faExpand);
@@ -256,6 +259,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faHandshake);
 		addIcon(faHandPointLeft);
 		addIcon(faHashtag);
+		addIcon(faUserCheck);
 		addIcon(faHdd);
 		addIcon(faHistory);
 		addIcon(faHome);
diff --git a/packages/editor-ui/src/plugins/sentry.ts b/packages/editor-ui/src/plugins/sentry.ts
index 7347459fb5..dac25cd05c 100644
--- a/packages/editor-ui/src/plugins/sentry.ts
+++ b/packages/editor-ui/src/plugins/sentry.ts
@@ -8,6 +8,9 @@ const ignoredErrors = [
 	{ instanceof: ResponseError, message: /ECONNREFUSED/ },
 	{ instanceof: ResponseError, message: "Can't connect to n8n." },
 	{ instanceof: ResponseError, message: 'Unauthorized' },
+	{ instanceof: RangeError, message: /Position \d+ is out of range for changeset of length \d+/ },
+	{ instanceof: RangeError, message: /Invalid change range \d+ to \d+/ },
+	{ instanceof: RangeError, message: /Selection points outside of document$/ },
 	{ instanceof: Error, message: /ResizeObserver/ },
 ] as const;
 
diff --git a/packages/editor-ui/src/plugins/telemetry.test.ts b/packages/editor-ui/src/plugins/telemetry.test.ts
index dec983fa9b..3a9fca908f 100644
--- a/packages/editor-ui/src/plugins/telemetry.test.ts
+++ b/packages/editor-ui/src/plugins/telemetry.test.ts
@@ -21,6 +21,8 @@ describe('telemetry', () => {
 		);
 	});
 
+	beforeEach(() => vitest.clearAllMocks());
+
 	describe('identify', () => {
 		it('Rudderstack identify method should be called when proving userId ', () => {
 			const identifyFunction = vi.spyOn(window.rudderanalytics, 'identify');
diff --git a/packages/editor-ui/src/push-connection/__tests__/mockEventSource.ts b/packages/editor-ui/src/push-connection/__tests__/mockEventSource.ts
new file mode 100644
index 0000000000..e7b7afbd75
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/__tests__/mockEventSource.ts
@@ -0,0 +1,20 @@
+/** Mocked EventSource class to help testing */
+export class MockEventSource extends EventTarget {
+	constructor(public url: string) {
+		super();
+	}
+
+	simulateConnectionOpen() {
+		this.dispatchEvent(new Event('open'));
+	}
+
+	simulateConnectionClose() {
+		this.dispatchEvent(new Event('close'));
+	}
+
+	simulateMessageEvent(data: string) {
+		this.dispatchEvent(new MessageEvent('message', { data }));
+	}
+
+	close = vi.fn();
+}
diff --git a/packages/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts b/packages/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts
new file mode 100644
index 0000000000..cbeebe0161
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/__tests__/mockWebSocketClient.ts
@@ -0,0 +1,32 @@
+import { WebSocketState } from '@/push-connection/useWebSocketClient';
+
+/** Mocked WebSocket class to help testing */
+export class MockWebSocket extends EventTarget {
+	readyState: number = WebSocketState.CONNECTING;
+
+	constructor(public url: string) {
+		super();
+	}
+
+	simulateConnectionOpen() {
+		this.dispatchEvent(new Event('open'));
+		this.readyState = WebSocketState.OPEN;
+	}
+
+	simulateConnectionClose(code: number) {
+		this.dispatchEvent(new CloseEvent('close', { code }));
+		this.readyState = WebSocketState.CLOSED;
+	}
+
+	simulateMessageEvent(data: string) {
+		this.dispatchEvent(new MessageEvent('message', { data }));
+	}
+
+	dispatchErrorEvent() {
+		this.dispatchEvent(new Event('error'));
+	}
+
+	send = vi.fn();
+
+	close = vi.fn();
+}
diff --git a/packages/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts b/packages/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts
new file mode 100644
index 0000000000..706f5c5766
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/__tests__/useEventSourceClient.test.ts
@@ -0,0 +1,153 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { useEventSourceClient } from '../useEventSourceClient';
+import { MockEventSource } from './mockEventSource';
+
+describe('useEventSourceClient', () => {
+	let mockEventSource: MockEventSource;
+
+	beforeEach(() => {
+		mockEventSource = new MockEventSource('http://test.com');
+
+		// @ts-expect-error - mock EventSource
+		global.EventSource = vi.fn(() => mockEventSource);
+
+		vi.useFakeTimers();
+	});
+
+	afterEach(() => {
+		vi.clearAllTimers();
+		vi.clearAllMocks();
+	});
+
+	test('should create EventSource connection with provided URL', () => {
+		const url = 'http://test.com';
+		const onMessage = vi.fn();
+
+		const { connect } = useEventSourceClient({ url, onMessage });
+		connect();
+
+		expect(EventSource).toHaveBeenCalledWith(url, { withCredentials: true });
+	});
+
+	test('should update connection status on successful connection', () => {
+		const { connect, isConnected } = useEventSourceClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		mockEventSource.simulateConnectionOpen();
+
+		expect(isConnected.value).toBe(true);
+	});
+
+	test('should handle incoming messages', () => {
+		const onMessage = vi.fn();
+		const { connect } = useEventSourceClient({ url: 'http://test.com', onMessage });
+		connect();
+
+		mockEventSource.simulateMessageEvent('test data');
+
+		expect(onMessage).toHaveBeenCalledWith('test data');
+	});
+
+	test('should handle disconnection', () => {
+		const { connect, disconnect, isConnected } = useEventSourceClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		// Simulate successful connection
+		mockEventSource.simulateConnectionOpen();
+		expect(isConnected.value).toBe(true);
+
+		disconnect();
+
+		expect(isConnected.value).toBe(false);
+		expect(mockEventSource.close).toHaveBeenCalled();
+	});
+
+	test('should handle connection loss', () => {
+		const { connect, isConnected } = useEventSourceClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+		expect(EventSource).toHaveBeenCalledTimes(1);
+
+		// Simulate successful connection
+		mockEventSource.simulateConnectionOpen();
+		expect(isConnected.value).toBe(true);
+
+		// Simulate connection loss
+		mockEventSource.simulateConnectionClose();
+		expect(isConnected.value).toBe(false);
+
+		// Advance timer to trigger reconnect
+		vi.advanceTimersByTime(1_000);
+		expect(EventSource).toHaveBeenCalledTimes(2);
+	});
+
+	test('sendMessage should be a noop function', () => {
+		const { connect, sendMessage } = useEventSourceClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		// Simulate successful connection
+		mockEventSource.simulateConnectionOpen();
+
+		const message = 'test message';
+		// Should not throw error and should do nothing
+		expect(() => sendMessage(message)).not.toThrow();
+	});
+
+	test('should attempt reconnection with increasing delays', () => {
+		const { connect } = useEventSourceClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		mockEventSource.simulateConnectionOpen();
+		mockEventSource.simulateConnectionClose();
+
+		// First reconnection attempt after 1 second
+		vi.advanceTimersByTime(1_000);
+		expect(EventSource).toHaveBeenCalledTimes(2);
+
+		mockEventSource.simulateConnectionClose();
+
+		// Second reconnection attempt after 2 seconds
+		vi.advanceTimersByTime(2_000);
+		expect(EventSource).toHaveBeenCalledTimes(3);
+	});
+
+	test('should reset connection attempts on successful connection', () => {
+		const { connect } = useEventSourceClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		// First connection attempt
+		mockEventSource.simulateConnectionOpen();
+		mockEventSource.simulateConnectionClose();
+
+		// First reconnection attempt
+		vi.advanceTimersByTime(1_000);
+		expect(EventSource).toHaveBeenCalledTimes(2);
+
+		// Successful connection
+		mockEventSource.simulateConnectionOpen();
+
+		// Connection lost again
+		mockEventSource.simulateConnectionClose();
+
+		// Should start with initial delay again
+		vi.advanceTimersByTime(1_000);
+		expect(EventSource).toHaveBeenCalledTimes(3);
+	});
+});
diff --git a/packages/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts b/packages/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts
new file mode 100644
index 0000000000..7640e1fe17
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/__tests__/useHeartbeat.test.ts
@@ -0,0 +1,88 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { useHeartbeat } from '../useHeartbeat';
+
+describe('useHeartbeat', () => {
+	beforeEach(() => {
+		vi.useFakeTimers();
+	});
+
+	afterEach(() => {
+		vi.clearAllTimers();
+	});
+
+	it('should start heartbeat and call onHeartbeat at specified intervals', () => {
+		const onHeartbeat = vi.fn();
+		const interval = 1000;
+
+		const heartbeat = useHeartbeat({ interval, onHeartbeat });
+		heartbeat.startHeartbeat();
+
+		// Initially, the callback should not be called
+		expect(onHeartbeat).not.toHaveBeenCalled();
+
+		// Advance timer by interval
+		vi.advanceTimersByTime(interval);
+		expect(onHeartbeat).toHaveBeenCalledTimes(1);
+
+		// Advance timer by another interval
+		vi.advanceTimersByTime(interval);
+		expect(onHeartbeat).toHaveBeenCalledTimes(2);
+	});
+
+	it('should stop heartbeat when stopHeartbeat is called', () => {
+		const onHeartbeat = vi.fn();
+		const interval = 1000;
+
+		const heartbeat = useHeartbeat({ interval, onHeartbeat });
+		heartbeat.startHeartbeat();
+
+		// Advance timer by interval
+		vi.advanceTimersByTime(interval);
+		expect(onHeartbeat).toHaveBeenCalledTimes(1);
+
+		// Stop the heartbeat
+		heartbeat.stopHeartbeat();
+
+		// Advance timer by multiple intervals
+		vi.advanceTimersByTime(interval * 3);
+		expect(onHeartbeat).toHaveBeenCalledTimes(1); // Should still be 1
+	});
+
+	it('should be safe to call stopHeartbeat multiple times', () => {
+		const onHeartbeat = vi.fn();
+		const interval = 1000;
+
+		const heartbeat = useHeartbeat({ interval, onHeartbeat });
+		heartbeat.startHeartbeat();
+
+		// Stop multiple times
+		heartbeat.stopHeartbeat();
+		heartbeat.stopHeartbeat();
+		heartbeat.stopHeartbeat();
+
+		vi.advanceTimersByTime(interval * 2);
+		expect(onHeartbeat).not.toHaveBeenCalled();
+	});
+
+	it('should restart heartbeat after stopping', () => {
+		const onHeartbeat = vi.fn();
+		const interval = 1000;
+
+		const heartbeat = useHeartbeat({ interval, onHeartbeat });
+
+		// First start
+		heartbeat.startHeartbeat();
+		vi.advanceTimersByTime(interval);
+		expect(onHeartbeat).toHaveBeenCalledTimes(1);
+
+		// Stop
+		heartbeat.stopHeartbeat();
+		vi.advanceTimersByTime(interval);
+		expect(onHeartbeat).toHaveBeenCalledTimes(1);
+
+		// Restart
+		heartbeat.startHeartbeat();
+		vi.advanceTimersByTime(interval);
+		expect(onHeartbeat).toHaveBeenCalledTimes(2);
+	});
+});
diff --git a/packages/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts b/packages/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts
new file mode 100644
index 0000000000..a7e12f0542
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/__tests__/useWebSocketClient.test.ts
@@ -0,0 +1,140 @@
+import { afterEach, beforeEach, describe, expect, test, vi } from 'vitest';
+import { useWebSocketClient } from '../useWebSocketClient';
+import { MockWebSocket } from './mockWebSocketClient';
+
+describe('useWebSocketClient', () => {
+	let mockWebSocket: MockWebSocket;
+
+	beforeEach(() => {
+		mockWebSocket = new MockWebSocket('ws://test.com');
+
+		// @ts-expect-error - mock WebSocket
+		global.WebSocket = vi.fn(() => mockWebSocket);
+
+		vi.useFakeTimers();
+	});
+
+	afterEach(() => {
+		vi.clearAllTimers();
+		vi.clearAllMocks();
+	});
+
+	test('should create WebSocket connection with provided URL', () => {
+		const url = 'ws://test.com';
+		const onMessage = vi.fn();
+
+		const { connect } = useWebSocketClient({ url, onMessage });
+		connect();
+
+		expect(WebSocket).toHaveBeenCalledWith(url);
+	});
+
+	test('should update connection status and start heartbeat on successful connection', () => {
+		const { connect, isConnected } = useWebSocketClient({
+			url: 'ws://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		mockWebSocket.simulateConnectionOpen();
+
+		expect(isConnected.value).toBe(true);
+
+		// Advance timer to trigger heartbeat
+		vi.advanceTimersByTime(30_000);
+		expect(mockWebSocket.send).toHaveBeenCalledWith(JSON.stringify({ type: 'heartbeat' }));
+	});
+
+	test('should handle incoming messages', () => {
+		const onMessage = vi.fn();
+		const { connect } = useWebSocketClient({ url: 'ws://test.com', onMessage });
+		connect();
+
+		mockWebSocket.simulateMessageEvent('test data');
+
+		expect(onMessage).toHaveBeenCalledWith('test data');
+	});
+
+	test('should handle disconnection', () => {
+		const { connect, disconnect, isConnected } = useWebSocketClient({
+			url: 'ws://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		// Simulate successful connection
+		mockWebSocket.simulateConnectionOpen();
+
+		expect(isConnected.value).toBe(true);
+
+		disconnect();
+
+		expect(isConnected.value).toBe(false);
+		expect(mockWebSocket.close).toHaveBeenCalledWith(1000);
+	});
+
+	test('should handle connection loss', () => {
+		const { connect, isConnected } = useWebSocketClient({
+			url: 'ws://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+		expect(WebSocket).toHaveBeenCalledTimes(1);
+
+		// Simulate successful connection
+		mockWebSocket.simulateConnectionOpen();
+
+		expect(isConnected.value).toBe(true);
+
+		// Simulate connection loss
+		mockWebSocket.simulateConnectionClose(1006);
+
+		expect(isConnected.value).toBe(false);
+		// Advance timer to reconnect
+		vi.advanceTimersByTime(1_000);
+		expect(WebSocket).toHaveBeenCalledTimes(2);
+	});
+
+	test('should throw error when trying to send message while disconnected', () => {
+		const { sendMessage } = useWebSocketClient({ url: 'ws://test.com', onMessage: vi.fn() });
+
+		expect(() => sendMessage('test')).toThrow('Not connected to the server');
+	});
+
+	test('should attempt reconnection with increasing delays', () => {
+		const { connect } = useWebSocketClient({
+			url: 'http://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		mockWebSocket.simulateConnectionOpen();
+		mockWebSocket.simulateConnectionClose(1006);
+
+		// First reconnection attempt after 1 second
+		vi.advanceTimersByTime(1_000);
+		expect(WebSocket).toHaveBeenCalledTimes(2);
+
+		mockWebSocket.simulateConnectionClose(1006);
+
+		// Second reconnection attempt after 2 seconds
+		vi.advanceTimersByTime(2_000);
+		expect(WebSocket).toHaveBeenCalledTimes(3);
+	});
+
+	test('should send message when connected', () => {
+		const { connect, sendMessage } = useWebSocketClient({
+			url: 'ws://test.com',
+			onMessage: vi.fn(),
+		});
+		connect();
+
+		// Simulate successful connection
+		mockWebSocket.simulateConnectionOpen();
+
+		const message = 'test message';
+		sendMessage(message);
+
+		expect(mockWebSocket.send).toHaveBeenCalledWith(message);
+	});
+});
diff --git a/packages/editor-ui/src/push-connection/useEventSourceClient.ts b/packages/editor-ui/src/push-connection/useEventSourceClient.ts
new file mode 100644
index 0000000000..575df67b9a
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/useEventSourceClient.ts
@@ -0,0 +1,69 @@
+import { useReconnectTimer } from '@/push-connection/useReconnectTimer';
+import { ref } from 'vue';
+
+export type UseEventSourceClientOptions = {
+	url: string;
+	onMessage: (data: string) => void;
+};
+
+/**
+ * Creates an EventSource connection to the server. Uses reconnection logic
+ * to reconnect if the connection is lost.
+ */
+export const useEventSourceClient = (options: UseEventSourceClientOptions) => {
+	const isConnected = ref(false);
+	const eventSource = ref<EventSource | null>(null);
+
+	const onConnected = () => {
+		isConnected.value = true;
+		reconnectTimer.resetConnectionAttempts();
+	};
+
+	const onConnectionLost = () => {
+		console.warn('[EventSourceClient] Connection lost');
+		isConnected.value = false;
+		reconnectTimer.scheduleReconnect();
+	};
+
+	const onMessage = (event: MessageEvent) => {
+		options.onMessage(event.data);
+	};
+
+	const disconnect = () => {
+		if (eventSource.value) {
+			reconnectTimer.stopReconnectTimer();
+			eventSource.value.close();
+			eventSource.value = null;
+		}
+
+		isConnected.value = false;
+	};
+
+	const connect = () => {
+		// Ensure we disconnect any existing connection
+		disconnect();
+
+		eventSource.value = new EventSource(options.url, { withCredentials: true });
+		eventSource.value.addEventListener('open', onConnected);
+		eventSource.value.addEventListener('message', onMessage);
+		eventSource.value.addEventListener('close', onConnectionLost);
+	};
+
+	const reconnectTimer = useReconnectTimer({
+		onAttempt: connect,
+		onAttemptScheduled: (delay) => {
+			console.log(`[EventSourceClient] Attempting to reconnect in ${delay}ms`);
+		},
+	});
+
+	const sendMessage = (_: string) => {
+		// Noop, EventSource does not support sending messages
+	};
+
+	return {
+		isConnected,
+		connect,
+		disconnect,
+		sendMessage,
+	};
+};
diff --git a/packages/editor-ui/src/push-connection/useHeartbeat.ts b/packages/editor-ui/src/push-connection/useHeartbeat.ts
new file mode 100644
index 0000000000..22fb8a7b54
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/useHeartbeat.ts
@@ -0,0 +1,32 @@
+import { ref } from 'vue';
+
+export type UseHeartbeatOptions = {
+	interval: number;
+	onHeartbeat: () => void;
+};
+
+/**
+ * Creates a heartbeat timer using the given interval. The timer needs
+ * to be started and stopped manually.
+ */
+export const useHeartbeat = (options: UseHeartbeatOptions) => {
+	const { interval, onHeartbeat } = options;
+
+	const heartbeatTimer = ref<ReturnType<typeof setInterval> | null>(null);
+
+	const startHeartbeat = () => {
+		heartbeatTimer.value = setInterval(onHeartbeat, interval);
+	};
+
+	const stopHeartbeat = () => {
+		if (heartbeatTimer.value) {
+			clearInterval(heartbeatTimer.value);
+			heartbeatTimer.value = null;
+		}
+	};
+
+	return {
+		startHeartbeat,
+		stopHeartbeat,
+	};
+};
diff --git a/packages/editor-ui/src/push-connection/useReconnectTimer.ts b/packages/editor-ui/src/push-connection/useReconnectTimer.ts
new file mode 100644
index 0000000000..bc62a2d897
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/useReconnectTimer.ts
@@ -0,0 +1,49 @@
+import { ref } from 'vue';
+
+type UseReconnectTimerOptions = {
+	/** Callback that an attempt should be made */
+	onAttempt: () => void;
+
+	/** Callback that a future attempt was scheduled */
+	onAttemptScheduled: (delay: number) => void;
+};
+
+/**
+ * A timer for exponential backoff reconnect attempts.
+ */
+export const useReconnectTimer = ({ onAttempt, onAttemptScheduled }: UseReconnectTimerOptions) => {
+	const initialReconnectDelay = 1000;
+	const maxReconnectDelay = 15_000;
+
+	const reconnectTimer = ref<ReturnType<typeof setTimeout> | null>(null);
+	const reconnectAttempts = ref(0);
+
+	const scheduleReconnect = () => {
+		const delay = Math.min(initialReconnectDelay * 2 ** reconnectAttempts.value, maxReconnectDelay);
+
+		reconnectAttempts.value++;
+
+		onAttemptScheduled(delay);
+		reconnectTimer.value = setTimeout(() => {
+			onAttempt();
+		}, delay);
+	};
+
+	/** Stops the reconnect timer. NOTE: This does not reset the reconnect attempts. */
+	const stopReconnectTimer = () => {
+		if (reconnectTimer.value) {
+			clearTimeout(reconnectTimer.value);
+			reconnectTimer.value = null;
+		}
+	};
+
+	const resetConnectionAttempts = () => {
+		reconnectAttempts.value = 0;
+	};
+
+	return {
+		scheduleReconnect,
+		stopReconnectTimer,
+		resetConnectionAttempts,
+	};
+};
diff --git a/packages/editor-ui/src/push-connection/useWebSocketClient.ts b/packages/editor-ui/src/push-connection/useWebSocketClient.ts
new file mode 100644
index 0000000000..5a83d279db
--- /dev/null
+++ b/packages/editor-ui/src/push-connection/useWebSocketClient.ts
@@ -0,0 +1,105 @@
+import { useHeartbeat } from '@/push-connection/useHeartbeat';
+import { useReconnectTimer } from '@/push-connection/useReconnectTimer';
+import { ref } from 'vue';
+
+export type UseWebSocketClientOptions<T> = {
+	url: string;
+	onMessage: (data: T) => void;
+};
+
+/** Defined here as not available in tests */
+export const WebSocketState = {
+	CONNECTING: 0,
+	OPEN: 1,
+	CLOSING: 2,
+	CLOSED: 3,
+};
+
+/**
+ * Creates a WebSocket connection to the server. Uses reconnection logic
+ * to reconnect if the connection is lost.
+ */
+export const useWebSocketClient = <T>(options: UseWebSocketClientOptions<T>) => {
+	const isConnected = ref(false);
+	const socket = ref<WebSocket | null>(null);
+
+	/**
+	 * Heartbeat timer to keep the connection alive. This is an additional
+	 * mechanism to the protocol level ping/pong mechanism the server sends.
+	 * This is used the ensure the client notices connection issues.
+	 */
+	const { startHeartbeat, stopHeartbeat } = useHeartbeat({
+		interval: 30_000,
+		onHeartbeat: () => {
+			socket.value?.send(JSON.stringify({ type: 'heartbeat' }));
+		},
+	});
+
+	const onConnected = () => {
+		socket.value?.removeEventListener('open', onConnected);
+		isConnected.value = true;
+		startHeartbeat();
+		reconnectTimer.resetConnectionAttempts();
+	};
+
+	const onConnectionLost = (event: CloseEvent) => {
+		console.warn(`[WebSocketClient] Connection lost, code=${event.code ?? 'unknown'}`);
+		disconnect();
+		reconnectTimer.scheduleReconnect();
+	};
+
+	const onMessage = (event: MessageEvent) => {
+		options.onMessage(event.data);
+	};
+
+	const onError = (error: unknown) => {
+		console.warn('[WebSocketClient] Connection error:', error);
+	};
+
+	const disconnect = () => {
+		if (socket.value) {
+			stopHeartbeat();
+			reconnectTimer.stopReconnectTimer();
+			socket.value.removeEventListener('message', onMessage);
+			socket.value.removeEventListener('error', onError);
+			socket.value.removeEventListener('close', onConnectionLost);
+			socket.value.close(1000);
+			socket.value = null;
+		}
+
+		isConnected.value = false;
+	};
+
+	const connect = () => {
+		// Ensure we disconnect any existing connection
+		disconnect();
+
+		socket.value = new WebSocket(options.url);
+		socket.value.addEventListener('open', onConnected);
+		socket.value.addEventListener('message', onMessage);
+		socket.value.addEventListener('error', onError);
+		socket.value.addEventListener('close', onConnectionLost);
+	};
+
+	const reconnectTimer = useReconnectTimer({
+		onAttempt: connect,
+		onAttemptScheduled: (delay) => {
+			console.log(`[WebSocketClient] Attempting to reconnect in ${delay}ms`);
+		},
+	});
+
+	const sendMessage = (serializedMessage: string) => {
+		if (!isConnected.value || !socket.value) {
+			throw new Error('Not connected to the server');
+		}
+
+		socket.value.send(serializedMessage);
+	};
+
+	return {
+		isConnected,
+		connect,
+		disconnect,
+		sendMessage,
+	};
+};
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 960a3b6eef..4a6faf9f51 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -63,6 +63,8 @@ const TestDefinitionListView = async () =>
 	await import('./views/TestDefinition/TestDefinitionListView.vue');
 const TestDefinitionEditView = async () =>
 	await import('./views/TestDefinition/TestDefinitionEditView.vue');
+const TestDefinitionRootView = async () =>
+	await import('./views/TestDefinition/TestDefinitionRootView.vue');
 
 function getTemplatesRedirect(defaultRedirect: VIEWS[keyof VIEWS]): { name: string } | false {
 	const settingsStore = useSettingsStore();
@@ -257,6 +259,11 @@ export const routes: RouteRecordRaw[] = [
 	},
 	{
 		path: '/workflow/:name/evaluation',
+		components: {
+			default: TestDefinitionRootView,
+			header: MainHeader,
+			sidebar: MainSidebar,
+		},
 		meta: {
 			keepWorkflowAlive: true,
 			middleware: ['authenticated'],
@@ -267,8 +274,6 @@ export const routes: RouteRecordRaw[] = [
 				name: VIEWS.TEST_DEFINITION,
 				components: {
 					default: TestDefinitionListView,
-					header: MainHeader,
-					sidebar: MainSidebar,
 				},
 				meta: {
 					keepWorkflowAlive: true,
@@ -280,8 +285,6 @@ export const routes: RouteRecordRaw[] = [
 				name: VIEWS.NEW_TEST_DEFINITION,
 				components: {
 					default: TestDefinitionEditView,
-					header: MainHeader,
-					sidebar: MainSidebar,
 				},
 				meta: {
 					keepWorkflowAlive: true,
@@ -293,8 +296,6 @@ export const routes: RouteRecordRaw[] = [
 				name: VIEWS.TEST_DEFINITION_EDIT,
 				components: {
 					default: TestDefinitionEditView,
-					header: MainHeader,
-					sidebar: MainSidebar,
 				},
 				meta: {
 					keepWorkflowAlive: true,
@@ -306,8 +307,6 @@ export const routes: RouteRecordRaw[] = [
 				name: VIEWS.TEST_DEFINITION_RUNS,
 				components: {
 					default: TestDefinitionRunsListView,
-					header: MainHeader,
-					sidebar: MainSidebar,
 				},
 				meta: {
 					keepWorkflowAlive: true,
@@ -319,8 +318,6 @@ export const routes: RouteRecordRaw[] = [
 				name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
 				components: {
 					default: TestDefinitionRunDetailView,
-					header: MainHeader,
-					sidebar: MainSidebar,
 				},
 				meta: {
 					keepWorkflowAlive: true,
diff --git a/packages/editor-ui/src/stores/apiKeys.store.ts b/packages/editor-ui/src/stores/apiKeys.store.ts
new file mode 100644
index 0000000000..0cc897aa75
--- /dev/null
+++ b/packages/editor-ui/src/stores/apiKeys.store.ts
@@ -0,0 +1,67 @@
+import { STORES } from '@/constants';
+import { defineStore } from 'pinia';
+import { useRootStore } from '@/stores/root.store';
+
+import * as publicApiApi from '@/api/api-keys';
+import { computed, ref } from 'vue';
+import { useSettingsStore } from './settings.store';
+import type { ApiKey, CreateApiKeyRequestDto, UpdateApiKeyRequestDto } from '@n8n/api-types';
+
+export const useApiKeysStore = defineStore(STORES.API_KEYS, () => {
+	const apiKeys = ref<ApiKey[]>([]);
+
+	const rootStore = useRootStore();
+	const settingsStore = useSettingsStore();
+
+	const apiKeysSortByCreationDate = computed(() =>
+		apiKeys.value.sort((a, b) => b.createdAt.localeCompare(a.createdAt)),
+	);
+
+	const apiKeysById = computed(() => {
+		return apiKeys.value.reduce(
+			(acc, apiKey) => {
+				acc[apiKey.id] = apiKey;
+				return acc;
+			},
+			{} as Record<string, ApiKey>,
+		);
+	});
+
+	const canAddMoreApiKeys = computed(
+		() => apiKeys.value.length < settingsStore.api.apiKeysPerUserLimit,
+	);
+
+	const getAndCacheApiKeys = async () => {
+		if (apiKeys.value.length) return apiKeys.value;
+		apiKeys.value = await publicApiApi.getApiKeys(rootStore.restApiContext);
+		return apiKeys.value;
+	};
+
+	const createApiKey = async (payload: CreateApiKeyRequestDto) => {
+		const newApiKey = await publicApiApi.createApiKey(rootStore.restApiContext, payload);
+		const { rawApiKey, ...rest } = newApiKey;
+		apiKeys.value.push(rest);
+		return newApiKey;
+	};
+
+	const deleteApiKey = async (id: string) => {
+		await publicApiApi.deleteApiKey(rootStore.restApiContext, id);
+		apiKeys.value = apiKeys.value.filter((apiKey) => apiKey.id !== id);
+	};
+
+	const updateApiKey = async (id: string, payload: UpdateApiKeyRequestDto) => {
+		await publicApiApi.updateApiKey(rootStore.restApiContext, id, payload);
+		apiKeysById.value[id].label = payload.label;
+	};
+
+	return {
+		getAndCacheApiKeys,
+		createApiKey,
+		deleteApiKey,
+		updateApiKey,
+		apiKeysSortByCreationDate,
+		apiKeysById,
+		apiKeys,
+		canAddMoreApiKeys,
+	};
+});
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/editor-ui/src/stores/assistant.store.ts
index 446501e9c4..0837376934 100644
--- a/packages/editor-ui/src/stores/assistant.store.ts
+++ b/packages/editor-ui/src/stores/assistant.store.ts
@@ -283,7 +283,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 		stopStreaming();
 		assistantThinkingMessage.value = undefined;
 		addAssistantError(
-			`${locale.baseText('aiAssistant.serviceError.message')}: (${e.message})`,
+			locale.baseText('aiAssistant.serviceError.message', { interpolate: { message: e.message } }),
 			id,
 			retry,
 		);
@@ -487,24 +487,25 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 		openChat();
 
 		streaming.value = true;
+		const payload: ChatRequest.RequestPayload['payload'] = {
+			role: 'user',
+			type: 'init-error-helper',
+			user: {
+				firstName: usersStore.currentUser?.firstName ?? '',
+			},
+			error: context.error,
+			node: assistantHelpers.processNodeForAssistant(context.node, [
+				'position',
+				'parameters.notice',
+			]),
+			nodeInputData,
+			executionSchema: schemas,
+			authType,
+		};
 		chatWithAssistant(
 			rootStore.restApiContext,
 			{
-				payload: {
-					role: 'user',
-					type: 'init-error-helper',
-					user: {
-						firstName: usersStore.currentUser?.firstName ?? '',
-					},
-					error: context.error,
-					node: assistantHelpers.processNodeForAssistant(context.node, [
-						'position',
-						'parameters.notice',
-					]),
-					nodeInputData,
-					executionSchema: schemas,
-					authType,
-				},
+				payload,
 			},
 			(msg) => onEachStreamingMessage(msg, id),
 			() => onDoneStreaming(id),
diff --git a/packages/editor-ui/src/stores/communityNodes.store.ts b/packages/editor-ui/src/stores/communityNodes.store.ts
index ef5fa85e82..5e73d0e31a 100644
--- a/packages/editor-ui/src/stores/communityNodes.store.ts
+++ b/packages/editor-ui/src/stores/communityNodes.store.ts
@@ -55,21 +55,13 @@ export const useCommunityNodesStore = defineStore(STORES.COMMUNITY_NODES, () =>
 	};
 
 	const installPackage = async (packageName: string): Promise<void> => {
-		try {
-			await communityNodesApi.installNewPackage(rootStore.restApiContext, packageName);
-			await fetchInstalledPackages();
-		} catch (error) {
-			throw error;
-		}
+		await communityNodesApi.installNewPackage(rootStore.restApiContext, packageName);
+		await fetchInstalledPackages();
 	};
 
 	const uninstallPackage = async (packageName: string): Promise<void> => {
-		try {
-			await communityNodesApi.uninstallPackage(rootStore.restApiContext, packageName);
-			removePackageByName(packageName);
-		} catch (error) {
-			throw error;
-		}
+		await communityNodesApi.uninstallPackage(rootStore.restApiContext, packageName);
+		removePackageByName(packageName);
 	};
 
 	const removePackageByName = (name: string): void => {
@@ -82,16 +74,12 @@ export const useCommunityNodesStore = defineStore(STORES.COMMUNITY_NODES, () =>
 	};
 
 	const updatePackage = async (packageName: string): Promise<void> => {
-		try {
-			const packageToUpdate = installedPackages.value[packageName];
-			const updatedPackage = await communityNodesApi.updatePackage(
-				rootStore.restApiContext,
-				packageToUpdate.packageName,
-			);
-			updatePackageObject(updatedPackage);
-		} catch (error) {
-			throw error;
-		}
+		const packageToUpdate = installedPackages.value[packageName];
+		const updatedPackage = await communityNodesApi.updatePackage(
+			rootStore.restApiContext,
+			packageToUpdate.packageName,
+		);
+		updatePackageObject(updatedPackage);
 	};
 
 	return {
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts
index 14711d8198..c9b5810f86 100644
--- a/packages/editor-ui/src/stores/executions.store.ts
+++ b/packages/editor-ui/src/stores/executions.store.ts
@@ -173,8 +173,6 @@ export const useExecutionsStore = defineStore('executions', () => {
 			executionsCount.value = data.count;
 			executionsCountEstimated.value = data.estimated;
 			return data;
-		} catch (e) {
-			throw e;
 		} finally {
 			loading.value = false;
 		}
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.test.ts b/packages/editor-ui/src/stores/nodeCreator.store.test.ts
index b59d763e97..27ed48bf19 100644
--- a/packages/editor-ui/src/stores/nodeCreator.store.test.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.store.test.ts
@@ -1,8 +1,15 @@
 import { createPinia, setActivePinia } from 'pinia';
 import { useNodeCreatorStore } from './nodeCreator.store';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { CUSTOM_API_CALL_KEY, REGULAR_NODE_CREATOR_VIEW } from '@/constants';
+import {
+	AI_UNCATEGORIZED_CATEGORY,
+	CUSTOM_API_CALL_KEY,
+	REGULAR_NODE_CREATOR_VIEW,
+} from '@/constants';
 import type { INodeCreateElement } from '@/Interface';
+import { parseCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
+import { NodeConnectionType } from 'n8n-workflow';
+import { CanvasConnectionMode } from '@/types';
 
 const workflow_id = 'workflow-id';
 const category_name = 'category-name';
@@ -11,6 +18,7 @@ const mode = 'mode';
 const now = 1717602004819;
 const now1 = 1718602004819;
 const node_type = 'node-type';
+const node_id = 'node-id';
 const node_version = 1;
 const input_node_type = 'input-node-type';
 const action = 'action';
@@ -29,6 +37,31 @@ vi.mock('@/composables/useTelemetry', () => {
 	};
 });
 
+// Mock the workflows store so that getNodeById returns a dummy node.
+vi.mock('@/stores/workflows.store', () => {
+	return {
+		useWorkflowsStore: () => ({
+			getNodeById: vi.fn((id?: string) => {
+				return id ? { id, name: 'Test Node' } : null;
+			}),
+			workflowTriggerNodes: [],
+			workflowId: 'dummy-workflow-id',
+			getCurrentWorkflow: vi.fn(() => ({
+				getNode: vi.fn(() => ({
+					type: 'n8n-node.example',
+					typeVersion: 1,
+				})),
+			})),
+		}),
+	};
+});
+
+vi.mock('@/utils/canvasUtilsV2', () => {
+	return {
+		parseCanvasConnectionHandleString: vi.fn(),
+	};
+});
+
 describe('useNodeCreatorStore', () => {
 	let nodeCreatorStore: ReturnType<typeof useNodeCreatorStore>;
 
@@ -132,6 +165,7 @@ describe('useNodeCreatorStore', () => {
 			workflow_id,
 		});
 		nodeCreatorStore.onNodeAddedToCanvas({
+			node_id,
 			node_type,
 			node_version,
 			is_auto_add: true,
@@ -143,6 +177,7 @@ describe('useNodeCreatorStore', () => {
 		expect(useTelemetry().track).toHaveBeenCalledWith(
 			'User added node to workflow canvas',
 			{
+				node_id,
 				node_type,
 				node_version,
 				is_auto_add: true,
@@ -290,6 +325,69 @@ describe('useNodeCreatorStore', () => {
 			},
 		);
 	});
+	describe('selective connection view', () => {
+		const mockedParseCanvasConnectionHandleString = vi.mocked(
+			parseCanvasConnectionHandleString,
+			true,
+		);
+
+		it('sets nodeCreatorView to AI_UNCATEGORIZED_CATEGORY when connection type is not Main', async () => {
+			mockedParseCanvasConnectionHandleString.mockReturnValue({
+				type: NodeConnectionType.AiLanguageModel, // any value that is not NodeConnectionType.Main
+				index: 0,
+				mode: CanvasConnectionMode.Input,
+			});
+
+			const connection = {
+				source: 'node-1',
+				sourceHandle: 'fake-handle',
+			};
+
+			nodeCreatorStore.openNodeCreatorForConnectingNode({
+				connection,
+				eventSource: 'plus_endpoint',
+				nodeCreatorView: REGULAR_NODE_CREATOR_VIEW,
+			});
+
+			expect(nodeCreatorStore.selectedView).toEqual(AI_UNCATEGORIZED_CATEGORY);
+		});
+
+		it('uses the provided nodeCreatorView when connection type is Main', async () => {
+			mockedParseCanvasConnectionHandleString.mockReturnValue({
+				type: NodeConnectionType.Main,
+				index: 0,
+				mode: CanvasConnectionMode.Input,
+			});
+
+			const connection = {
+				source: 'node-2',
+				sourceHandle: 'fake-handle-main',
+			};
+
+			nodeCreatorStore.openNodeCreatorForConnectingNode({
+				connection,
+				eventSource: 'plus_endpoint',
+				nodeCreatorView: REGULAR_NODE_CREATOR_VIEW,
+			});
+
+			expect(nodeCreatorStore.selectedView).toEqual(REGULAR_NODE_CREATOR_VIEW);
+		});
+
+		it('does not update state if no source node is found', async () => {
+			const connection = {
+				source: '',
+				sourceHandle: 'any-handle',
+			};
+
+			nodeCreatorStore.openNodeCreatorForConnectingNode({
+				connection,
+				eventSource: 'plus_endpoint',
+				nodeCreatorView: REGULAR_NODE_CREATOR_VIEW,
+			});
+
+			expect(nodeCreatorStore.selectedView).not.toEqual(REGULAR_NODE_CREATOR_VIEW);
+		});
+	});
 });
 
 function getSessionId(time: number) {
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.ts b/packages/editor-ui/src/stores/nodeCreator.store.ts
index 05dd4a9795..9137a63505 100644
--- a/packages/editor-ui/src/stores/nodeCreator.store.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.store.ts
@@ -2,6 +2,7 @@ import { defineStore } from 'pinia';
 import {
 	AI_NODE_CREATOR_VIEW,
 	AI_OTHERS_NODE_CREATOR_VIEW,
+	AI_UNCATEGORIZED_CATEGORY,
 	CUSTOM_API_CALL_KEY,
 	NODE_CREATOR_OPEN_SOURCES,
 	REGULAR_NODE_CREATOR_VIEW,
@@ -20,7 +21,7 @@ import type {
 import { computed, ref } from 'vue';
 import { transformNodeType } from '@/components/Node/NodeCreator/utils';
 import type { IDataObject, INodeInputConfiguration, NodeParameterValueType } from 'n8n-workflow';
-import { NodeConnectionType, nodeConnectionTypes, NodeHelpers } from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -121,10 +122,6 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 		createNodeActive,
 		nodeCreatorView,
 	}: ToggleNodeCreatorOptions) {
-		if (createNodeActive === isCreateNodeActive.value) {
-			return;
-		}
-
 		if (!nodeCreatorView) {
 			nodeCreatorView =
 				workflowsStore.workflowTriggerNodes.length > 0
@@ -183,18 +180,16 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 		uiStore.lastInteractedWithNodeHandle = connection.sourceHandle ?? null;
 		uiStore.lastInteractedWithNodeId = sourceNode.id;
 
+		const isOutput = mode === CanvasConnectionMode.Output;
+		const isScopedConnection = type !== NodeConnectionType.Main;
 		setNodeCreatorState({
 			source: eventSource,
 			createNodeActive: true,
-			nodeCreatorView,
+			nodeCreatorView: isScopedConnection ? AI_UNCATEGORIZED_CATEGORY : nodeCreatorView,
 		});
 
 		// TODO: The animation is a bit glitchy because we're updating view stack immediately
 		// after the node creator is opened
-		const isOutput = mode === CanvasConnectionMode.Output;
-		const isScopedConnection =
-			type !== NodeConnectionType.Main && nodeConnectionTypes.includes(type);
-
 		if (isScopedConnection) {
 			useViewStacks()
 				.gotoCompatibleConnectionView(type, isOutput, getNodeCreatorFilter(sourceNode.name, type))
@@ -360,6 +355,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 	}
 
 	function onNodeAddedToCanvas(properties: {
+		node_id: string;
 		node_type: string;
 		node_version: number;
 		is_auto_add?: boolean;
diff --git a/packages/editor-ui/src/stores/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts
index b795366f3b..8c652eb018 100644
--- a/packages/editor-ui/src/stores/projects.store.ts
+++ b/packages/editor-ui/src/stores/projects.store.ts
@@ -5,13 +5,7 @@ import { useRootStore } from '@/stores/root.store';
 import * as projectsApi from '@/api/projects.api';
 import * as workflowsEEApi from '@/api/workflows.ee';
 import * as credentialsEEApi from '@/api/credentials.ee';
-import type {
-	Project,
-	ProjectCreateRequest,
-	ProjectListItem,
-	ProjectUpdateRequest,
-	ProjectsCount,
-} from '@/types/projects.types';
+import type { Project, ProjectListItem, ProjectsCount } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
 import { useSettingsStore } from '@/stores/settings.store';
 import { hasPermission } from '@/utils/rbac/permissions';
@@ -21,6 +15,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { STORES } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { getResourcePermissions } from '@/permissions';
+import type { CreateProjectDto, UpdateProjectDto } from '@n8n/api-types';
 
 export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 	const route = useRoute();
@@ -112,26 +107,30 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 		currentProject.value = await fetchProject(id);
 	};
 
-	const createProject = async (project: ProjectCreateRequest): Promise<Project> => {
+	const createProject = async (project: CreateProjectDto): Promise<Project> => {
 		const newProject = await projectsApi.createProject(rootStore.restApiContext, project);
 		await getProjectsCount();
 		myProjects.value = [...myProjects.value, newProject as unknown as ProjectListItem];
 		return newProject;
 	};
 
-	const updateProject = async (projectData: ProjectUpdateRequest): Promise<void> => {
-		await projectsApi.updateProject(rootStore.restApiContext, projectData);
-		const projectIndex = myProjects.value.findIndex((p) => p.id === projectData.id);
+	const updateProject = async (
+		id: Project['id'],
+		projectData: Required<UpdateProjectDto>,
+	): Promise<void> => {
+		await projectsApi.updateProject(rootStore.restApiContext, id, projectData);
+		const projectIndex = myProjects.value.findIndex((p) => p.id === id);
+		const { name, icon } = projectData;
 		if (projectIndex !== -1) {
-			myProjects.value[projectIndex].name = projectData.name;
-			myProjects.value[projectIndex].icon = projectData.icon;
+			myProjects.value[projectIndex].name = name;
+			myProjects.value[projectIndex].icon = icon;
 		}
 		if (currentProject.value) {
-			currentProject.value.name = projectData.name;
-			currentProject.value.icon = projectData.icon;
+			currentProject.value.name = name;
+			currentProject.value.icon = icon;
 		}
 		if (projectData.relations) {
-			await getProject(projectData.id);
+			await getProject(id);
 		}
 	};
 
diff --git a/packages/editor-ui/src/stores/pushConnection.store.test.ts b/packages/editor-ui/src/stores/pushConnection.store.test.ts
new file mode 100644
index 0000000000..0d4bfdc69d
--- /dev/null
+++ b/packages/editor-ui/src/stores/pushConnection.store.test.ts
@@ -0,0 +1,173 @@
+import { setActivePinia, createPinia } from 'pinia';
+import { describe, test, expect, vi } from 'vitest';
+import { usePushConnectionStore } from './pushConnection.store';
+import { useWebSocketClient } from '@/push-connection/useWebSocketClient';
+import { ref } from 'vue';
+
+type WebSocketClient = ReturnType<typeof useWebSocketClient>;
+
+vi.mock('@/push-connection/useWebSocketClient', () => ({
+	useWebSocketClient: vi.fn(),
+}));
+
+vi.mock('@/push-connection/useEventSourceClient', () => ({
+	useEventSourceClient: vi.fn().mockReturnValue({
+		isConnected: { value: false },
+		connect: vi.fn(),
+		disconnect: vi.fn(),
+		sendMessage: vi.fn(),
+	}),
+}));
+
+vi.mock('./root.store', () => ({
+	useRootStore: vi.fn().mockReturnValue({
+		restUrl: 'http://localhost:5678/api/v1',
+		pushRef: 'test-push-ref',
+	}),
+}));
+
+vi.mock('./settings.store', () => ({
+	useSettingsStore: vi.fn().mockReturnValue({
+		pushBackend: 'websocket',
+	}),
+}));
+
+describe('usePushConnectionStore', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	const createTestInitialState = ({
+		isConnected = false,
+	}: {
+		isConnected?: boolean;
+	} = {}) => {
+		// Mock connected state
+		let onMessage: (data: unknown) => void = vi.fn();
+		const mockWebSocketClient: WebSocketClient = {
+			isConnected: ref(isConnected),
+			connect: vi.fn(),
+			disconnect: vi.fn(),
+			sendMessage: vi.fn(),
+		};
+
+		vi.mocked(useWebSocketClient).mockImplementation((opts) => {
+			onMessage = opts.onMessage;
+			return mockWebSocketClient;
+		});
+
+		setActivePinia(createPinia());
+
+		return {
+			store: usePushConnectionStore(),
+			mockWebSocketClient,
+			onMessage,
+		};
+	};
+
+	test('should initialize with default values', () => {
+		const { store } = createTestInitialState();
+
+		expect(store.isConnected).toBe(false);
+		expect(store.isConnectionRequested).toBe(false);
+		expect(store.onMessageReceivedHandlers).toEqual([]);
+	});
+
+	test('should handle event listeners', () => {
+		const { store } = createTestInitialState();
+		const handler = vi.fn();
+
+		const removeListener = store.addEventListener(handler);
+		expect(store.onMessageReceivedHandlers).toHaveLength(1);
+
+		removeListener();
+		expect(store.onMessageReceivedHandlers).toHaveLength(0);
+	});
+
+	describe('connection handling', () => {
+		test('should connect and disconnect', () => {
+			const { store, mockWebSocketClient } = createTestInitialState();
+
+			store.pushConnect();
+			expect(store.isConnectionRequested).toBe(true);
+			expect(mockWebSocketClient.connect).toHaveBeenCalled();
+
+			store.pushDisconnect();
+			expect(store.isConnectionRequested).toBe(false);
+			expect(mockWebSocketClient.disconnect).toHaveBeenCalled();
+		});
+
+		test('should show correct connection status', () => {
+			const { store, mockWebSocketClient } = createTestInitialState({
+				isConnected: true,
+			});
+
+			expect(store.isConnected).toBe(true);
+			expect(mockWebSocketClient.isConnected.value).toBe(true);
+
+			mockWebSocketClient.isConnected.value = false;
+			expect(store.isConnected).toBe(false);
+		});
+	});
+
+	describe('sending messages', () => {
+		test('should handle message sending when connected', () => {
+			const { store, mockWebSocketClient } = createTestInitialState({
+				isConnected: true,
+			});
+			const testMessage = { type: 'test', data: 'message' };
+
+			store.send(testMessage);
+
+			expect(mockWebSocketClient.sendMessage).toHaveBeenCalledWith(JSON.stringify(testMessage));
+		});
+
+		test('should queue messages when disconnected and send them when connected', async () => {
+			const { store, mockWebSocketClient } = createTestInitialState();
+			const testMessage = { type: 'test', data: 'message' };
+
+			store.send(testMessage);
+			store.send(testMessage);
+
+			expect(mockWebSocketClient.sendMessage).not.toHaveBeenCalled();
+
+			mockWebSocketClient.isConnected.value = true;
+
+			// Wait for the queue to be processed
+			await new Promise(setImmediate);
+
+			expect(mockWebSocketClient.sendMessage).toHaveBeenCalledTimes(2);
+		});
+	});
+
+	describe('receiving messages', () => {
+		test('should process received messages', async () => {
+			const { store, onMessage } = createTestInitialState({
+				isConnected: true,
+			});
+			const handler = vi.fn();
+			const testMessage = { type: 'test', data: 'message' };
+
+			store.addEventListener(handler);
+
+			// Simulate receiving a message
+			onMessage(JSON.stringify(testMessage));
+
+			expect(handler).toHaveBeenCalledWith(testMessage);
+		});
+
+		test('should handle invalid received messages', async () => {
+			const { store, onMessage } = createTestInitialState({
+				isConnected: true,
+			});
+			const handler = vi.fn();
+
+			store.addEventListener(handler);
+
+			// Simulate receiving an invalid message
+			onMessage('invalid json');
+
+			expect(handler).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/stores/pushConnection.store.ts b/packages/editor-ui/src/stores/pushConnection.store.ts
index 26e72f2f46..eeedcbf6ac 100644
--- a/packages/editor-ui/src/stores/pushConnection.store.ts
+++ b/packages/editor-ui/src/stores/pushConnection.store.ts
@@ -1,22 +1,12 @@
 import { defineStore } from 'pinia';
-import { ref, computed } from 'vue';
+import { computed, ref, watch } from 'vue';
 import type { PushMessage } from '@n8n/api-types';
 
-import { STORES, TIME } from '@/constants';
+import { STORES } from '@/constants';
 import { useSettingsStore } from './settings.store';
 import { useRootStore } from './root.store';
-
-export interface PushState {
-	pushRef: string;
-	pushSource: WebSocket | EventSource | null;
-	reconnectTimeout: NodeJS.Timeout | null;
-	retryTimeout: NodeJS.Timeout | null;
-	pushMessageQueue: Array<{ event: Event; retriesLeft: number }>;
-	connectRetries: number;
-	lostConnection: boolean;
-	outgoingQueue: unknown[];
-	isConnectionOpen: boolean;
-}
+import { useWebSocketClient } from '@/push-connection/useWebSocketClient';
+import { useEventSourceClient } from '@/push-connection/useEventSourceClient';
 
 export type OnPushMessageHandler = (event: PushMessage) => void;
 
@@ -27,18 +17,20 @@ export const usePushConnectionStore = defineStore(STORES.PUSH, () => {
 	const rootStore = useRootStore();
 	const settingsStore = useSettingsStore();
 
-	const pushRef = computed(() => rootStore.pushRef);
-	const pushSource = ref<WebSocket | EventSource | null>(null);
-	const reconnectTimeout = ref<NodeJS.Timeout | null>(null);
-	const connectRetries = ref(0);
-	const lostConnection = ref(false);
+	/**
+	 * Queue of messages to be sent to the server. Messages are queued if
+	 * the connection is down.
+	 */
 	const outgoingQueue = ref<unknown[]>([]);
-	const isConnectionOpen = ref(false);
+
+	/** Whether the connection has been requested */
+	const isConnectionRequested = ref(false);
 
 	const onMessageReceivedHandlers = ref<OnPushMessageHandler[]>([]);
 
 	const addEventListener = (handler: OnPushMessageHandler) => {
 		onMessageReceivedHandlers.value.push(handler);
+
 		return () => {
 			const index = onMessageReceivedHandlers.value.indexOf(handler);
 			if (index !== -1) {
@@ -47,103 +39,30 @@ export const usePushConnectionStore = defineStore(STORES.PUSH, () => {
 		};
 	};
 
-	function onConnectionError() {
-		pushDisconnect();
-		connectRetries.value++;
-		reconnectTimeout.value = setTimeout(
-			attemptReconnect,
-			Math.min(connectRetries.value * 2000, 8 * TIME.SECOND), // maximum 8 seconds backoff
-		);
-	}
-
-	/**
-	 * Close connection to server
-	 */
-	function pushDisconnect() {
-		if (pushSource.value !== null) {
-			pushSource.value.removeEventListener('error', onConnectionError);
-			pushSource.value.removeEventListener('close', onConnectionError);
-			pushSource.value.removeEventListener('message', pushMessageReceived);
-			if (pushSource.value.readyState < 2) pushSource.value.close();
-			pushSource.value = null;
-		}
-
-		isConnectionOpen.value = false;
-	}
-
-	/**
-	 * Connect to server to receive data via a WebSocket or EventSource
-	 */
-	function pushConnect() {
-		// always close the previous connection so that we do not end up with multiple connections
-		pushDisconnect();
-
-		if (reconnectTimeout.value) {
-			clearTimeout(reconnectTimeout.value);
-			reconnectTimeout.value = null;
-		}
-
-		const useWebSockets = settingsStore.pushBackend === 'websocket';
+	const useWebSockets = settingsStore.pushBackend === 'websocket';
 
+	const getConnectionUrl = () => {
 		const restUrl = rootStore.restUrl;
-		const url = `/push?pushRef=${pushRef.value}`;
+		const url = `/push?pushRef=${rootStore.pushRef}`;
 
 		if (useWebSockets) {
 			const { protocol, host } = window.location;
 			const baseUrl = restUrl.startsWith('http')
 				? restUrl.replace(/^http/, 'ws')
 				: `${protocol === 'https:' ? 'wss' : 'ws'}://${host + restUrl}`;
-			pushSource.value = new WebSocket(`${baseUrl}${url}`);
+			return `${baseUrl}${url}`;
 		} else {
-			pushSource.value = new EventSource(`${restUrl}${url}`, { withCredentials: true });
+			return `${restUrl}${url}`;
 		}
-
-		pushSource.value.addEventListener('open', onConnectionSuccess, false);
-		pushSource.value.addEventListener('message', pushMessageReceived, false);
-		pushSource.value.addEventListener(useWebSockets ? 'close' : 'error', onConnectionError, false);
-	}
-
-	function attemptReconnect() {
-		pushConnect();
-	}
-
-	function serializeAndSend(message: unknown) {
-		if (pushSource.value && 'send' in pushSource.value) {
-			pushSource.value.send(JSON.stringify(message));
-		}
-	}
-
-	function onConnectionSuccess() {
-		isConnectionOpen.value = true;
-		connectRetries.value = 0;
-		lostConnection.value = false;
-		rootStore.setPushConnectionActive();
-		pushSource.value?.removeEventListener('open', onConnectionSuccess);
-
-		if (outgoingQueue.value.length) {
-			for (const message of outgoingQueue.value) {
-				serializeAndSend(message);
-			}
-			outgoingQueue.value = [];
-		}
-	}
-
-	function send(message: unknown) {
-		if (!isConnectionOpen.value) {
-			outgoingQueue.value.push(message);
-			return;
-		}
-		serializeAndSend(message);
-	}
+	};
 
 	/**
 	 * Process a newly received message
 	 */
-	async function pushMessageReceived(event: Event) {
+	async function onMessage(data: unknown) {
 		let receivedData: PushMessage;
 		try {
-			// @ts-ignore
-			receivedData = JSON.parse(event.data);
+			receivedData = JSON.parse(data as string);
 		} catch (error) {
 			return;
 		}
@@ -151,19 +70,59 @@ export const usePushConnectionStore = defineStore(STORES.PUSH, () => {
 		onMessageReceivedHandlers.value.forEach((handler) => handler(receivedData));
 	}
 
+	const url = getConnectionUrl();
+
+	const client = useWebSockets
+		? useWebSocketClient({ url, onMessage })
+		: useEventSourceClient({ url, onMessage });
+
+	function serializeAndSend(message: unknown) {
+		if (client.isConnected.value) {
+			client.sendMessage(JSON.stringify(message));
+		} else {
+			outgoingQueue.value.push(message);
+		}
+	}
+
+	const pushConnect = () => {
+		isConnectionRequested.value = true;
+		client.connect();
+	};
+
+	const pushDisconnect = () => {
+		isConnectionRequested.value = false;
+		client.disconnect();
+	};
+
+	watch(client.isConnected, (didConnect) => {
+		if (!didConnect) {
+			return;
+		}
+
+		// Send any buffered messages
+		if (outgoingQueue.value.length) {
+			for (const message of outgoingQueue.value) {
+				serializeAndSend(message);
+			}
+			outgoingQueue.value = [];
+		}
+	});
+
+	/** Removes all buffered messages from the sent queue */
 	const clearQueue = () => {
 		outgoingQueue.value = [];
 	};
 
+	const isConnected = computed(() => client.isConnected.value);
+
 	return {
-		pushRef,
-		pushSource,
-		isConnectionOpen,
+		isConnected,
+		isConnectionRequested,
 		onMessageReceivedHandlers,
 		addEventListener,
 		pushConnect,
 		pushDisconnect,
-		send,
+		send: serializeAndSend,
 		clearQueue,
 	};
 });
diff --git a/packages/editor-ui/src/stores/root.store.ts b/packages/editor-ui/src/stores/root.store.ts
index 6e9bee10da..7736f2076b 100644
--- a/packages/editor-ui/src/stores/root.store.ts
+++ b/packages/editor-ui/src/stores/root.store.ts
@@ -20,7 +20,6 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		endpointWebhook: 'webhook',
 		endpointWebhookTest: 'webhook-test',
 		endpointWebhookWaiting: 'webhook-waiting',
-		pushConnectionActive: true,
 		timezone: 'America/New_York',
 		executionTimeout: -1,
 		maxExecutionTimeout: Number.MAX_SAFE_INTEGER,
@@ -66,8 +65,6 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 
 	const versionCli = computed(() => state.value.versionCli);
 
-	const pushConnectionActive = computed(() => state.value.pushConnectionActive);
-
 	const OAuthCallbackUrls = computed(() => state.value.oauthCallbackUrls);
 
 	const webhookTestUrl = computed(
@@ -105,14 +102,6 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		state.value.urlBaseWebhook = url;
 	};
 
-	const setPushConnectionActive = () => {
-		state.value.pushConnectionActive = true;
-	};
-
-	const setPushConnectionInactive = () => {
-		state.value.pushConnectionActive = false;
-	};
-
 	const setUrlBaseEditor = (urlBaseEditor: string) => {
 		const url = urlBaseEditor.endsWith('/') ? urlBaseEditor : `${urlBaseEditor}/`;
 		state.value.urlBaseEditor = url;
@@ -198,13 +187,10 @@ export const useRootStore = defineStore(STORES.ROOT, () => {
 		pushRef,
 		defaultLocale,
 		binaryDataMode,
-		pushConnectionActive,
 		OAuthCallbackUrls,
 		executionTimeout,
 		maxExecutionTimeout,
 		timezone,
-		setPushConnectionInactive,
-		setPushConnectionActive,
 		setUrlBaseWebhook,
 		setUrlBaseEditor,
 		setEndpointForm,
diff --git a/packages/editor-ui/src/stores/schemaPreview.store.ts b/packages/editor-ui/src/stores/schemaPreview.store.ts
new file mode 100644
index 0000000000..e1039f271b
--- /dev/null
+++ b/packages/editor-ui/src/stores/schemaPreview.store.ts
@@ -0,0 +1,46 @@
+import * as schemaPreviewApi from '@/api/schemaPreview';
+import { createResultError, createResultOk, type Result } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { reactive } from 'vue';
+import { useRootStore } from './root.store';
+import type { JSONSchema7 } from 'json-schema';
+
+export const useSchemaPreviewStore = defineStore('schemaPreview', () => {
+	// Type cast to avoid 'Type instantiation is excessively deep and possibly infinite'
+	const schemaPreviews = reactive<Map<string, Result<JSONSchema7, Error>>>(new Map()) as Map<
+		string,
+		Result<JSONSchema7, Error>
+	>;
+
+	const rootStore = useRootStore();
+
+	function getSchemaPreviewKey({
+		nodeType,
+		version,
+		operation,
+		resource,
+	}: schemaPreviewApi.GetSchemaPreviewOptions) {
+		return `${nodeType}_${version}_${resource ?? 'all'}_${operation ?? 'all'}`;
+	}
+
+	async function getSchemaPreview(
+		options: schemaPreviewApi.GetSchemaPreviewOptions,
+	): Promise<Result<JSONSchema7, Error>> {
+		const key = getSchemaPreviewKey(options);
+		const cached = schemaPreviews.get(key);
+		if (cached) return cached;
+
+		try {
+			const preview = await schemaPreviewApi.getSchemaPreview(rootStore.baseUrl, options);
+			const result = createResultOk(preview);
+			schemaPreviews.set(key, result);
+			return result;
+		} catch (error) {
+			const result = createResultError(error);
+			schemaPreviews.set(key, result);
+			return result;
+		}
+	}
+
+	return { getSchemaPreview };
+});
diff --git a/packages/editor-ui/src/stores/settings.store.test.ts b/packages/editor-ui/src/stores/settings.store.test.ts
index 147d24f684..4d7d00c76c 100644
--- a/packages/editor-ui/src/stores/settings.store.test.ts
+++ b/packages/editor-ui/src/stores/settings.store.test.ts
@@ -2,6 +2,8 @@ import type { FrontendSettings } from '@n8n/api-types';
 import { createPinia, setActivePinia } from 'pinia';
 import { mock } from 'vitest-mock-extended';
 import { useSettingsStore } from './settings.store';
+import { useLocalStorage } from '@vueuse/core';
+import { ref } from 'vue';
 
 const { getSettings } = vi.hoisted(() => ({
 	getSettings: vi.fn(),
@@ -54,6 +56,16 @@ vi.mock('@/stores/versions.store', () => ({
 	})),
 }));
 
+vi.mock('@vueuse/core', async () => {
+	// eslint-disable-next-line @typescript-eslint/consistent-type-imports
+	const originalModule = await vi.importActual<typeof import('@vueuse/core')>('@vueuse/core');
+
+	return {
+		...originalModule,
+		useLocalStorage: vi.fn().mockReturnValue({ value: undefined }),
+	};
+});
+
 const mockSettings = mock<FrontendSettings>({
 	authCookie: { secure: true },
 });
@@ -99,4 +111,54 @@ describe('settings.store', () => {
 			expect(sessionStarted).not.toHaveBeenCalled();
 		});
 	});
+
+	describe('partialExecutionVersion', () => {
+		it.each([
+			{
+				name: 'pick the default',
+				default: 1 as const,
+				enforce: false,
+				userVersion: -1,
+				result: 1,
+			},
+			{
+				name: "pick the user' choice",
+				default: 1 as const,
+				enforce: false,
+				userVersion: 2,
+				result: 2,
+			},
+			{
+				name: 'enforce the default',
+				default: 1 as const,
+				enforce: true,
+				userVersion: 2,
+				result: 1,
+			},
+			{
+				name: 'enforce the default',
+				default: 2 as const,
+				enforce: true,
+				userVersion: 1,
+				result: 2,
+			},
+			{
+				name: 'handle values that used to be allowed in local storage',
+				default: 1 as const,
+				enforce: false,
+				userVersion: 0,
+				result: 1,
+			},
+		])('%name', async ({ default: defaultVersion, userVersion, enforce, result }) => {
+			const settingsStore = useSettingsStore();
+
+			settingsStore.settings.partialExecution = {
+				version: defaultVersion,
+				enforce,
+			};
+			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(userVersion));
+
+			expect(settingsStore.partialExecutionVersion).toBe(result);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index 194e5b3cc4..55165358b9 100644
--- a/packages/editor-ui/src/stores/settings.store.ts
+++ b/packages/editor-ui/src/stores/settings.store.ts
@@ -2,7 +2,6 @@ import { computed, ref } from 'vue';
 import Bowser from 'bowser';
 import type { IUserManagementSettings, FrontendSettings } from '@n8n/api-types';
 
-import * as publicApiApi from '@/api/api-keys';
 import * as eventsApi from '@/api/events';
 import * as ldapApi from '@/api/ldap';
 import * as settingsApi from '@/api/settings';
@@ -20,6 +19,7 @@ import { useVersionsStore } from './versions.store';
 import { makeRestApiRequest } from '@/utils/apiUtils';
 import { useToast } from '@/composables/useToast';
 import { i18n } from '@/plugins/i18n';
+import { useLocalStorage } from '@vueuse/core';
 
 export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 	const initialized = ref(false);
@@ -32,6 +32,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 	});
 	const templatesEndpointHealthy = ref(false);
 	const api = ref({
+		apiKeysPerUserLimit: 0,
 		enabled: false,
 		latestVersion: 0,
 		path: '/',
@@ -98,6 +99,28 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const isCloudDeployment = computed(() => settings.value.deployment?.type === 'cloud');
 
+	const partialExecutionVersion = computed(() => {
+		const defaultVersion = settings.value.partialExecution?.version ?? 1;
+		const enforceVersion = settings.value.partialExecution?.enforce ?? false;
+		// -1 means we pick the defaultVersion
+		//  1 is the old flow
+		//  2 is the new flow
+		const userVersion = useLocalStorage('PartialExecution.version', -1).value;
+		const version = enforceVersion
+			? defaultVersion
+			: userVersion === -1
+				? defaultVersion
+				: userVersion;
+
+		// For backwards compatibility, e.g. if the user has 0 in their local
+		// storage, which used to be allowed, but not anymore.
+		if (![1, 2].includes(version)) {
+			return 1;
+		}
+
+		return version;
+	});
+
 	const isAiCreditsEnabled = computed(() => settings.value.aiCredits?.enabled);
 
 	const aiCreditsQuota = computed(() => settings.value.aiCredits?.credits);
@@ -321,21 +344,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		templatesEndpointHealthy.value = true;
 	};
 
-	const getApiKeys = async () => {
-		const rootStore = useRootStore();
-		return await publicApiApi.getApiKeys(rootStore.restApiContext);
-	};
-
-	const createApiKey = async () => {
-		const rootStore = useRootStore();
-		return await publicApiApi.createApiKey(rootStore.restApiContext);
-	};
-
-	const deleteApiKey = async (id: string) => {
-		const rootStore = useRootStore();
-		await publicApiApi.deleteApiKey(rootStore.restApiContext, id);
-	};
-
 	const getLdapConfig = async () => {
 		const rootStore = useRootStore();
 		return await ldapApi.getLdapConfig(rootStore.restApiContext);
@@ -438,9 +446,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		updateLdapConfig,
 		runLdapSync,
 		getTimezones,
-		createApiKey,
-		getApiKeys,
-		deleteApiKey,
 		testTemplatesEndpoint,
 		submitContactInfo,
 		disableTemplates,
@@ -448,5 +453,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		getSettings,
 		setSettings,
 		initialize,
+		partialExecutionVersion,
 	};
 });
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/editor-ui/src/stores/sourceControl.store.ts
index eee5107570..70cb31fc3c 100644
--- a/packages/editor-ui/src/stores/sourceControl.store.ts
+++ b/packages/editor-ui/src/stores/sourceControl.store.ts
@@ -6,6 +6,7 @@ import { useRootStore } from '@/stores/root.store';
 import * as vcApi from '@/api/sourceControl';
 import type { SourceControlPreferences, SshKeyTypes } from '@/types/sourceControl.types';
 import type { TupleToUnion } from '@/utils/typeHelpers';
+import type { SourceControlledFile } from '@n8n/api-types';
 
 export const useSourceControlStore = defineStore('sourceControl', () => {
 	const rootStore = useRootStore();
@@ -39,23 +40,14 @@ export const useSourceControlStore = defineStore('sourceControl', () => {
 
 	const pushWorkfolder = async (data: {
 		commitMessage: string;
-		fileNames?: Array<{
-			conflict: boolean;
-			file: string;
-			id: string;
-			location: string;
-			name: string;
-			status: string;
-			type: string;
-			updatedAt?: string | undefined;
-		}>;
+		fileNames: SourceControlledFile[];
 		force: boolean;
 	}) => {
 		state.commitMessage = data.commitMessage;
 		await vcApi.pushWorkfolder(rootStore.restApiContext, {
 			force: data.force,
-			message: data.commitMessage,
-			...(data.fileNames ? { fileNames: data.fileNames } : {}),
+			commitMessage: data.commitMessage,
+			fileNames: data.fileNames,
 		});
 	};
 
diff --git a/packages/editor-ui/src/stores/tags.store.ts b/packages/editor-ui/src/stores/tags.store.ts
index fade74a39c..00272d96bd 100644
--- a/packages/editor-ui/src/stores/tags.store.ts
+++ b/packages/editor-ui/src/stores/tags.store.ts
@@ -80,10 +80,9 @@ const createTagsStore = (id: STORES.TAGS | STORES.ANNOTATION_TAGS) => {
 				}
 
 				loading.value = true;
-				const retrievedTags = await tagsApi.getTags(
-					rootStore.restApiContext,
-					Boolean(withUsageCount),
-				);
+				const retrievedTags = await tagsApi.getTags(rootStore.restApiContext, {
+					withUsageCount,
+				});
 				setAllTags(retrievedTags);
 				loading.value = false;
 				return retrievedTags;
diff --git a/packages/editor-ui/src/stores/templates.store.ts b/packages/editor-ui/src/stores/templates.store.ts
index f96202c273..be00083d99 100644
--- a/packages/editor-ui/src/stores/templates.store.ts
+++ b/packages/editor-ui/src/stores/templates.store.ts
@@ -167,6 +167,10 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, () => {
 			`${TEMPLATES_URLS.BASE_WEBSITE_URL}?${websiteTemplateRepositoryParameters.value.toString()}`,
 	);
 
+	const constructTemplateRepositoryURL = (params: URLSearchParams): string => {
+		return `${TEMPLATES_URLS.BASE_WEBSITE_URL}?${params.toString()}`;
+	};
+
 	const addCategories = (_categories: ITemplatesCategory[]): void => {
 		categories.value = _categories;
 	};
@@ -427,6 +431,7 @@ export const useTemplatesStore = defineStore(STORES.TEMPLATES, () => {
 		isSearchFinished,
 		hasCustomTemplatesHost,
 		websiteTemplateRepositoryURL,
+		constructTemplateRepositoryURL,
 		websiteTemplateRepositoryParameters,
 		addCategories,
 		addCollections,
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
index 47f6307d9b..aed705cb91 100644
--- a/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
@@ -2,7 +2,9 @@ import { createPinia, setActivePinia } from 'pinia';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee'; // Adjust the import path as necessary
 import { useRootStore } from '@/stores/root.store';
 import { usePostHog } from '@/stores/posthog.store';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
 import type { TestDefinitionRecord, TestRunRecord } from '@/api/testDefinition.ee';
+import { mockedStore } from '@/__tests__/utils';
 
 const {
 	createTestDefinition,
@@ -101,6 +103,7 @@ describe('testDefinition.store.ee', () => {
 		rootStoreMock = useRootStore();
 		posthogStoreMock = usePostHog();
 
+		mockedStore(useAnnotationTagsStore).fetchAll = vi.fn().mockResolvedValue([]);
 		getTestDefinitions.mockResolvedValue({
 			count: 2,
 			testDefinitions: [TEST_DEF_A, TEST_DEF_B],
@@ -114,6 +117,7 @@ describe('testDefinition.store.ee', () => {
 		getTestRun.mockResolvedValue(TEST_RUN);
 		startTestRun.mockResolvedValue({ success: true });
 		deleteTestRun.mockResolvedValue({ success: true });
+		getTestMetrics.mockResolvedValue([TEST_METRIC]);
 	});
 
 	test('Initialization', () => {
@@ -276,8 +280,6 @@ describe('testDefinition.store.ee', () => {
 
 	describe('Metrics', () => {
 		test('Fetching Metrics for a Test Definition', async () => {
-			getTestMetrics.mockResolvedValue([TEST_METRIC]);
-
 			const metrics = await store.fetchMetrics('1');
 
 			expect(getTestMetrics).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
diff --git a/packages/editor-ui/src/stores/testDefinition.store.ee.ts b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
index 888475ac75..9fa69d007a 100644
--- a/packages/editor-ui/src/stores/testDefinition.store.ee.ts
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
@@ -2,9 +2,17 @@ import { defineStore } from 'pinia';
 import { computed, ref } from 'vue';
 import { useRootStore } from './root.store';
 import * as testDefinitionsApi from '@/api/testDefinition.ee';
-import type { TestDefinitionRecord, TestRunRecord } from '@/api/testDefinition.ee';
+import type {
+	TestCaseExecutionRecord,
+	TestDefinitionRecord,
+	TestRunRecord,
+} from '@/api/testDefinition.ee';
 import { usePostHog } from './posthog.store';
 import { STORES, WORKFLOW_EVALUATION_EXPERIMENT } from '@/constants';
+import { useAnnotationTagsStore } from './tags.store';
+import { useI18n } from '@/composables/useI18n';
+
+type FieldIssue = { field: string; message: string };
 
 export const useTestDefinitionStore = defineStore(
 	STORES.TEST_DEFINITION,
@@ -15,12 +23,15 @@ export const useTestDefinitionStore = defineStore(
 		const fetchedAll = ref(false);
 		const metricsById = ref<Record<string, testDefinitionsApi.TestMetricRecord>>({});
 		const testRunsById = ref<Record<string, TestRunRecord>>({});
+		const testCaseExecutionsById = ref<Record<string, TestCaseExecutionRecord>>({});
 		const pollingTimeouts = ref<Record<string, NodeJS.Timeout>>({});
+		const fieldsIssues = ref<Record<string, FieldIssue[]>>({});
 
 		// Store instances
 		const posthogStore = usePostHog();
 		const rootStore = useRootStore();
-
+		const tagsStore = useAnnotationTagsStore();
+		const locale = useI18n();
 		// Computed
 		const allTestDefinitions = computed(() => {
 			return Object.values(testDefinitionsById.value).sort((a, b) =>
@@ -100,6 +111,8 @@ export const useTestDefinitionStore = defineStore(
 			);
 		});
 
+		const getFieldIssues = (testId: string) => fieldsIssues.value[testId] || [];
+
 		// Methods
 		const setAllTestDefinitions = (definitions: TestDefinitionRecord[]) => {
 			testDefinitionsById.value = definitions.reduce(
@@ -144,16 +157,35 @@ export const useTestDefinitionStore = defineStore(
 			}
 		};
 
+		const fetchMetricsForAllTests = async () => {
+			const testDefinitions = Object.values(testDefinitionsById.value);
+			await Promise.all(testDefinitions.map(async (testDef) => await fetchMetrics(testDef.id)));
+		};
+
 		const fetchTestDefinition = async (id: string) => {
 			const testDefinition = await testDefinitionsApi.getTestDefinition(
 				rootStore.restApiContext,
 				id,
 			);
 			testDefinitionsById.value[testDefinition.id] = testDefinition;
-
+			updateRunFieldIssues(id);
 			return testDefinition;
 		};
 
+		const fetchTestCaseExecutions = async (params: { testDefinitionId: string; runId: string }) => {
+			const testCaseExecutions = await testDefinitionsApi.getTestCaseExecutions(
+				rootStore.restApiContext,
+				params.testDefinitionId,
+				params.runId,
+			);
+
+			testCaseExecutions.forEach((testCaseExecution) => {
+				testCaseExecutionsById.value[testCaseExecution.id] = testCaseExecution;
+			});
+
+			return testCaseExecutions;
+		};
+
 		/**
 		 * Fetches all test definitions from the API.
 		 * @param {boolean} force - If true, fetches the definitions from the API even if they were already fetched before.
@@ -178,7 +210,11 @@ export const useTestDefinitionStore = defineStore(
 				setAllTestDefinitions(retrievedDefinitions.testDefinitions);
 				fetchedAll.value = true;
 
-				await fetchRunsForAllTests();
+				await Promise.all([
+					tagsStore.fetchAll({ withUsageCount: true }),
+					fetchRunsForAllTests(),
+					fetchMetricsForAllTests(),
+				]);
 				return retrievedDefinitions;
 			} finally {
 				loading.value = false;
@@ -203,6 +239,7 @@ export const useTestDefinitionStore = defineStore(
 				params,
 			);
 			upsertTestDefinitions([createdDefinition]);
+			updateRunFieldIssues(createdDefinition.id);
 			return createdDefinition;
 		};
 
@@ -216,6 +253,7 @@ export const useTestDefinitionStore = defineStore(
 				updateParams,
 			);
 			upsertTestDefinitions([updatedDefinition]);
+			updateRunFieldIssues(params.id);
 			return updatedDefinition;
 		};
 
@@ -240,9 +278,9 @@ export const useTestDefinitionStore = defineStore(
 			try {
 				const metrics = await testDefinitionsApi.getTestMetrics(rootStore.restApiContext, testId);
 				metrics.forEach((metric) => {
-					metricsById.value[metric.id] = metric;
+					metricsById.value[metric.id] = { ...metric, testDefinitionId: testId };
 				});
-				return metrics;
+				return metrics.map((metric) => ({ ...metric, testDefinitionId: testId }));
 			} finally {
 				loading.value = false;
 			}
@@ -253,7 +291,7 @@ export const useTestDefinitionStore = defineStore(
 			testDefinitionId: string;
 		}): Promise<testDefinitionsApi.TestMetricRecord> => {
 			const metric = await testDefinitionsApi.createTestMetric(rootStore.restApiContext, params);
-			metricsById.value[metric.id] = metric;
+			metricsById.value[metric.id] = { ...metric, testDefinitionId: params.testDefinitionId };
 			return metric;
 		};
 
@@ -261,7 +299,9 @@ export const useTestDefinitionStore = defineStore(
 			params: testDefinitionsApi.TestMetricRecord,
 		): Promise<testDefinitionsApi.TestMetricRecord> => {
 			const metric = await testDefinitionsApi.updateTestMetric(rootStore.restApiContext, params);
-			metricsById.value[metric.id] = metric;
+			metricsById.value[metric.id] = { ...metric, testDefinitionId: params.testDefinitionId };
+
+			updateRunFieldIssues(params.testDefinitionId);
 			return metric;
 		};
 
@@ -271,6 +311,8 @@ export const useTestDefinitionStore = defineStore(
 			await testDefinitionsApi.deleteTestMetric(rootStore.restApiContext, params);
 			const { [params.id]: deleted, ...rest } = metricsById.value;
 			metricsById.value = rest;
+
+			updateRunFieldIssues(params.testDefinitionId);
 		};
 
 		// Test Runs Methods
@@ -296,6 +338,7 @@ export const useTestDefinitionStore = defineStore(
 		const getTestRun = async (params: { testDefinitionId: string; runId: string }) => {
 			const run = await testDefinitionsApi.getTestRun(rootStore.restApiContext, params);
 			testRunsById.value[run.id] = run;
+			updateRunFieldIssues(params.testDefinitionId);
 			return run;
 		};
 
@@ -307,6 +350,15 @@ export const useTestDefinitionStore = defineStore(
 			return result;
 		};
 
+		const cancelTestRun = async (testDefinitionId: string, testRunId: string) => {
+			const result = await testDefinitionsApi.cancelTestRun(
+				rootStore.restApiContext,
+				testDefinitionId,
+				testRunId,
+			);
+			return result;
+		};
+
 		const deleteTestRun = async (params: { testDefinitionId: string; runId: string }) => {
 			const result = await testDefinitionsApi.deleteTestRun(rootStore.restApiContext, params);
 			if (result.success) {
@@ -337,11 +389,58 @@ export const useTestDefinitionStore = defineStore(
 			pollingTimeouts.value = {};
 		};
 
+		const updateRunFieldIssues = (testId: string) => {
+			const issues: FieldIssue[] = [];
+			const testDefinition = testDefinitionsById.value[testId];
+
+			if (!testDefinition) {
+				return;
+			}
+
+			if (!testDefinition.annotationTagId) {
+				issues.push({
+					field: 'tags',
+					message: locale.baseText('testDefinition.configError.noEvaluationTag'),
+				});
+			} else {
+				const tagUsageCount = tagsStore.tagsById[testDefinition.annotationTagId]?.usageCount ?? 0;
+
+				if (tagUsageCount === 0) {
+					issues.push({
+						field: 'tags',
+						message: locale.baseText('testDefinition.configError.noExecutionsAddedToTag'),
+					});
+				}
+			}
+
+			if (!testDefinition.evaluationWorkflowId) {
+				issues.push({
+					field: 'evaluationWorkflow',
+					message: locale.baseText('testDefinition.configError.noEvaluationWorkflow'),
+				});
+			}
+
+			const metrics = metricsByTestId.value[testId] || [];
+			if (metrics.filter((metric) => metric.name).length === 0) {
+				issues.push({
+					field: 'metrics',
+					message: locale.baseText('testDefinition.configError.noMetrics'),
+				});
+			}
+
+			fieldsIssues.value = {
+				...fieldsIssues.value,
+				[testId]: issues,
+			};
+			return issues;
+		};
+
 		return {
 			// State
 			fetchedAll,
 			testDefinitionsById,
 			testRunsById,
+			testCaseExecutionsById,
 
 			// Computed
 			allTestDefinitions,
@@ -356,6 +455,7 @@ export const useTestDefinitionStore = defineStore(
 
 			// Methods
 			fetchTestDefinition,
+			fetchTestCaseExecutions,
 			fetchAll,
 			create,
 			update,
@@ -369,8 +469,11 @@ export const useTestDefinitionStore = defineStore(
 			fetchTestRuns,
 			getTestRun,
 			startTestRun,
+			cancelTestRun,
 			deleteTestRun,
 			cleanupPolling,
+			getFieldIssues,
+			updateRunFieldIssues,
 		};
 	},
 	{},
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index dfab03f8f3..80d72a4bc1 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -36,6 +36,7 @@ import {
 	NEW_ASSISTANT_SESSION_MODAL,
 	PROMPT_MFA_CODE_MODAL_KEY,
 	COMMUNITY_PLUS_ENROLLMENT_MODAL,
+	API_KEY_CREATE_OR_EDIT_MODAL_KEY,
 } from '@/constants';
 import type {
 	INodeUi,
@@ -50,7 +51,6 @@ import type {
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import { useRootStore } from '@/stores/root.store';
-import * as curlParserApi from '@/api/curlHelper';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
@@ -65,6 +65,7 @@ import {
 } from './ui.utils';
 import { computed, ref } from 'vue';
 import type { Connection } from '@vue-flow/core';
+import { useLocalStorage } from '@vueuse/core';
 
 let savedTheme: ThemeOption = 'system';
 
@@ -142,6 +143,13 @@ export const useUIStore = defineStore(STORES.UI, () => {
 			open: false,
 			data: undefined,
 		},
+		[API_KEY_CREATE_OR_EDIT_MODAL_KEY]: {
+			open: false,
+			data: {
+				activeId: null,
+				mode: '',
+			},
+		},
 		[CREDENTIAL_EDIT_MODAL_KEY]: {
 			open: false,
 			mode: '',
@@ -151,7 +159,8 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	});
 
 	const modalStack = ref<string[]>([]);
-	const sidebarMenuCollapsed = ref<boolean>(true);
+	const sidebarMenuCollapsedPreference = useLocalStorage<boolean>('sidebar.collapsed', false);
+	const sidebarMenuCollapsed = ref<boolean>(sidebarMenuCollapsedPreference.value);
 	const currentView = ref<string>('');
 	const draggable = ref<Draggable>({
 		isDragging: false,
@@ -173,6 +182,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	const bannersHeight = ref<number>(0);
 	const bannerStack = ref<BannerName[]>([]);
 	const pendingNotificationsForViews = ref<{ [key in VIEWS]?: NotificationOptions[] }>({});
+	const processingExecutionResults = ref<boolean>(false);
 
 	const appGridWidth = ref<number>(0);
 
@@ -327,6 +337,12 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		return modalStack.value.length > 0;
 	});
 
+	/**
+	 * Whether we are currently in the process of fetching and deserializing
+	 * the full execution data and loading it to the store.
+	 */
+	const isProcessingExecutionResults = computed(() => processingExecutionResults.value);
+
 	// Methods
 
 	const setTheme = (newTheme: ThemeOption): void => {
@@ -502,20 +518,9 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	};
 
 	const toggleSidebarMenuCollapse = () => {
-		sidebarMenuCollapsed.value = !sidebarMenuCollapsed.value;
-	};
-
-	const getCurlToJson = async (curlCommand: string) => {
-		const parameters = await curlParserApi.getCurlToJson(rootStore.restApiContext, curlCommand);
-
-		// Normalize placeholder values
-		if (parameters['parameters.url']) {
-			parameters['parameters.url'] = parameters['parameters.url']
-				.replaceAll('%7B', '{')
-				.replaceAll('%7D', '}');
-		}
-
-		return parameters;
+		const newCollapsedState = !sidebarMenuCollapsed.value;
+		sidebarMenuCollapsedPreference.value = newCollapsedState;
+		sidebarMenuCollapsed.value = newCollapsedState;
 	};
 
 	const removeBannerFromStack = (name: BannerName) => {
@@ -562,6 +567,14 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		lastCancelledConnectionPosition.value = undefined;
 	}
 
+	/**
+	 * Set whether we are currently in the process of fetching and deserializing
+	 * the full execution data and loading it to the store.
+	 */
+	const setProcessingExecutionResults = (value: boolean) => {
+		processingExecutionResults.value = value;
+	};
+
 	return {
 		appGridWidth,
 		appliedTheme,
@@ -592,6 +605,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		nodeViewInitialized,
 		addFirstStepOnLoad,
 		sidebarMenuCollapsed,
+		sidebarMenuCollapsedPreference,
 		bannerStack,
 		theme,
 		modalsById,
@@ -599,6 +613,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		isAnyModalOpen,
 		pendingNotificationsForViews,
 		activeModals,
+		isProcessingExecutionResults,
 		setTheme,
 		setMode,
 		setActiveId,
@@ -624,7 +639,6 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		resetSelectedNodes,
 		setCurlCommand,
 		toggleSidebarMenuCollapse,
-		getCurlToJson,
 		removeBannerFromStack,
 		dismissBanner,
 		updateBannersHeight,
@@ -633,6 +647,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		setNotificationsForView,
 		deleteNotificationsForView,
 		resetLastInteractedWith,
+		setProcessingExecutionResults,
 	};
 });
 
diff --git a/packages/editor-ui/src/stores/usage.store.ts b/packages/editor-ui/src/stores/usage.store.ts
index bc62d1df8b..003939617f 100644
--- a/packages/editor-ui/src/stores/usage.store.ts
+++ b/packages/editor-ui/src/stores/usage.store.ts
@@ -35,7 +35,7 @@ export const useUsageStore = defineStore('usage', () => {
 	const rootStore = useRootStore();
 	const settingsStore = useSettingsStore();
 
-	const state = reactive<UsageState>(DEFAULT_STATE);
+	const state = reactive<UsageState>({ ...DEFAULT_STATE });
 
 	const planName = computed(() => state.data.license.planName || DEFAULT_PLAN_NAME);
 	const planId = computed(() => state.data.license.planId);
diff --git a/packages/editor-ui/src/stores/workflows.store.test.ts b/packages/editor-ui/src/stores/workflows.store.test.ts
index a612be7441..d60cd8f127 100644
--- a/packages/editor-ui/src/stores/workflows.store.test.ts
+++ b/packages/editor-ui/src/stores/workflows.store.test.ts
@@ -16,10 +16,15 @@ import type { IPinData, ExecutionSummary, IConnection, INodeExecutionData } from
 import { stringSizeInBytes } from '@/utils/typesUtils';
 import { dataPinningEventBus } from '@/event-bus';
 import { useUIStore } from '@/stores/ui.store';
-import type { PushPayload } from '@n8n/api-types';
+import type { PushPayload, FrontendSettings } from '@n8n/api-types';
 import { flushPromises } from '@vue/test-utils';
 import { useNDVStore } from '@/stores/ndv.store';
 import { mock } from 'vitest-mock-extended';
+import { mockedStore, type MockedStore } from '@/__tests__/utils';
+import * as apiUtils from '@/utils/apiUtils';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useLocalStorage } from '@vueuse/core';
+import { ref } from 'vue';
 
 vi.mock('@/stores/ndv.store', () => ({
 	useNDVStore: vi.fn(() => ({
@@ -45,14 +50,24 @@ vi.mock('@/composables/useTelemetry', () => ({
 	useTelemetry: () => ({ track }),
 }));
 
+vi.mock('@vueuse/core', async (importOriginal) => {
+	const actual = await importOriginal<{}>();
+	return {
+		...actual,
+		useLocalStorage: vi.fn().mockReturnValue({ value: undefined }),
+	};
+});
+
 describe('useWorkflowsStore', () => {
 	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
 	let uiStore: ReturnType<typeof useUIStore>;
+	let settingsStore: MockedStore<typeof useSettingsStore>;
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
 		workflowsStore = useWorkflowsStore();
 		uiStore = useUIStore();
+		settingsStore = mockedStore(useSettingsStore);
 		track.mockReset();
 	});
 
@@ -662,6 +677,50 @@ describe('useWorkflowsStore', () => {
 			expect(workflowsStore.nodeMetadata[nodeName].parametersLastUpdatedAt).toBe(undefined);
 		});
 	});
+
+	test.each([
+		// enforce true cases - the version is always the defaultVersion
+		[-1, 1, true, 1], // enforce true, use default (1)
+		[0, 1, true, 1], // enforce true, use default (1)
+		[1, 1, true, 1], // enforce true, use default (1)
+		[2, 1, true, 1], // enforce true, use default (1)
+		[-1, 2, true, 2], // enforce true, use default (2)
+		[0, 2, true, 2], // enforce true, use default (2)
+		[1, 2, true, 2], // enforce true, use default (2)
+		[2, 2, true, 2], // enforce true, use default (2)
+
+		// enforce false cases - check userVersion behavior
+		[-1, 1, false, 1], // userVersion -1, use default (1)
+		[0, 1, false, 1], // userVersion 0, invalid, use default (1)
+		[1, 1, false, 1], // userVersion 1, valid, use userVersion (1)
+		[2, 1, false, 2], // userVersion 2, valid, use userVersion (2)
+		[-1, 2, false, 2], // userVersion -1, use default (2)
+		[0, 2, false, 1], // userVersion 0, invalid, use default (2)
+		[1, 2, false, 1], // userVersion 1, valid, use userVersion (1)
+		[2, 2, false, 2], // userVersion 2, valid, use userVersion (2)
+	] as Array<[number, 1 | 2, boolean, number]>)(
+		'when { userVersion:%s, defaultVersion:%s, enforced:%s } run workflow should use partial execution version %s',
+		async (userVersion, defaultVersion, enforce, expectedVersion) => {
+			vi.mocked(useLocalStorage).mockReturnValueOnce(ref(userVersion));
+			settingsStore.settings = {
+				partialExecution: { version: defaultVersion, enforce },
+			} as FrontendSettings;
+
+			const workflowData = { id: '1', nodes: [], connections: {} };
+			const makeRestApiRequestSpy = vi
+				.spyOn(apiUtils, 'makeRestApiRequest')
+				.mockImplementation(async () => ({}));
+
+			await workflowsStore.runWorkflow({ workflowData });
+
+			expect(makeRestApiRequestSpy).toHaveBeenCalledWith(
+				{ baseUrl: '/rest', pushRef: expect.any(String) },
+				'POST',
+				`/workflows/1/run?partialExecutionVersion=${expectedVersion}`,
+				{ workflowData },
+			);
+		},
+	);
 });
 
 function getMockEditFieldsNode() {
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 7e4cb6d95e..6e0f2eecd1 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -79,7 +79,6 @@ import { computed, ref } from 'vue';
 import { useProjectsStore } from '@/stores/projects.store';
 import type { ProjectSharingData } from '@/types/projects.types';
 import type { PushPayload } from '@n8n/api-types';
-import { useLocalStorage } from '@vueuse/core';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { TelemetryHelpers } from 'n8n-workflow';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
@@ -89,6 +88,7 @@ import { clearPopupWindowState, openFormPopupWindow } from '@/utils/executionUti
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useUsersStore } from '@/stores/users.store';
 import { updateCurrentUserSettings } from '@/api/users';
+import { useExecutingNode } from '@/composables/useExecutingNode';
 
 const defaults: Omit<IWorkflowDb, 'id'> & { settings: NonNullable<IWorkflowDb['settings']> } = {
 	name: '',
@@ -124,11 +124,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const nodeHelpers = useNodeHelpers();
 	const usersStore = useUsersStore();
 
-	// -1 means the backend chooses the default
-	// 0 is the old flow
-	// 1 is the new flow
-	const partialExecutionVersion = useLocalStorage('PartialExecution.version', -1);
-
+	const version = computed(() => settingsStore.partialExecutionVersion);
 	const workflow = ref<IWorkflowDb>(createEmptyWorkflow());
 	const usedCredentials = ref<Record<string, IUsedCredential>>({});
 
@@ -140,14 +136,17 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const activeExecutionId = ref<string | null>(null);
 	const subWorkflowExecutionError = ref<Error | null>(null);
 	const executionWaitingForWebhook = ref(false);
-	const executingNode = ref<string[]>([]);
 	const workflowsById = ref<Record<string, IWorkflowDb>>({});
 	const nodeMetadata = ref<NodeMetadataMap>({});
 	const isInDebugMode = ref(false);
 	const chatMessages = ref<string[]>([]);
+	const chatPartialExecutionDestinationNode = ref<string | null>(null);
 	const isChatPanelOpen = ref(false);
 	const isLogsPanelOpen = ref(false);
 
+	const { executingNode, addExecutingNode, removeExecutingNode, clearNodeExecutionQueue } =
+		useExecutingNode();
+
 	const workflowName = computed(() => workflow.value.name);
 
 	const workflowId = computed(() => workflow.value.id);
@@ -551,14 +550,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		executionWaitingForWebhook.value = false;
 	}
 
-	function addExecutingNode(nodeName: string) {
-		executingNode.value.push(nodeName);
-	}
-
-	function removeExecutingNode(nodeName: string) {
-		executingNode.value = executingNode.value.filter((name) => name !== nodeName);
-	}
-
 	function setWorkflowId(id?: string) {
 		workflow.value.id = !id || id === 'new' ? PLACEHOLDER_EMPTY_WORKFLOW_ID : id;
 	}
@@ -1478,7 +1469,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			return await makeRestApiRequest(
 				rootStore.restApiContext,
 				'POST',
-				`/workflows/${startRunData.workflowData.id}/run?partialExecutionVersion=${partialExecutionVersion.value}`,
+				`/workflows/${startRunData.workflowData.id}/run?partialExecutionVersion=${version.value}`,
 				startRunData as unknown as IDataObject,
 			);
 		} catch (error) {
@@ -1603,7 +1594,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	function markExecutionAsStopped() {
 		activeExecutionId.value = null;
-		executingNode.value.length = 0;
+		clearNodeExecutionQueue();
 		executionWaitingForWebhook.value = false;
 		uiStore.removeActiveAction('workflowRunning');
 		workflowHelpers.setDocumentTitle(workflowName.value, 'IDLE');
@@ -1634,6 +1625,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		nodeMetadata,
 		isInDebugMode,
 		chatMessages,
+		chatPartialExecutionDestinationNode,
 		workflowName,
 		workflowId,
 		workflowVersionId,
diff --git a/packages/editor-ui/src/styles/_global.scss b/packages/editor-ui/src/styles/_global.scss
new file mode 100644
index 0000000000..233a458c96
--- /dev/null
+++ b/packages/editor-ui/src/styles/_global.scss
@@ -0,0 +1,3 @@
+:root {
+	--navbar--height: 64px;
+}
diff --git a/packages/editor-ui/src/styles/index.scss b/packages/editor-ui/src/styles/index.scss
index 65126a8b4d..057d4cdc6e 100644
--- a/packages/editor-ui/src/styles/index.scss
+++ b/packages/editor-ui/src/styles/index.scss
@@ -1,3 +1,4 @@
 @import 'variables';
 @import 'plugins';
+@import 'global';
 @import 'animations';
diff --git a/packages/editor-ui/src/types/assistant.types.ts b/packages/editor-ui/src/types/assistant.types.ts
index 3f1c4c7aae..b1c989ae6f 100644
--- a/packages/editor-ui/src/types/assistant.types.ts
+++ b/packages/editor-ui/src/types/assistant.types.ts
@@ -58,7 +58,7 @@ export namespace ChatRequest {
 		user: {
 			firstName: string;
 		};
-		context?: UserContext;
+		context?: UserContext & WorkflowContext;
 		workflowContext?: WorkflowContext;
 		question: string;
 	}
diff --git a/packages/editor-ui/src/types/projects.types.ts b/packages/editor-ui/src/types/projects.types.ts
index 0ef0b67f90..0006ac4d48 100644
--- a/packages/editor-ui/src/types/projects.types.ts
+++ b/packages/editor-ui/src/types/projects.types.ts
@@ -31,10 +31,6 @@ export type ProjectListItem = ProjectSharingData & {
 	role: ProjectRole;
 	scopes?: Scope[];
 };
-export type ProjectCreateRequest = { name: string; icon: ProjectIcon };
-export type ProjectUpdateRequest = Pick<Project, 'id' | 'name' | 'icon'> & {
-	relations: ProjectRelationPayload[];
-};
 export type ProjectsCount = Record<ProjectType, number>;
 
 export type ProjectIcon = {
diff --git a/packages/editor-ui/src/types/sourceControl.types.ts b/packages/editor-ui/src/types/sourceControl.types.ts
index bd8f6159b3..1b412ed843 100644
--- a/packages/editor-ui/src/types/sourceControl.types.ts
+++ b/packages/editor-ui/src/types/sourceControl.types.ts
@@ -1,37 +1,5 @@
 import type { TupleToUnion } from '@/utils/typeHelpers';
 
-export const SOURCE_CONTROL_FILE_STATUS = {
-	NEW: 'new',
-	MODIFIED: 'modified',
-	DELETED: 'deleted',
-	CREATED: 'created',
-	RENAMED: 'renamed',
-	CONFLICTED: 'conflicted',
-	IGNORED: 'ignored',
-	STAGED: 'staged',
-	UNKNOWN: 'unknown',
-} as const;
-
-export const SOURCE_CONTROL_FILE_LOCATION = {
-	LOCAL: 'local',
-	REMOTE: 'remote',
-} as const;
-
-export const SOURCE_CONTROL_FILE_TYPE = {
-	CREDENTIAL: 'credential',
-	WORKFLOW: 'workflow',
-	TAGS: 'tags',
-	VARIABLES: 'variables',
-	FILE: 'file',
-} as const;
-
-export type SourceControlledFileStatus =
-	(typeof SOURCE_CONTROL_FILE_STATUS)[keyof typeof SOURCE_CONTROL_FILE_STATUS];
-export type SourceControlledFileLocation =
-	(typeof SOURCE_CONTROL_FILE_LOCATION)[keyof typeof SOURCE_CONTROL_FILE_LOCATION];
-export type SourceControlledFileType =
-	(typeof SOURCE_CONTROL_FILE_TYPE)[keyof typeof SOURCE_CONTROL_FILE_TYPE];
-
 export type SshKeyTypes = ['ed25519', 'rsa'];
 
 export type SourceControlPreferences = {
@@ -65,14 +33,3 @@ export interface SourceControlStatus {
 	staged: string[];
 	tracking: null;
 }
-
-export interface SourceControlAggregatedFile {
-	conflict: boolean;
-	file: string;
-	id: string;
-	location: SourceControlledFileLocation;
-	name: string;
-	status: SourceControlledFileStatus;
-	type: SourceControlledFileType;
-	updatedAt?: string;
-}
diff --git a/packages/editor-ui/src/utils/apiUtils.test.ts b/packages/editor-ui/src/utils/apiUtils.test.ts
index f6be9036b2..43b361eee9 100644
--- a/packages/editor-ui/src/utils/apiUtils.test.ts
+++ b/packages/editor-ui/src/utils/apiUtils.test.ts
@@ -1,4 +1,4 @@
-import { STREAM_SEPERATOR, streamRequest } from './apiUtils';
+import { ResponseError, STREAM_SEPERATOR, streamRequest } from './apiUtils';
 
 describe('streamRequest', () => {
 	it('should stream data from the API endpoint', async () => {
@@ -54,6 +54,54 @@ describe('streamRequest', () => {
 		expect(onErrorMock).not.toHaveBeenCalled();
 	});
 
+	it('should stream error response from the API endpoint', async () => {
+		const testError = { code: 500, message: 'Error happened' };
+		const encoder = new TextEncoder();
+		const mockResponse = new ReadableStream({
+			start(controller) {
+				controller.enqueue(encoder.encode(JSON.stringify(testError)));
+				controller.close();
+			},
+		});
+
+		const mockFetch = vi.fn().mockResolvedValue({
+			ok: false,
+			body: mockResponse,
+		});
+
+		global.fetch = mockFetch;
+
+		const onChunkMock = vi.fn();
+		const onDoneMock = vi.fn();
+		const onErrorMock = vi.fn();
+
+		await streamRequest(
+			{
+				baseUrl: 'https://api.example.com',
+				pushRef: '',
+			},
+			'/data',
+			{ key: 'value' },
+			onChunkMock,
+			onDoneMock,
+			onErrorMock,
+		);
+
+		expect(mockFetch).toHaveBeenCalledWith('https://api.example.com/data', {
+			method: 'POST',
+			body: JSON.stringify({ key: 'value' }),
+			credentials: 'include',
+			headers: {
+				'Content-Type': 'application/json',
+				'browser-id': expect.stringContaining('-'),
+			},
+		});
+
+		expect(onChunkMock).not.toHaveBeenCalled();
+		expect(onErrorMock).toHaveBeenCalledTimes(1);
+		expect(onErrorMock).toHaveBeenCalledWith(new ResponseError(testError.message));
+	});
+
 	it('should handle broken stream data', async () => {
 		const encoder = new TextEncoder();
 		const mockResponse = new ReadableStream({
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index e86dcadf26..97596fe578 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -198,7 +198,7 @@ export function unflattenExecutionData(fullExecutionData: IExecutionFlattedRespo
 	return returnData;
 }
 
-export async function streamRequest<T>(
+export async function streamRequest<T extends object>(
 	context: IRestApiContext,
 	apiEndpoint: string,
 	payload: object,
@@ -220,7 +220,7 @@ export async function streamRequest<T>(
 	try {
 		const response = await fetch(`${context.baseUrl}${apiEndpoint}`, assistantRequest);
 
-		if (response.ok && response.body) {
+		if (response.body) {
 			// Handle the streaming response
 			const reader = response.body.getReader();
 			const decoder = new TextDecoder('utf-8');
@@ -252,7 +252,18 @@ export async function streamRequest<T>(
 						}
 
 						try {
-							onChunk?.(data);
+							if (response.ok) {
+								// Call chunk callback if request was successful
+								onChunk?.(data);
+							} else {
+								// Otherwise, call error callback
+								const message = 'message' in data ? data.message : response.statusText;
+								onError?.(
+									new ResponseError(String(message), {
+										httpStatusCode: response.status,
+									}),
+								);
+							}
 						} catch (e: unknown) {
 							if (e instanceof Error) {
 								onError?.(e);
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts b/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
index 3d9fad7809..cd91b915fa 100644
--- a/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
+++ b/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
@@ -75,7 +75,7 @@ export const getEasyAiWorkflowJson = ({
 				parameters: {
 					options: {
 						systemMessage:
-							"=You're a helpful assistant that the user to answer questions about their calendar.\n\nToday is {{ $now.format('cccc') }} the {{ $now.format('yyyy-MM-dd HH:mm') }}.",
+							"=You're a helpful assistant that helps the user answer questions about their calendar.\n\nToday is {{ $now.format('cccc') }} the {{ $now.format('yyyy-MM-dd HH:mm') }}.",
 					},
 				},
 			},
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/editor-ui/src/utils/executionUtils.ts
index a6fc615aed..11457e89e4 100644
--- a/packages/editor-ui/src/utils/executionUtils.ts
+++ b/packages/editor-ui/src/utils/executionUtils.ts
@@ -1,10 +1,11 @@
-import {
-	SEND_AND_WAIT_OPERATION,
-	type ExecutionStatus,
-	type IDataObject,
-	type INode,
-	type IPinData,
-	type IRunData,
+import { SEND_AND_WAIT_OPERATION, TRIMMED_TASK_DATA_CONNECTIONS_KEY } from 'n8n-workflow';
+import type {
+	ITaskData,
+	ExecutionStatus,
+	IDataObject,
+	INode,
+	IPinData,
+	IRunData,
 } from 'n8n-workflow';
 import type { ExecutionFilterType, ExecutionsQueryFilter, INodeUi } from '@/Interface';
 import { isEmpty } from '@/utils/typesUtils';
@@ -180,3 +181,25 @@ export const waitingNodeTooltip = (node: INodeUi | null | undefined) => {
 
 	return '';
 };
+
+/**
+ * Check whether task data contains a trimmed item.
+ *
+ * In manual executions in scaling mode, the payload in push messages may be
+ * arbitrarily large. To protect Redis as it relays run data from workers to
+ * main process, we set a limit on payload size. If the payload is oversize,
+ * we replace it with a placeholder, which is later overridden on execution
+ * finish, when the client receives the full data.
+ */
+export function hasTrimmedItem(taskData: ITaskData[]) {
+	return taskData[0]?.data?.main?.[0]?.[0]?.json?.[TRIMMED_TASK_DATA_CONNECTIONS_KEY] ?? false;
+}
+
+/**
+ * Check whether run data contains any trimmed items.
+ *
+ * See {@link hasTrimmedItem} for more details.
+ */
+export function hasTrimmedData(runData: IRunData) {
+	return Object.keys(runData).some((nodeName) => hasTrimmedItem(runData[nodeName]));
+}
diff --git a/packages/editor-ui/src/utils/forceParse.ts b/packages/editor-ui/src/utils/forceParse.ts
index d6cd800405..40494508f4 100644
--- a/packages/editor-ui/src/utils/forceParse.ts
+++ b/packages/editor-ui/src/utils/forceParse.ts
@@ -1,14 +1,19 @@
+import { Annotation } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 
+export const ignoreUpdateAnnotation = Annotation.define<boolean>();
+
 /**
  * Simulate user action to force parser to catch up during scroll.
  */
 export function forceParse(view: EditorView) {
 	view.dispatch({
 		changes: { from: view.viewport.to, insert: '_' },
+		annotations: [ignoreUpdateAnnotation.of(true)],
 	});
 
 	view.dispatch({
 		changes: { from: view.viewport.to - 1, to: view.viewport.to, insert: '' },
+		annotations: [ignoreUpdateAnnotation.of(true)],
 	});
 }
diff --git a/packages/editor-ui/src/utils/fromAIOverrideUtils.test.ts b/packages/editor-ui/src/utils/fromAIOverrideUtils.test.ts
new file mode 100644
index 0000000000..bf1c979f03
--- /dev/null
+++ b/packages/editor-ui/src/utils/fromAIOverrideUtils.test.ts
@@ -0,0 +1,180 @@
+import type { FromAIOverride, OverrideContext } from './fromAIOverrideUtils';
+import {
+	buildValueFromOverride,
+	fromAIExtraProps,
+	isFromAIOverrideValue,
+	makeOverrideValue,
+	parseOverrides,
+} from './fromAIOverrideUtils';
+import type { INodeTypeDescription } from 'n8n-workflow';
+
+const DISPLAY_NAME = 'aDisplayName';
+const PARAMETER_NAME = 'aName';
+
+const makeContext = (value: string, path?: string): OverrideContext => ({
+	parameter: {
+		name: PARAMETER_NAME,
+		displayName: DISPLAY_NAME,
+		type: 'string',
+	},
+	value,
+	path: path ?? `parameters.${PARAMETER_NAME}`,
+});
+
+const MOCK_NODE_TYPE_MIXIN = {
+	version: 0,
+	defaults: {},
+	inputs: [],
+	outputs: [],
+	properties: [],
+	displayName: '',
+	group: [],
+	description: '',
+};
+
+const AI_NODE_TYPE: INodeTypeDescription = {
+	name: 'AN_AI_NODE_TYPE',
+	codex: {
+		categories: ['AI'],
+		subcategories: {
+			AI: ['Tools'],
+		},
+	},
+	...MOCK_NODE_TYPE_MIXIN,
+};
+
+const AI_DENYLIST_NODE_TYPE: INodeTypeDescription = {
+	name: 'toolCode',
+	codex: {
+		categories: ['AI'],
+		subcategories: {
+			AI: ['Tools'],
+		},
+	},
+	...MOCK_NODE_TYPE_MIXIN,
+};
+
+const AI_VECTOR_STORE_NODE_TYPE: INodeTypeDescription = {
+	name: 'aVectorStore',
+	codex: {
+		categories: ['AI'],
+		subcategories: {
+			AI: ['Tools', 'Vector Stores'],
+		},
+	},
+	...MOCK_NODE_TYPE_MIXIN,
+};
+
+const NON_AI_NODE_TYPE: INodeTypeDescription = {
+	name: 'AN_NOT_AI_NODE_TYPE',
+	...MOCK_NODE_TYPE_MIXIN,
+};
+
+describe('makeOverrideValue', () => {
+	test.each<[string, ...Parameters<typeof makeOverrideValue>]>([
+		['null nodeType', makeContext(''), null],
+		['non-ai node type', makeContext(''), NON_AI_NODE_TYPE],
+		['ai node type on denylist', makeContext(''), AI_DENYLIST_NODE_TYPE],
+		['vector store type', makeContext(''), AI_VECTOR_STORE_NODE_TYPE],
+		['denied parameter name', makeContext('', 'parameters.toolName'), AI_NODE_TYPE],
+	])('should not create an override for %s', (_name, context, nodeType) => {
+		expect(makeOverrideValue(context, nodeType)).toBeNull();
+	});
+
+	it('should create an fromAI override', () => {
+		const result = makeOverrideValue(
+			makeContext(`={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('${DISPLAY_NAME}') }}`),
+			AI_NODE_TYPE,
+		);
+
+		expect(result).not.toBeNull();
+		expect(result?.type).toEqual('fromAI');
+	});
+
+	it('parses existing fromAI overrides', () => {
+		const description = 'a description';
+		const result = makeOverrideValue(
+			makeContext(
+				`={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('${DISPLAY_NAME}', \`${description}\`) }}`,
+			),
+			AI_NODE_TYPE,
+		);
+
+		expect(result).toBeDefined();
+		expect(result?.extraPropValues.description).toEqual(description);
+	});
+
+	it('parses an existing fromAI override with default values without adding extraPropValue entry', () => {
+		const result = makeOverrideValue(
+			makeContext("={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('aName', ``) }}"),
+			AI_NODE_TYPE,
+		);
+
+		expect(result).toBeDefined();
+		expect(result?.extraPropValues.description).not.toBeDefined();
+	});
+});
+
+describe('FromAiOverride', () => {
+	it('correctly identifies override values', () => {
+		expect(isFromAIOverrideValue('={{ $fromAI() }}')).toBe(false);
+		expect(isFromAIOverrideValue('={{ /*n8n-auto-generated-fromAI-override*/ $fromAI() }}')).toBe(
+			true,
+		);
+	});
+
+	it('should parseOverrides as expected', () => {
+		expect(parseOverrides("={{ $fromAI('aKey' }}")).toBeNull();
+		expect(parseOverrides("={{ $fromAI('aKey') }}")).toEqual({
+			description: undefined,
+		});
+		expect(parseOverrides("={{ $fromAI('aKey', `a description`) }}")).toEqual({
+			description: 'a description',
+		});
+		expect(parseOverrides("={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('aKey') }}")).toEqual(
+			{ description: undefined },
+		);
+		expect(
+			parseOverrides(
+				"={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('aKey', `a description`) }}",
+			),
+		).toEqual({
+			description: 'a description',
+		});
+	});
+
+	test.each<[string, string, string]>([
+		['none', '$fromAI("a", `b`)', 'b'],
+		['a simple case of', '$fromAI("a", `\\``)', '`'],
+		// this is a bug in the current implementation
+		// see related comments in the main file
+		// We try to use different quote characters where possible
+		['a complex case of', '$fromAI("a", `a \\` \\\\\\``)', 'a ` `'],
+	])('should handle %s backtick escaping ', (_name, value, expected) => {
+		expect(parseOverrides(value)).toEqual({ description: expected });
+	});
+
+	it('should build a value from an override and carry over modification', () => {
+		const override: FromAIOverride = {
+			type: 'fromAI',
+			extraProps: fromAIExtraProps,
+			extraPropValues: {},
+		};
+		expect(buildValueFromOverride(override, makeContext(''), true)).toEqual(
+			`={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('${DISPLAY_NAME}', \`\`, 'string') }}`,
+		);
+		expect(buildValueFromOverride(override, makeContext(''), false)).toEqual(
+			`={{ $fromAI('${DISPLAY_NAME}', \`\`, 'string') }}`,
+		);
+
+		const description = 'a description';
+		override.extraPropValues.description = description;
+
+		expect(buildValueFromOverride(override, makeContext(''), true)).toEqual(
+			`={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('${DISPLAY_NAME}', \`${description}\`, 'string') }}`,
+		);
+		expect(buildValueFromOverride(override, makeContext(''), false)).toEqual(
+			`={{ $fromAI('${DISPLAY_NAME}', \`${description}\`, 'string') }}`,
+		);
+	});
+});
diff --git a/packages/editor-ui/src/utils/fromAIOverrideUtils.ts b/packages/editor-ui/src/utils/fromAIOverrideUtils.ts
new file mode 100644
index 0000000000..50a35110e6
--- /dev/null
+++ b/packages/editor-ui/src/utils/fromAIOverrideUtils.ts
@@ -0,0 +1,196 @@
+import {
+	extractFromAICalls,
+	FROM_AI_AUTO_GENERATED_MARKER,
+	type INodeTypeDescription,
+	type NodeParameterValueType,
+	type NodePropertyTypes,
+} from 'n8n-workflow';
+import { i18n } from '@/plugins/i18n';
+
+export type OverrideContext = {
+	parameter: {
+		name: string;
+		displayName: string;
+		type: NodePropertyTypes;
+		noDataExpression?: boolean;
+		typeOptions?: { editor?: string };
+	};
+	value: NodeParameterValueType;
+	path: string;
+};
+
+type ExtraPropValue = {
+	initialValue: string;
+	tooltip: string;
+	type: NodePropertyTypes;
+	typeOptions?: { rows?: number };
+};
+
+type FromAIExtraProps = 'description';
+
+export type FromAIOverride = {
+	type: 'fromAI';
+	readonly extraProps: Record<FromAIExtraProps, ExtraPropValue>;
+	extraPropValues: Partial<Record<string, NodeParameterValueType>>;
+};
+
+function sanitizeFromAiParameterName(s: string) {
+	s = s.replace(/[^a-zA-Z0-9\-]/g, '_');
+
+	if (s.length >= 64) {
+		s = s.slice(0, 63);
+	}
+
+	return s;
+}
+
+const NODE_DENYLIST = ['toolCode', 'toolHttpRequest'];
+
+const PATH_DENYLIST = [
+	'parameters.name',
+	// this is used in vector store tools
+	'parameters.toolName',
+	'parameters.description',
+	// This is used in e.g. the telegram node if the dropdown selects manual mode
+	'parameters.toolDescription',
+];
+
+export const fromAIExtraProps: Record<FromAIExtraProps, ExtraPropValue> = {
+	description: {
+		initialValue: '',
+		type: 'string',
+		typeOptions: { rows: 2 },
+		tooltip: i18n.baseText('parameterOverride.descriptionTooltip'),
+	},
+};
+
+function isExtraPropKey(
+	extraProps: FromAIOverride['extraProps'],
+	key: PropertyKey,
+): key is keyof FromAIOverride['extraProps'] {
+	return extraProps.hasOwnProperty(key);
+}
+
+export function updateFromAIOverrideValues(override: FromAIOverride, expr: string) {
+	const { extraProps, extraPropValues } = override;
+	const overrides = parseOverrides(expr);
+	if (overrides) {
+		for (const [key, value] of Object.entries(overrides)) {
+			if (isExtraPropKey(extraProps, key)) {
+				if (extraProps[key].initialValue === value) {
+					delete extraPropValues[key];
+				} else {
+					extraPropValues[key] = value;
+				}
+			}
+		}
+	}
+}
+
+function fieldTypeToFromAiType(propType: NodePropertyTypes) {
+	switch (propType) {
+		case 'boolean':
+		case 'number':
+		case 'json':
+			return propType;
+		default:
+			return 'string';
+	}
+}
+
+export function isFromAIOverrideValue(s: string) {
+	return s.startsWith(`={{ ${FROM_AI_AUTO_GENERATED_MARKER} $fromAI(`);
+}
+
+function getBestQuoteChar(description: string) {
+	if (description.includes('\n')) return '`';
+
+	if (!description.includes('`')) return '`';
+	if (!description.includes('"')) return '"';
+	return "'";
+}
+
+export function buildValueFromOverride(
+	override: FromAIOverride,
+	props: Pick<OverrideContext, 'parameter'>,
+	includeMarker: boolean,
+) {
+	const { extraPropValues, extraProps } = override;
+	const marker = includeMarker ? `${FROM_AI_AUTO_GENERATED_MARKER} ` : '';
+	const key = sanitizeFromAiParameterName(props.parameter.displayName);
+	const description =
+		extraPropValues?.description?.toString() ?? extraProps.description.initialValue;
+
+	// We want to escape these characters here as the generated formula needs to be valid JS code, and we risk
+	// closing the string prematurely without it.
+	// If we don't escape \ then <my \' description> as  would end up as 'my \\' description' in
+	// the generated code, causing an unescaped quoteChar to close the string.
+	// We try to minimize this by looking for an unused quote char first
+	const quoteChar = getBestQuoteChar(description);
+	const sanitizedDescription = description
+		.replaceAll(/\\/g, '\\\\')
+		.replaceAll(quoteChar, `\\${quoteChar}`);
+	const type = fieldTypeToFromAiType(props.parameter.type);
+
+	return `={{ ${marker}$fromAI('${key}', ${quoteChar}${sanitizedDescription}${quoteChar}, '${type}') }}`;
+}
+
+export function parseOverrides(
+	expression: string,
+): Record<keyof FromAIOverride['extraProps'], string | undefined> | null {
+	try {
+		// `extractFromAICalls` has different escape semantics from JS strings
+		// Specifically it makes \ escape any following character.
+		// So we need to escape our \ so we don't drop them accidentally
+		// However ` used in the description cause \` to appear here, which would break
+		// So we take the hit and expose the bug for backticks only, turning \` into `.
+		const preparedExpression = expression.replace(/\\[^`]/g, '\\\\');
+
+		const calls = extractFromAICalls(preparedExpression);
+		if (calls.length === 1) {
+			return {
+				description: calls[0].description,
+			};
+		}
+	} catch (e) {}
+
+	return null;
+}
+
+export function canBeContentOverride(
+	props: Pick<OverrideContext, 'path' | 'parameter'>,
+	nodeType: INodeTypeDescription | null,
+) {
+	if (NODE_DENYLIST.some((x) => nodeType?.name?.endsWith(x) ?? false)) return false;
+
+	if (PATH_DENYLIST.includes(props.path)) return false;
+
+	const codex = nodeType?.codex;
+	if (
+		!codex?.categories?.includes('AI') ||
+		!codex?.subcategories?.AI?.includes('Tools') ||
+		codex?.subcategories?.AI?.includes('Vector Stores') // vector stores do not support fromAI
+	)
+		return false;
+
+	return !props.parameter.noDataExpression && 'options' !== props.parameter.type;
+}
+
+export function makeOverrideValue(
+	context: OverrideContext,
+	nodeType: INodeTypeDescription | null | undefined,
+): FromAIOverride | null {
+	if (!nodeType) return null;
+
+	if (canBeContentOverride(context, nodeType)) {
+		const fromAiOverride: FromAIOverride = {
+			type: 'fromAI',
+			extraProps: fromAIExtraProps,
+			extraPropValues: {},
+		};
+		updateFromAIOverrideValues(fromAiOverride, context.value?.toString() ?? '');
+		return fromAiOverride;
+	}
+
+	return null;
+}
diff --git a/packages/editor-ui/src/utils/objectUtils.test.ts b/packages/editor-ui/src/utils/objectUtils.test.ts
index 0dd51f5e80..ae2b7cf877 100644
--- a/packages/editor-ui/src/utils/objectUtils.test.ts
+++ b/packages/editor-ui/src/utils/objectUtils.test.ts
@@ -1,4 +1,4 @@
-import { isObjectOrArray, isObject, searchInObject } from '@/utils/objectUtils';
+import { isObjectOrArray, isObject, searchInObject, getObjectSizeInKB } from '@/utils/objectUtils';
 
 const testData = [1, '', true, null, undefined, new Date(), () => {}].map((value) => [
 	value,
@@ -95,4 +95,63 @@ describe('objectUtils', () => {
 			assert(searchInObject({ a: ['b', { c: 'd' }] }, 'd'));
 		});
 	});
+
+	describe('getObjectSizeInKB', () => {
+		// Test null/undefined cases
+		it('returns 0 for null', () => {
+			expect(getObjectSizeInKB(null)).toBe(0);
+		});
+
+		it('returns 0 for undefined', () => {
+			expect(getObjectSizeInKB(undefined)).toBe(0);
+		});
+
+		// Test empty objects/arrays
+		it('returns correct size for empty object', () => {
+			expect(getObjectSizeInKB({})).toBe(0);
+		});
+
+		it('returns correct size for empty array', () => {
+			expect(getObjectSizeInKB([])).toBe(0);
+		});
+
+		// Test regular cases
+		it('calculates size for simple object correctly', () => {
+			const obj = { name: 'test' };
+			expect(getObjectSizeInKB(obj)).toBe(0.01);
+		});
+
+		it('calculates size for array correctly', () => {
+			const arr = [1, 2, 3];
+			expect(getObjectSizeInKB(arr)).toBe(0.01);
+		});
+
+		it('calculates size for nested object correctly', () => {
+			const obj = {
+				name: 'test',
+				nested: {
+					value: 123,
+				},
+			};
+			expect(getObjectSizeInKB(obj)).toBe(0.04);
+		});
+
+		// Test error cases
+		it('throws error for circular reference', () => {
+			type CircularObj = {
+				name: string;
+				self?: CircularObj;
+			};
+
+			const obj: CircularObj = { name: 'test' };
+			obj.self = obj;
+
+			expect(() => getObjectSizeInKB(obj)).toThrow('Failed to calculate object size');
+		});
+
+		it('handles special characters correctly', () => {
+			const obj = { name: '测试' };
+			expect(getObjectSizeInKB(obj)).toBe(0.02);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/utils/objectUtils.ts b/packages/editor-ui/src/utils/objectUtils.ts
index d29bd15866..1958dcb3ea 100644
--- a/packages/editor-ui/src/utils/objectUtils.ts
+++ b/packages/editor-ui/src/utils/objectUtils.ts
@@ -18,3 +18,35 @@ export const searchInObject = (obj: ObjectOrArray, searchString: string): boolea
 			? searchInObject(entry, searchString)
 			: entry?.toString().toLowerCase().includes(searchString.toLowerCase()),
 	);
+
+/**
+ * Calculate the size of a stringified object in KB.
+ * @param {unknown} obj - The object to calculate the size of
+ * @returns {number} The size of the object in KB
+ * @throws {Error} If the object is not serializable
+ */
+export const getObjectSizeInKB = (obj: unknown): number => {
+	if (obj === null || obj === undefined) {
+		return 0;
+	}
+
+	if (
+		(typeof obj === 'object' && Object.keys(obj).length === 0) ||
+		(Array.isArray(obj) && obj.length === 0)
+	) {
+		// "{}" and "[]" both take 2 bytes in UTF-8
+		return Number((2 / 1024).toFixed(2));
+	}
+
+	try {
+		const str = JSON.stringify(obj);
+		// Using TextEncoder to get actual UTF-8 byte length (what we see in chrome dev tools)
+		const bytes = new TextEncoder().encode(str).length;
+		const kb = bytes / 1024;
+		return Number(kb.toFixed(2));
+	} catch (error) {
+		throw new Error(
+			`Failed to calculate object size: ${error instanceof Error ? error.message : 'Unknown error'}`,
+		);
+	}
+};
diff --git a/packages/editor-ui/src/utils/sourceControlUtils.test.ts b/packages/editor-ui/src/utils/sourceControlUtils.test.ts
new file mode 100644
index 0000000000..97dc630a4d
--- /dev/null
+++ b/packages/editor-ui/src/utils/sourceControlUtils.test.ts
@@ -0,0 +1,119 @@
+import {
+	getStatusText,
+	getStatusTheme,
+	getPullPriorityByStatus,
+	getPushPriorityByStatus,
+	notifyUserAboutPullWorkFolderOutcome,
+} from './sourceControlUtils';
+import type { useToast } from '@/composables/useToast';
+
+import { SOURCE_CONTROL_FILE_STATUS } from '@n8n/api-types';
+
+describe('source control utils', () => {
+	describe('getStatusText()', () => {
+		it('uses i18n', () => {
+			expect(getStatusText(SOURCE_CONTROL_FILE_STATUS.new)).toStrictEqual(
+				expect.stringContaining(SOURCE_CONTROL_FILE_STATUS.new),
+			);
+		});
+	});
+
+	describe('getStatusTheme()', () => {
+		it('only handles known values', () => {
+			expect(getStatusTheme('unknown')).toBe(undefined);
+		});
+	});
+
+	describe('getPullPriorityByStatus()', () => {
+		it('defaults to 0', () => {
+			expect(getPullPriorityByStatus(SOURCE_CONTROL_FILE_STATUS.new)).toBe(0);
+		});
+	});
+
+	describe('getPushPriorityByStatus()', () => {
+		it('defaults to 0', () => {
+			expect(getPushPriorityByStatus(SOURCE_CONTROL_FILE_STATUS.new)).toBe(0);
+		});
+	});
+
+	describe('notifyUserAboutPullWorkFolderOutcome()', () => {
+		it('should show up to date notification when there are no changes', async () => {
+			const toast = { showMessage: vi.fn() } as unknown as ReturnType<typeof useToast>;
+			await notifyUserAboutPullWorkFolderOutcome([], toast);
+
+			expect(toast.showMessage).toHaveBeenCalledWith(
+				expect.objectContaining({
+					title: 'Up to date',
+				}),
+			);
+		});
+
+		it('should show granular feedback', async () => {
+			const toast = { showToast: vi.fn() } as unknown as ReturnType<typeof useToast>;
+			await notifyUserAboutPullWorkFolderOutcome(
+				[
+					{
+						id: '014da93897f146d2b880-baa374b9d02d',
+						name: 'vuelfow2',
+						type: 'workflow',
+						status: 'created',
+						location: 'remote',
+						conflict: false,
+						file: '/014da93897f146d2b880-baa374b9d02d.json',
+						updatedAt: '2025-01-09T13:12:24.580Z',
+					},
+					{
+						id: 'a102c0b9-28ac-43cb-950e-195723a56d54',
+						name: 'Gmail account',
+						type: 'credential',
+						status: 'created',
+						location: 'remote',
+						conflict: false,
+						file: '/a102c0b9-28ac-43cb-950e-195723a56d54.json',
+						updatedAt: '2025-01-09T13:12:24.586Z',
+					},
+					{
+						id: 'variables',
+						name: 'variables',
+						type: 'variables',
+						status: 'modified',
+						location: 'remote',
+						conflict: false,
+						file: '/variable_stubs.json',
+						updatedAt: '2025-01-09T13:12:24.588Z',
+					},
+					{
+						id: 'mappings',
+						name: 'tags',
+						type: 'tags',
+						status: 'modified',
+						location: 'remote',
+						conflict: false,
+						file: '/tags.json',
+						updatedAt: '2024-12-16T12:53:12.155Z',
+					},
+				],
+				toast,
+			);
+
+			expect(toast.showToast).toHaveBeenNthCalledWith(
+				1,
+				expect.objectContaining({
+					title: 'Finish setting up your new variables to use in workflows',
+				}),
+			);
+			expect(toast.showToast).toHaveBeenNthCalledWith(
+				2,
+				expect.objectContaining({
+					title: 'Finish setting up your new credentials to use in workflows',
+				}),
+			);
+			expect(toast.showToast).toHaveBeenNthCalledWith(
+				3,
+				expect.objectContaining({
+					message: '1 Workflow, 1 Credential, Variables, and Tags were pulled',
+				}),
+			);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/sourceControlUtils.ts b/packages/editor-ui/src/utils/sourceControlUtils.ts
new file mode 100644
index 0000000000..af83b7226d
--- /dev/null
+++ b/packages/editor-ui/src/utils/sourceControlUtils.ts
@@ -0,0 +1,157 @@
+import { h, nextTick } from 'vue';
+import { RouterLink } from 'vue-router';
+import { useI18n } from '@/composables/useI18n';
+import { type SourceControlledFile, SOURCE_CONTROL_FILE_STATUS } from '@n8n/api-types';
+import type { BaseTextKey } from '@/plugins/i18n';
+import { VIEWS } from '@/constants';
+import { groupBy } from 'lodash-es';
+import type { useToast } from '@/composables/useToast';
+import { telemetry } from '@/plugins/telemetry';
+
+type SourceControlledFileStatus = SourceControlledFile['status'];
+
+const i18n = useI18n();
+
+export const getStatusText = (status: SourceControlledFileStatus) =>
+	i18n.baseText(`settings.sourceControl.status.${status}` as BaseTextKey);
+
+export const getStatusTheme = (status: SourceControlledFileStatus) => {
+	const statusToBadgeThemeMap: Partial<
+		Record<SourceControlledFileStatus, 'success' | 'danger' | 'warning'>
+	> = {
+		[SOURCE_CONTROL_FILE_STATUS.created]: 'success',
+		[SOURCE_CONTROL_FILE_STATUS.deleted]: 'danger',
+		[SOURCE_CONTROL_FILE_STATUS.modified]: 'warning',
+	} as const;
+	return statusToBadgeThemeMap[status];
+};
+
+type StatusPriority = Partial<Record<SourceControlledFileStatus, number>>;
+const pullStatusPriority: StatusPriority = {
+	[SOURCE_CONTROL_FILE_STATUS.modified]: 2,
+	[SOURCE_CONTROL_FILE_STATUS.created]: 1,
+	[SOURCE_CONTROL_FILE_STATUS.deleted]: 3,
+} as const;
+
+export const getPullPriorityByStatus = (status: SourceControlledFileStatus) =>
+	pullStatusPriority[status] ?? 0;
+
+const pushStatusPriority: StatusPriority = {
+	[SOURCE_CONTROL_FILE_STATUS.modified]: 1,
+	[SOURCE_CONTROL_FILE_STATUS.renamed]: 2,
+	[SOURCE_CONTROL_FILE_STATUS.created]: 3,
+	[SOURCE_CONTROL_FILE_STATUS.deleted]: 4,
+} as const;
+
+export const getPushPriorityByStatus = (status: SourceControlledFileStatus) =>
+	pushStatusPriority[status] ?? 0;
+
+const variablesToast = {
+	title: i18n.baseText('settings.sourceControl.pull.upToDate.variables.title'),
+	message: h(
+		RouterLink,
+		{
+			to: { name: VIEWS.VARIABLES, query: { incomplete: 'true' } },
+			onClick: () => {
+				telemetry.track('User clicked review variables');
+			},
+		},
+		() => i18n.baseText('settings.sourceControl.pull.upToDate.variables.description'),
+	),
+	type: 'info' as const,
+	duration: 0,
+};
+
+const credentialsToast = {
+	title: i18n.baseText('settings.sourceControl.pull.upToDate.credentials.title'),
+	message: h(
+		RouterLink,
+		{
+			to: { name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } },
+			onClick: () => {
+				telemetry.track('User clicked review credentials');
+			},
+		},
+		() => i18n.baseText('settings.sourceControl.pull.upToDate.credentials.description'),
+	),
+	type: 'info' as const,
+	duration: 0,
+};
+
+const pullMessage = ({
+	credential,
+	tags,
+	variables,
+	workflow,
+}: Partial<Record<SourceControlledFile['type'], SourceControlledFile[]>>) => {
+	const messages: string[] = [];
+
+	if (workflow?.length) {
+		messages.push(
+			i18n.baseText('generic.workflow', {
+				adjustToNumber: workflow.length,
+				interpolate: { count: workflow.length },
+			}),
+		);
+	}
+
+	if (credential?.length) {
+		messages.push(
+			i18n.baseText('generic.credential', {
+				adjustToNumber: credential.length,
+				interpolate: { count: credential.length },
+			}),
+		);
+	}
+
+	if (variables?.length) {
+		messages.push(i18n.baseText('generic.variable_plural'));
+	}
+
+	if (tags?.length) {
+		messages.push(i18n.baseText('generic.tag_plural'));
+	}
+
+	return [
+		new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages),
+		'were pulled',
+	].join(' ');
+};
+
+export const notifyUserAboutPullWorkFolderOutcome = async (
+	files: SourceControlledFile[],
+	toast: ReturnType<typeof useToast>,
+) => {
+	if (!files?.length) {
+		toast.showMessage({
+			title: i18n.baseText('settings.sourceControl.pull.upToDate.title'),
+			message: i18n.baseText('settings.sourceControl.pull.upToDate.description'),
+			type: 'success',
+		});
+		return;
+	}
+
+	const { credential, tags, variables, workflow } = groupBy(files, 'type');
+
+	const toastMessages = [
+		...(variables?.length ? [variablesToast] : []),
+		...(credential?.length ? [credentialsToast] : []),
+		{
+			title: i18n.baseText('settings.sourceControl.pull.success.title'),
+			message: pullMessage({ credential, tags, variables, workflow }),
+			type: 'success' as const,
+		},
+	];
+
+	for (const message of toastMessages) {
+		/**
+		 * the toasts stack in a reversed way, resulting in
+		 * Success
+		 * Credentials
+		 * Variables
+		 */
+		//
+		toast.showToast(message);
+		await nextTick();
+	}
+};
diff --git a/packages/editor-ui/src/views/CredentialsView.test.ts b/packages/editor-ui/src/views/CredentialsView.test.ts
index 482cf6e767..878cc108b0 100644
--- a/packages/editor-ui/src/views/CredentialsView.test.ts
+++ b/packages/editor-ui/src/views/CredentialsView.test.ts
@@ -5,28 +5,27 @@ import CredentialsView from '@/views/CredentialsView.vue';
 import { useUIStore } from '@/stores/ui.store';
 import { mockedStore } from '@/__tests__/utils';
 import { waitFor, within, fireEvent } from '@testing-library/vue';
-import { CREDENTIAL_SELECT_MODAL_KEY, STORES } from '@/constants';
+import { CREDENTIAL_SELECT_MODAL_KEY, STORES, VIEWS } from '@/constants';
 import { useProjectsStore } from '@/stores/projects.store';
 import type { Project } from '@/types/projects.types';
-import { useRouter } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
+import { flushPromises } from '@vue/test-utils';
+import { CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
 vi.mock('@/composables/useGlobalEntityCreation', () => ({
 	useGlobalEntityCreation: () => ({
 		menu: [],
 	}),
 }));
 
-vi.mock('vue-router', async () => {
-	const actual = await vi.importActual('vue-router');
-	const push = vi.fn();
-	const replace = vi.fn();
-	return {
-		...actual,
-		// your mocked methods
-		useRouter: () => ({
-			push,
-			replace,
-		}),
-	};
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/:credentialId?',
+			name: VIEWS.CREDENTIALS,
+			component: { template: '<div></div>' },
+		},
+	],
 });
 
 const initialState = {
@@ -36,14 +35,14 @@ const initialState = {
 };
 
 const renderComponent = createComponentRenderer(CredentialsView, {
-	global: { stubs: { ProjectHeader: true } },
+	global: { stubs: { ProjectHeader: true }, plugins: [router] },
 });
-let router: ReturnType<typeof useRouter>;
 
 describe('CredentialsView', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		createTestingPinia({ initialState });
-		router = useRouter();
+		await router.push('/');
+		await router.isReady();
 	});
 
 	afterEach(() => {
@@ -115,6 +114,7 @@ describe('CredentialsView', () => {
 		});
 
 		it('should update credentialId route param when opened', async () => {
+			const replaceSpy = vi.spyOn(router, 'replace');
 			const projectsStore = mockedStore(useProjectsStore);
 			projectsStore.isProjectHome = false;
 			projectsStore.currentProject = { scopes: ['credential:read'] } as Project;
@@ -137,8 +137,147 @@ describe('CredentialsView', () => {
 			 */
 			await fireEvent.click(getByTestId('resources-list-item'));
 			await waitFor(() =>
-				expect(router.replace).toHaveBeenCalledWith({ params: { credentialId: '1' } }),
+				expect(replaceSpy).toHaveBeenCalledWith(
+					expect.objectContaining({ params: { credentialId: '1' } }),
+				),
 			);
 		});
 	});
+
+	describe('filters', () => {
+		it('should filter by type', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { type: ['test'] } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentialTypes = [
+				{
+					name: 'test',
+					displayName: 'test',
+					properties: [],
+				},
+			];
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'test',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+				},
+				{
+					id: '1',
+					name: 'test',
+					type: 'another',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+				},
+			];
+			const { getAllByTestId } = renderComponent();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+		});
+
+		it('should filter by setupNeeded', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'test',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: {} as unknown as string,
+				},
+				{
+					id: '1',
+					name: 'test',
+					type: 'another',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: 'any' } as unknown as string,
+				},
+			];
+			const { getAllByTestId, getByTestId } = renderComponent();
+			await flushPromises();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+
+			await fireEvent.click(getByTestId('credential-filter-setup-needed'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+
+		it('should filter by setupNeeded when object keys are empty', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'credential needs setup',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: '' } as unknown as string,
+				},
+				{
+					id: '2',
+					name: 'random',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: 'any value' } as unknown as string,
+				},
+			];
+			const { getAllByTestId, getByTestId } = renderComponent();
+			await flushPromises();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+			expect(getByTestId('resources-list-item').textContent).toContain('credential needs setup');
+
+			await fireEvent.click(getByTestId('credential-filter-setup-needed'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+
+		it('should filter by setupNeeded when object keys are "CREDENTIAL_EMPTY_VALUE"', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'credential needs setup',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: CREDENTIAL_EMPTY_VALUE } as unknown as string,
+				},
+				{
+					id: '2',
+					name: 'random',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: 'any value' } as unknown as string,
+				},
+			];
+			const { getAllByTestId, getByTestId } = renderComponent();
+			await flushPromises();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+			expect(getByTestId('resources-list-item').textContent).toContain('credential needs setup');
+
+			await fireEvent.click(getByTestId('credential-filter-setup-needed'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+	});
 });
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index 14d9feb1e2..3585a3fc24 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -1,13 +1,13 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute, useRouter, type LocationQueryRaw } from 'vue-router';
 import type { ICredentialsResponse, ICredentialTypeMap } from '@/Interface';
+import type { ICredentialType, ICredentialsDecrypted } from 'n8n-workflow';
 import ResourcesListLayout, {
 	type IResource,
 	type IFilters,
 } from '@/components/layouts/ResourcesListLayout.vue';
 import CredentialCard from '@/components/CredentialCard.vue';
-import type { ICredentialType } from 'n8n-workflow';
 import {
 	CREDENTIAL_SELECT_MODAL_KEY,
 	CREDENTIAL_EDIT_MODAL_KEY,
@@ -27,6 +27,9 @@ import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
+import { N8nCheckbox } from 'n8n-design-system';
+import { pickBy } from 'lodash-es';
+import { CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
 
 const props = defineProps<{
 	credentialId?: string;
@@ -46,14 +49,26 @@ const router = useRouter();
 const telemetry = useTelemetry();
 const i18n = useI18n();
 
-const filters = ref<IFilters>({
-	search: '',
-	homeProject: '',
-	type: [],
-});
+type Filters = IFilters & { type?: string[]; setupNeeded?: boolean };
+const updateFilter = (state: Filters) => {
+	void router.replace({ query: pickBy(state) as LocationQueryRaw });
+};
 
+const filters = computed<Filters>(
+	() =>
+		({ ...route.query, setupNeeded: route.query.setupNeeded?.toString() === 'true' }) as Filters,
+);
 const loading = ref(false);
 
+const needsSetup = (data: string | undefined): boolean => {
+	const dataObject = data as unknown as ICredentialsDecrypted['data'];
+	if (!dataObject) return false;
+
+	if (Object.keys(dataObject).length === 0) return true;
+
+	return Object.values(dataObject).every((value) => !value || value === CREDENTIAL_EMPTY_VALUE);
+};
+
 const allCredentials = computed<IResource[]>(() =>
 	credentialsStore.allCredentials.map((credential) => ({
 		id: credential.id,
@@ -66,6 +81,7 @@ const allCredentials = computed<IResource[]>(() =>
 		type: credential.type,
 		sharedWithProjects: credential.sharedWithProjects,
 		readOnly: !getResourcePermissions(credential.scopes).credential.update,
+		needsSetup: needsSetup(credential.data),
 	})),
 );
 
@@ -84,7 +100,7 @@ const projectPermissions = computed(() =>
 );
 
 const setRouteCredentialId = (credentialId?: string) => {
-	void router.replace({ params: { credentialId } });
+	void router.replace({ params: { credentialId }, query: route.query });
 };
 
 const addCredential = () => {
@@ -98,7 +114,7 @@ listenForModalChanges({
 	store: uiStore,
 	onModalClosed(modalName) {
 		if ([CREDENTIAL_SELECT_MODAL_KEY, CREDENTIAL_EDIT_MODAL_KEY].includes(modalName as string)) {
-			void router.replace({ params: { credentialId: '' } });
+			void router.replace({ params: { credentialId: '' }, query: route.query });
 		}
 	},
 });
@@ -121,9 +137,9 @@ watch(
 );
 
 const onFilter = (resource: IResource, newFilters: IFilters, matches: boolean): boolean => {
-	const iResource = resource as ICredentialsResponse;
-	const filtersToApply = newFilters as IFilters & { type: string[] };
-	if (filtersToApply.type.length > 0) {
+	const iResource = resource as ICredentialsResponse & { needsSetup: boolean };
+	const filtersToApply = newFilters as Filters;
+	if (filtersToApply.type && filtersToApply.type.length > 0) {
 		matches = matches && filtersToApply.type.includes(iResource.type);
 	}
 
@@ -136,6 +152,10 @@ const onFilter = (resource: IResource, newFilters: IFilters, matches: boolean):
 				credentialTypesById.value[iResource.type].displayName.toLowerCase().includes(searchString));
 	}
 
+	if (filtersToApply.setupNeeded) {
+		matches = matches && iResource.needsSetup;
+	}
+
 	return matches;
 };
 
@@ -156,6 +176,14 @@ const initialize = async () => {
 	loading.value = false;
 };
 
+credentialsStore.$onAction(({ name, after }) => {
+	if (name === 'createNewCredential') {
+		after(() => {
+			void credentialsStore.fetchAllCredentials(route?.params?.projectId as string | undefined);
+		});
+	}
+});
+
 sourceControlStore.$onAction(({ name, after }) => {
 	if (name !== 'pullWorkfolder') return;
 	after(() => {
@@ -181,7 +209,7 @@ onMounted(() => {
 		:type-props="{ itemSize: 77 }"
 		:loading="loading"
 		:disabled="readOnlyEnv || !projectPermissions.credential.create"
-		@update:filters="filters = $event"
+		@update:filters="updateFilter"
 	>
 		<template #header>
 			<ProjectHeader />
@@ -192,6 +220,7 @@ onMounted(() => {
 				class="mb-2xs"
 				:data="data"
 				:read-only="data.readOnly"
+				:needs-setup="data.needsSetup"
 				@click="setRouteCredentialId"
 			/>
 		</template>
@@ -221,6 +250,23 @@ onMounted(() => {
 					/>
 				</N8nSelect>
 			</div>
+			<div class="mb-s">
+				<N8nInputLabel
+					:label="i18n.baseText('credentials.filters.status')"
+					:bold="false"
+					size="small"
+					color="text-base"
+					class="mb-3xs"
+				/>
+
+				<N8nCheckbox
+					:label="i18n.baseText('credentials.filters.setup')"
+					data-test-id="credential-filter-setup-needed"
+					:model-value="filters.setupNeeded"
+					@update:model-value="setKeyValue('setupNeeded', $event)"
+				>
+				</N8nCheckbox>
+			</div>
 		</template>
 		<template #empty>
 			<n8n-action-box
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index fda3f17e6f..9e9cee3269 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -31,6 +31,7 @@ import type {
 	IWorkflowDb,
 	IWorkflowTemplate,
 	NodeCreatorOpenSource,
+	NodeFilterType,
 	ToggleNodeCreatorOptions,
 	WorkflowDataWithTemplateId,
 	XYPosition,
@@ -67,8 +68,8 @@ import {
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
-import { TelemetryHelpers, NodeConnectionType, jsonParse } from 'n8n-workflow';
-import type { IDataObject, ExecutionSummary, IConnection, IWorkflowBase } from 'n8n-workflow';
+import { NodeConnectionType, jsonParse } from 'n8n-workflow';
+import type { IDataObject, ExecutionSummary, IConnection } from 'n8n-workflow';
 import { useToast } from '@/composables/useToast';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useCredentialsStore } from '@/stores/credentials.store';
@@ -165,7 +166,8 @@ const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBef
 	route,
 });
 const { registerCustomAction, unregisterCustomAction } = useGlobalLinkActions();
-const { runWorkflow, stopCurrentExecution, stopWaitingForWebhook } = useRunWorkflow({ router });
+const { runWorkflow, runEntireWorkflow, stopCurrentExecution, stopWaitingForWebhook } =
+	useRunWorkflow({ router });
 const {
 	updateNodePosition,
 	updateNodesPosition,
@@ -202,6 +204,7 @@ const {
 	editableWorkflow,
 	editableWorkflowObject,
 	lastClickPosition,
+	toggleChatOpen,
 } = useCanvasOperations({ router });
 const { applyExecutionData } = useExecutionDebugging();
 useClipboard({ onPaste: onClipboardPaste });
@@ -307,8 +310,13 @@ async function initializeData() {
 async function initializeRoute(force = false) {
 	// In case the workflow got saved we do not have to run init
 	// as only the route changed but all the needed data is already loaded
-	if (route.params.action === 'workflowSave') {
+
+	if (route.query.action === 'workflowSave') {
 		uiStore.stateIsDirty = false;
+		// Remove the action from the query
+		await router.replace({
+			query: { ...route.query, action: undefined },
+		});
 		return;
 	}
 
@@ -343,6 +351,10 @@ async function initializeRoute(force = false) {
 		if (!isAlreadyInitialized) {
 			historyStore.reset();
 
+			if (!isDemoRoute.value) {
+				await loadCredentials();
+			}
+
 			// If there is no workflow id, treat it as a new workflow
 			if (isNewWorkflowRoute.value || !workflowId.value) {
 				if (route.meta?.nodeView === true) {
@@ -353,12 +365,8 @@ async function initializeRoute(force = false) {
 
 			await initializeWorkspaceForExistingWorkflow(workflowId.value);
 
-			await loadCredentials();
-
 			void nextTick(() => {
-				nodeHelpers.updateNodesInputIssues();
-				nodeHelpers.updateNodesCredentialsIssues();
-				nodeHelpers.updateNodesParameterIssues();
+				updateNodesIssues();
 			});
 		}
 
@@ -388,9 +396,7 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
 			trackOpenWorkflowFromOnboardingTemplate();
 		}
 
-		await projectsStore.setProjectNavActiveIdByWorkflowHomeProject(
-			editableWorkflow.value.homeProject,
-		);
+		await projectsStore.setProjectNavActiveIdByWorkflowHomeProject(workflowData.homeProject);
 	} catch (error) {
 		toast.showError(error, i18n.baseText('openWorkflow.workflowNotFoundError'));
 
@@ -403,6 +409,12 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
 	}
 }
 
+function updateNodesIssues() {
+	nodeHelpers.updateNodesInputIssues();
+	nodeHelpers.updateNodesCredentialsIssues();
+	nodeHelpers.updateNodesParameterIssues();
+}
+
 /**
  * Workflow
  */
@@ -814,8 +826,8 @@ function onClickNodeAdd(source: string, sourceHandle: string) {
 async function loadCredentials() {
 	let options: { workflowId: string } | { projectId: string };
 
-	if (editableWorkflow.value) {
-		options = { workflowId: editableWorkflow.value.id };
+	if (workflowId.value) {
+		options = { workflowId: workflowId.value };
 	} else {
 		const queryParam =
 			typeof route.query?.projectId === 'string' ? route.query?.projectId : undefined;
@@ -923,11 +935,13 @@ async function onImportWorkflowUrlEvent(data: IDataObject) {
 function addImportEventBindings() {
 	nodeViewEventBus.on('importWorkflowData', onImportWorkflowDataEvent);
 	nodeViewEventBus.on('importWorkflowUrl', onImportWorkflowUrlEvent);
+	nodeViewEventBus.on('openChat', onOpenChat);
 }
 
 function removeImportEventBindings() {
 	nodeViewEventBus.off('importWorkflowData', onImportWorkflowDataEvent);
 	nodeViewEventBus.off('importWorkflowUrl', onImportWorkflowUrlEvent);
+	nodeViewEventBus.off('openChat', onOpenChat);
 }
 
 /**
@@ -996,7 +1010,11 @@ async function onRevertAddNode({ node }: { node: INodeUi }) {
 }
 
 async function onSwitchActiveNode(nodeName: string) {
+	const node = workflowsStore.getNodeByName(nodeName);
+	if (!node) return;
+
 	setNodeActiveByName(nodeName);
+	selectNodes([node.id]);
 }
 
 async function onOpenSelectiveNodeCreator(node: string, connectionType: NodeConnectionType) {
@@ -1068,7 +1086,9 @@ const isExecutionDisabled = computed(() => {
 	return !containsTriggerNodes.value || allTriggerNodesDisabled.value;
 });
 
-const isRunWorkflowButtonVisible = computed(() => !isOnlyChatTriggerNodeActive.value);
+const isRunWorkflowButtonVisible = computed(
+	() => !isOnlyChatTriggerNodeActive.value || chatTriggerNodePinnedData.value,
+);
 const isStopExecutionButtonVisible = computed(
 	() => isWorkflowRunning.value && !isExecutionWaitingForWebhook.value,
 );
@@ -1086,29 +1106,6 @@ const isClearExecutionButtonVisible = computed(
 
 const workflowExecutionData = computed(() => workflowsStore.workflowExecutionData);
 
-async function onRunWorkflow() {
-	trackRunWorkflow();
-
-	void runWorkflow({});
-}
-
-function trackRunWorkflow() {
-	void workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
-		const telemetryPayload = {
-			workflow_id: workflowId.value,
-			node_graph_string: JSON.stringify(
-				TelemetryHelpers.generateNodesGraph(
-					workflowData as IWorkflowBase,
-					workflowHelpers.getNodeTypes(),
-					{ isCloudDeployment: settingsStore.isCloudDeployment },
-				).nodeGraph,
-			),
-		};
-		telemetry.track('User clicked execute workflow button', telemetryPayload);
-		void externalHooks.run('nodeView.onRunWorkflow', telemetryPayload);
-	});
-}
-
 async function onRunWorkflowToNode(id: string) {
 	const node = workflowsStore.getNodeById(id);
 	if (!node) return;
@@ -1141,6 +1138,10 @@ async function onOpenExecution(executionId: string) {
 		return;
 	}
 
+	void nextTick(() => {
+		updateNodesIssues();
+	});
+
 	canvasStore.stopLoading();
 	fitView();
 
@@ -1266,14 +1267,7 @@ const chatTriggerNodePinnedData = computed(() => {
 });
 
 async function onOpenChat() {
-	workflowsStore.setPanelOpen('chat', !workflowsStore.isChatPanelOpen);
-
-	const payload = {
-		workflow_id: workflowId.value,
-	};
-
-	void externalHooks.run('nodeView.onOpenChat', payload);
-	telemetry.track('User clicked chat open button', payload);
+	await toggleChatOpen('main');
 }
 
 /**
@@ -1385,7 +1379,8 @@ async function onPostMessageReceived(messageEvent: MessageEvent) {
 			try {
 				// If this NodeView is used in preview mode (in iframe) it will not have access to the main app store
 				// so everything it needs has to be sent using post messages and passed down to child components
-				isProductionExecutionPreview.value = json.executionMode !== 'manual';
+				isProductionExecutionPreview.value =
+					json.executionMode !== 'manual' && json.executionMode !== 'evaluation';
 
 				await onOpenExecution(json.executionId);
 				canOpenNDV.value = json.canOpenNDV ?? true;
@@ -1554,13 +1549,15 @@ function registerCustomActions() {
 	registerCustomAction({
 		key: 'openSelectiveNodeCreator',
 		action: ({
+			creatorview: creatorView,
 			connectiontype: connectionType,
 			node,
 		}: {
+			creatorview: NodeFilterType;
 			connectiontype: NodeConnectionType;
 			node: string;
 		}) => {
-			void onOpenSelectiveNodeCreator(node, connectionType);
+			nodeCreatorStore.openSelectiveNodeCreator({ node, connectionType, creatorView });
 		},
 	});
 
@@ -1683,7 +1680,6 @@ onBeforeUnmount(() => {
 		:event-bus="canvasEventBus"
 		:read-only="isCanvasReadOnly"
 		:executing="isWorkflowRunning"
-		:show-bug-reporting-button="!isDemoRoute || !!executionsStore.activeExecution"
 		:key-bindings="keyBindingsEnabled"
 		@update:nodes:position="onUpdateNodesPosition"
 		@update:node:position="onUpdateNodePosition"
@@ -1710,7 +1706,7 @@ onBeforeUnmount(() => {
 		@duplicate:nodes="onDuplicateNodes"
 		@copy:nodes="onCopyNodes"
 		@cut:nodes="onCutNodes"
-		@run:workflow="onRunWorkflow"
+		@run:workflow="runEntireWorkflow('main')"
 		@save:workflow="onSaveWorkflow"
 		@create:workflow="onCreateWorkflow"
 		@viewport-change="onViewportChange"
@@ -1727,12 +1723,12 @@ onBeforeUnmount(() => {
 				:executing="isWorkflowRunning"
 				@mouseenter="onRunWorkflowButtonMouseEnter"
 				@mouseleave="onRunWorkflowButtonMouseLeave"
-				@click="onRunWorkflow"
+				@click="runEntireWorkflow('main')"
 			/>
 			<CanvasChatButton
 				v-if="containsChatTriggerNodes"
 				:type="isChatOpen ? 'tertiary' : 'primary'"
-				:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.window.title')"
+				:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.open')"
 				@click="onOpenChat"
 			/>
 			<CanvasStopCurrentExecutionButton
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index c199761a16..517eb52239 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -166,7 +166,7 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useClipboard } from '@/composables/useClipboard';
 import { usePinnedData } from '@/composables/usePinnedData';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { useDeviceSupport } from 'n8n-design-system';
+import { useDeviceSupport } from '@n8n/composables/useDeviceSupport';
 import { useDebounce } from '@/composables/useDebounce';
 import { useExecutionsStore } from '@/stores/executions.store';
 import { useCanvasPanning } from '@/composables/useCanvasPanning';
@@ -2429,6 +2429,7 @@ export default defineComponent({
 			} else {
 				void this.externalHooks.run('nodeView.addNodeButton', { nodeTypeName });
 				this.nodeCreatorStore.onNodeAddedToCanvas({
+					node_id: newNodeData.id,
 					node_type: nodeTypeName,
 					node_version: newNodeData.typeVersion,
 					is_auto_add: isAutoAdd,
@@ -3392,10 +3393,15 @@ export default defineComponent({
 		async initView(): Promise<void> {
 			await this.loadCredentialsForWorkflow();
 
-			if (this.$route.params.action === 'workflowSave') {
+			if (this.$route.query.action === 'workflowSave') {
 				// In case the workflow got saved we do not have to run init
 				// as only the route changed but all the needed data is already loaded
 				this.uiStore.stateIsDirty = false;
+
+				// Remove the action from the query
+				await this.$router.replace({
+					query: { ...this.$route.query, action: undefined },
+				});
 				return;
 			}
 			if (this.blankRedirect) {
@@ -4685,7 +4691,7 @@ export default defineComponent({
 
 				<n8n-button
 					v-if="containsChatNodes"
-					:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.window.title')"
+					:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.open')"
 					size="large"
 					icon="comment"
 					:type="isChatOpen ? 'tertiary' : 'primary'"
diff --git a/packages/editor-ui/src/views/ProjectSettings.vue b/packages/editor-ui/src/views/ProjectSettings.vue
index 59ee76b935..2a64b95fe1 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/editor-ui/src/views/ProjectSettings.vue
@@ -192,9 +192,8 @@ const updateProject = async () => {
 		return;
 	}
 	try {
-		await projectsStore.updateProject({
-			id: projectsStore.currentProject.id,
-			name: formData.value.name,
+		await projectsStore.updateProject(projectsStore.currentProject.id, {
+			name: formData.value.name!,
 			icon: projectIcon.value,
 			relations: formData.value.relations.map((r: ProjectRelation) => ({
 				userId: r.id,
diff --git a/packages/editor-ui/src/views/SettingsApiView.test.ts b/packages/editor-ui/src/views/SettingsApiView.test.ts
new file mode 100644
index 0000000000..b895af20e3
--- /dev/null
+++ b/packages/editor-ui/src/views/SettingsApiView.test.ts
@@ -0,0 +1,134 @@
+import { fireEvent, screen } from '@testing-library/vue';
+import { useSettingsStore } from '@/stores/settings.store';
+
+import { renderComponent } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import SettingsApiView from './SettingsApiView.vue';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { useApiKeysStore } from '@/stores/apiKeys.store';
+import { DateTime } from 'luxon';
+
+setActivePinia(createTestingPinia());
+
+const settingsStore = mockedStore(useSettingsStore);
+const cloudStore = mockedStore(useCloudPlanStore);
+const apiKeysStore = mockedStore(useApiKeysStore);
+
+describe('SettingsApiView', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('if user public api is not enabled and user is trialing it should show upgrade call to action', () => {
+		settingsStore.isPublicApiEnabled = false;
+		cloudStore.userIsTrialing = true;
+
+		renderComponent(SettingsApiView);
+
+		expect(screen.getByText('Upgrade to use API')).toBeInTheDocument();
+		expect(
+			screen.getByText(
+				'To prevent abuse, we limit API access to your workspace during your trial. If this is hindering your evaluation of n8n, please contact',
+			),
+		).toBeInTheDocument();
+		expect(screen.getByText('support@n8n.io')).toBeInTheDocument();
+
+		expect(screen.getByText('Upgrade plan')).toBeInTheDocument();
+	});
+
+	it('if user public api enabled and no API keys in account, it should create API key CTA', () => {
+		settingsStore.isPublicApiEnabled = true;
+		cloudStore.userIsTrialing = false;
+		apiKeysStore.apiKeys = [];
+
+		renderComponent(SettingsApiView);
+
+		expect(screen.getByText('Create an API Key')).toBeInTheDocument();
+		expect(screen.getByText('Control n8n programmatically using the')).toBeInTheDocument();
+		expect(screen.getByText('n8n API')).toBeInTheDocument();
+	});
+
+	it('if user public api enabled and there are API Keys in account, they should be rendered', async () => {
+		const dateInTheFuture = DateTime.now().plus({ days: 1 });
+		const dateInThePast = DateTime.now().minus({ days: 1 });
+
+		settingsStore.isPublicApiEnabled = true;
+		cloudStore.userIsTrialing = false;
+		apiKeysStore.apiKeys = [
+			{
+				id: '1',
+				label: 'test-key-1',
+				createdAt: new Date().toString(),
+				updatedAt: new Date().toString(),
+				apiKey: '****Atcr',
+				expiresAt: null,
+			},
+			{
+				id: '2',
+				label: 'test-key-2',
+				createdAt: new Date().toString(),
+				updatedAt: new Date().toString(),
+				apiKey: '****Bdcr',
+				expiresAt: dateInTheFuture.toSeconds(),
+			},
+			{
+				id: '3',
+				label: 'test-key-3',
+				createdAt: new Date().toString(),
+				updatedAt: new Date().toString(),
+				apiKey: '****Wtcr',
+				expiresAt: dateInThePast.toSeconds(),
+			},
+		];
+
+		renderComponent(SettingsApiView);
+
+		expect(screen.getByText('Never expires')).toBeInTheDocument();
+		expect(screen.getByText('****Atcr')).toBeInTheDocument();
+		expect(screen.getByText('test-key-1')).toBeInTheDocument();
+
+		expect(
+			screen.getByText(`Expires on ${dateInTheFuture.toFormat('ccc, MMM d yyyy')}`),
+		).toBeInTheDocument();
+		expect(screen.getByText('****Bdcr')).toBeInTheDocument();
+		expect(screen.getByText('test-key-2')).toBeInTheDocument();
+
+		expect(screen.getByText('This API key has expired')).toBeInTheDocument();
+		expect(screen.getByText('****Wtcr')).toBeInTheDocument();
+		expect(screen.getByText('test-key-3')).toBeInTheDocument();
+	});
+
+	it('should show delete warning when trying to delete an API key', async () => {
+		settingsStore.isPublicApiEnabled = true;
+		cloudStore.userIsTrialing = false;
+		apiKeysStore.apiKeys = [
+			{
+				id: '1',
+				label: 'test-key-1',
+				createdAt: new Date().toString(),
+				updatedAt: new Date().toString(),
+				apiKey: '****Atcr',
+				expiresAt: null,
+			},
+		];
+
+		renderComponent(SettingsApiView);
+
+		expect(screen.getByText('Never expires')).toBeInTheDocument();
+		expect(screen.getByText('****Atcr')).toBeInTheDocument();
+		expect(screen.getByText('test-key-1')).toBeInTheDocument();
+
+		await fireEvent.click(screen.getByTestId('action-toggle'));
+		await fireEvent.click(screen.getByTestId('action-delete'));
+
+		expect(screen.getByText('Delete this API Key?')).toBeInTheDocument();
+		expect(
+			screen.getByText(
+				'Any application using this API Key will no longer have access to n8n. This operation cannot be undone.',
+			),
+		).toBeInTheDocument();
+		expect(screen.getByText('Cancel')).toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index ba4030a8a7..5238d032b2 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -1,22 +1,22 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref } from 'vue';
-import type { ApiKey } from '@/Interface';
+import { onMounted, ref } from 'vue';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
-import CopyInput from '@/components/CopyInput.vue';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useRootStore } from '@/stores/root.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
-import { DOCS_DOMAIN, MODAL_CONFIRM } from '@/constants';
+import { API_KEY_CREATE_OR_EDIT_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import { useUIStore } from '@/stores/ui.store';
+import { useApiKeysStore } from '@/stores/apiKeys.store';
+import { storeToRefs } from 'pinia';
 
 const settingsStore = useSettingsStore();
+const uiStore = useUIStore();
 const cloudPlanStore = useCloudPlanStore();
-const { baseUrl } = useRootStore();
 
 const { showError, showMessage } = useToast();
 const { confirm } = useMessage();
@@ -26,33 +26,45 @@ const { goToUpgrade } = usePageRedirectionHelper();
 const telemetry = useTelemetry();
 
 const loading = ref(false);
-const mounted = ref(false);
-const apiKeys = ref<ApiKey[]>([]);
-const apiDocsURL = ref('');
+const apiKeysStore = useApiKeysStore();
+const { getAndCacheApiKeys, deleteApiKey } = apiKeysStore;
+const { apiKeysSortByCreationDate } = storeToRefs(apiKeysStore);
 
-const { isPublicApiEnabled, isSwaggerUIEnabled, publicApiPath, publicApiLatestVersion } =
-	settingsStore;
+const { isPublicApiEnabled } = settingsStore;
 
-const isRedactedApiKey = computed((): boolean => {
-	if (!apiKeys.value) return false;
-	return apiKeys.value[0].apiKey.includes('*');
-});
+const onCreateApiKey = async () => {
+	telemetry.track('User clicked create API key button');
 
-onMounted(() => {
+	uiStore.openModalWithData({
+		name: API_KEY_CREATE_OR_EDIT_MODAL_KEY,
+		data: { mode: 'new' },
+	});
+};
+
+onMounted(async () => {
 	documentTitle.set(i18n.baseText('settings.api'));
+
 	if (!isPublicApiEnabled) return;
 
-	void getApiKeys();
-	apiDocsURL.value = isSwaggerUIEnabled
-		? `${baseUrl}${publicApiPath}/v${publicApiLatestVersion}/docs`
-		: `https://${DOCS_DOMAIN}/api/api-reference/`;
+	await getApiKeys();
 });
 
 function onUpgrade() {
 	void goToUpgrade('settings-n8n-api', 'upgrade-api', 'redirect');
 }
 
-async function showDeleteModal() {
+async function getApiKeys() {
+	try {
+		loading.value = true;
+		await getAndCacheApiKeys();
+	} catch (error) {
+		showError(error, i18n.baseText('settings.api.view.error'));
+	} finally {
+		loading.value = false;
+	}
+}
+
+async function onDelete(id: string) {
 	const confirmed = await confirm(
 		i18n.baseText('settings.api.delete.description'),
 		i18n.baseText('settings.api.delete.title'),
@@ -61,52 +73,27 @@ async function showDeleteModal() {
 			cancelButtonText: i18n.baseText('generic.cancel'),
 		},
 	);
+
 	if (confirmed === MODAL_CONFIRM) {
-		await deleteApiKey();
+		try {
+			await deleteApiKey(id);
+			showMessage({
+				title: i18n.baseText('settings.api.delete.toast'),
+				type: 'success',
+			});
+		} catch (e) {
+			showError(e, i18n.baseText('settings.api.delete.error'));
+		} finally {
+			telemetry.track('User clicked delete API key button');
+		}
 	}
 }
 
-async function getApiKeys() {
-	try {
-		apiKeys.value = await settingsStore.getApiKeys();
-	} catch (error) {
-		showError(error, i18n.baseText('settings.api.view.error'));
-	} finally {
-		mounted.value = true;
-	}
-}
-
-async function createApiKey() {
-	loading.value = true;
-
-	try {
-		const newApiKey = await settingsStore.createApiKey();
-		apiKeys.value.push(newApiKey);
-	} catch (error) {
-		showError(error, i18n.baseText('settings.api.create.error'));
-	} finally {
-		loading.value = false;
-		telemetry.track('User clicked create API key button');
-	}
-}
-
-async function deleteApiKey() {
-	try {
-		await settingsStore.deleteApiKey(apiKeys.value[0].id);
-		showMessage({
-			title: i18n.baseText('settings.api.delete.toast'),
-			type: 'success',
-		});
-		apiKeys.value = [];
-	} catch (error) {
-		showError(error, i18n.baseText('settings.api.delete.error'));
-	} finally {
-		telemetry.track('User clicked delete API key button');
-	}
-}
-
-function onCopy() {
-	telemetry.track('User clicked copy API key button');
+function onEdit(id: string) {
+	uiStore.openModalWithData({
+		name: API_KEY_CREATE_OR_EDIT_MODAL_KEY,
+		data: { mode: 'edit', activeId: id },
+	});
 }
 </script>
 
@@ -120,62 +107,29 @@ function onCopy() {
 				</span>
 			</n8n-heading>
 		</div>
+		<template v-if="apiKeysSortByCreationDate.length">
+			<el-row
+				v-for="apiKey in apiKeysSortByCreationDate"
+				:key="apiKey.id"
+				:gutter="10"
+				:class="$style.destinationItem"
+			>
+				<el-col>
+					<ApiKeyCard :api-key="apiKey" @delete="onDelete" @edit="onEdit" />
+				</el-col>
+			</el-row>
 
-		<div v-if="apiKeys.length">
-			<p class="mb-s">
-				<n8n-info-tip :bold="false">
-					<i18n-t keypath="settings.api.view.info" tag="span">
-						<template #apiAction>
-							<a
-								href="https://docs.n8n.io/api"
-								target="_blank"
-								v-text="i18n.baseText('settings.api.view.info.api')"
-							/>
-						</template>
-						<template #webhookAction>
-							<a
-								href="https://docs.n8n.io/integrations/core-nodes/n8n-nodes-base.webhook/"
-								target="_blank"
-								v-text="i18n.baseText('settings.api.view.info.webhook')"
-							/>
-						</template>
-					</i18n-t>
-				</n8n-info-tip>
-			</p>
-			<n8n-card class="mb-4xs" :class="$style.card">
-				<span :class="$style.delete">
-					<n8n-link :bold="true" @click="showDeleteModal">
-						{{ i18n.baseText('generic.delete') }}
-					</n8n-link>
-				</span>
-
-				<div>
-					<CopyInput
-						:label="apiKeys[0].label"
-						:value="apiKeys[0].apiKey"
-						:copy-button-text="i18n.baseText('generic.clickToCopy')"
-						:toast-title="i18n.baseText('settings.api.view.copy.toast')"
-						:redact-value="true"
-						:disable-copy="isRedactedApiKey"
-						:hint="!isRedactedApiKey ? i18n.baseText('settings.api.view.copy') : ''"
-						@copy="onCopy"
-					/>
-				</div>
-			</n8n-card>
-			<div :class="$style.hint">
-				<n8n-text size="small">
-					{{ i18n.baseText(`settings.api.view.${isSwaggerUIEnabled ? 'tryapi' : 'more-details'}`) }}
-				</n8n-text>
-				{{ ' ' }}
-				<n8n-link :to="apiDocsURL" :new-window="true" size="small">
-					{{
-						i18n.baseText(
-							`settings.api.view.${isSwaggerUIEnabled ? 'apiPlayground' : 'external-docs'}`,
-						)
-					}}
-				</n8n-link>
+			<div class="mt-m text-right">
+				<n8n-button
+					size="large"
+					:disabled="!apiKeysStore.canAddMoreApiKeys"
+					@click="onCreateApiKey"
+				>
+					{{ i18n.baseText('settings.api.create.button') }}
+				</n8n-button>
 			</div>
-		</div>
+		</template>
+
 		<n8n-action-box
 			v-else-if="!isPublicApiEnabled && cloudPlanStore.userIsTrialing"
 			data-test-id="public-api-upgrade-cta"
@@ -185,27 +139,22 @@ function onCopy() {
 			@click:button="onUpgrade"
 		/>
 		<n8n-action-box
-			v-else-if="mounted && !cloudPlanStore.state.loadingPlan"
+			v-if="isPublicApiEnabled && !apiKeysSortByCreationDate.length"
 			:button-text="
 				i18n.baseText(loading ? 'settings.api.create.button.loading' : 'settings.api.create.button')
 			"
 			:description="i18n.baseText('settings.api.create.description')"
-			@click:button="createApiKey"
+			@click:button="onCreateApiKey"
 		/>
 	</div>
 </template>
 
 <style lang="scss" module>
-.container {
-	> * {
-		margin-bottom: var(--spacing-2xl);
-	}
-}
-
 .header {
 	display: flex;
 	align-items: center;
 	white-space: nowrap;
+	margin-bottom: var(--spacing-2xl);
 
 	*:first-child {
 		flex-grow: 1;
@@ -216,6 +165,10 @@ function onCopy() {
 	position: relative;
 }
 
+.destinationItem {
+	margin-bottom: var(--spacing-2xs);
+}
+
 .delete {
 	position: absolute;
 	display: inline-block;
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
index 2177ece229..95a49ea2aa 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
@@ -8,18 +8,17 @@ import { useAnnotationTagsStore } from '@/stores/tags.store';
 import { useDebounce } from '@/composables/useDebounce';
 import { useTestDefinitionForm } from '@/components/TestDefinition/composables/useTestDefinitionForm';
 
-import EvaluationHeader from '@/components/TestDefinition/EditDefinition/EvaluationHeader.vue';
-import DescriptionInput from '@/components/TestDefinition/EditDefinition/DescriptionInput.vue';
-import EvaluationStep from '@/components/TestDefinition/EditDefinition/EvaluationStep.vue';
-import TagsInput from '@/components/TestDefinition/EditDefinition/TagsInput.vue';
-import WorkflowSelector from '@/components/TestDefinition/EditDefinition/WorkflowSelector.vue';
-import MetricsInput from '@/components/TestDefinition/EditDefinition/MetricsInput.vue';
+import HeaderSection from '@/components/TestDefinition/EditDefinition/sections/HeaderSection.vue';
+import RunsSection from '@/components/TestDefinition/EditDefinition/sections/RunsSection.vue';
 import type { TestMetricRecord, TestRunRecord } from '@/api/testDefinition.ee';
-import Modal from '@/components/Modal.vue';
-import type { ModalState } from '@/Interface';
 import { useUIStore } from '@/stores/ui.store';
-import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import ConfigSection from '@/components/TestDefinition/EditDefinition/sections/ConfigSection.vue';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useRootStore } from '@/stores/root.store';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import type { IPinData } from 'n8n-workflow';
 
 const props = defineProps<{
 	testId?: string;
@@ -33,9 +32,13 @@ const toast = useToast();
 const testDefinitionStore = useTestDefinitionStore();
 const tagsStore = useAnnotationTagsStore();
 const uiStore = useUIStore();
+const telemetry = useTelemetry();
+const executionsStore = useExecutionsStore();
+const workflowStore = useWorkflowsStore();
+
 const {
 	state,
-	fieldsIssues,
+	isSaving,
 	cancelEditing,
 	loadTestData,
 	createTest,
@@ -52,13 +55,17 @@ const allTags = computed(() => tagsStore.allTags);
 const tagsById = computed(() => tagsStore.tagsById);
 const testId = computed(() => props.testId ?? (route.params.testId as string));
 const currentWorkflowId = computed(() => route.params.name as string);
-
+const appliedTheme = computed(() => uiStore.appliedTheme);
 const tagUsageCount = computed(
 	() => tagsStore.tagsById[state.value.tags.value[0]]?.usageCount ?? 0,
 );
+const workflowName = computed(() => workflowStore.workflow.name);
+const hasRuns = computed(() => runs.value.length > 0);
+const fieldsIssues = computed(() => testDefinitionStore.getFieldIssues(testId.value) ?? []);
 
-const nodePinningModal = ref<ModalState | null>(null);
-const modalContentWidth = ref(0);
+const showConfig = ref(true);
+const selectedMetric = ref<string>('');
+const examplePinnedData = ref<IPinData>({});
 
 onMounted(async () => {
 	if (!testDefinitionStore.isFeatureEnabled) {
@@ -73,7 +80,6 @@ onMounted(async () => {
 		});
 		return; // Add early return to prevent loading if feature is disabled
 	}
-	void tagsStore.fetchAll({ withUsageCount: true });
 	if (testId.value) {
 		await loadTestData(testId.value);
 	} else {
@@ -94,14 +100,26 @@ async function onSaveTest() {
 				name: VIEWS.TEST_DEFINITION_EDIT,
 				params: { testId: savedTest.id },
 			});
+
+			telemetry.track(
+				'User created test',
+				{
+					test_id: savedTest.id,
+					workflow_id: currentWorkflowId.value,
+					session_id: useRootStore().pushRef,
+				},
+				{
+					withPostHog: true,
+				},
+			);
 		}
 	} catch (e: unknown) {
 		toast.showError(e, locale.baseText('testDefinition.edit.testSaveFailed'));
 	}
 }
 
-function hasIssues(key: string) {
-	return fieldsIssues.value.some((issue) => issue.field === key);
+function getFieldIssues(key: string) {
+	return fieldsIssues.value.filter((issue) => issue.field === key);
 }
 
 async function onDeleteMetric(deletedMetric: Partial<TestMetricRecord>) {
@@ -135,21 +153,51 @@ const runs = computed(() =>
 	),
 );
 
-async function onDeleteRuns(runs: TestRunRecord[]) {
+const isRunning = computed(() => runs.value.some((run) => run.status === 'running'));
+const isRunTestEnabled = computed(() => fieldsIssues.value.length === 0 && !isRunning.value);
+
+async function onDeleteRuns(toDelete: TestRunRecord[]) {
 	await Promise.all(
-		runs.map(async (run) => {
+		toDelete.map(async (run) => {
 			await testDefinitionStore.deleteTestRun({ testDefinitionId: testId.value, runId: run.id });
 		}),
 	);
 }
 
+function toggleConfig() {
+	showConfig.value = !showConfig.value;
+}
+
+async function getExamplePinnedDataForTags() {
+	const evaluationWorkflowExecutions = await executionsStore.fetchExecutions({
+		workflowId: currentWorkflowId.value,
+		annotationTags: state.value.tags.value,
+	});
+	if (evaluationWorkflowExecutions.count > 0) {
+		const firstExecution = evaluationWorkflowExecutions.results[0];
+		const executionData = await executionsStore.fetchExecution(firstExecution.id);
+		const resultData = executionData?.data?.resultData.runData;
+
+		examplePinnedData.value = {
+			'When called by a test run': [
+				{
+					json: {
+						originalExecution: resultData,
+						newExecution: resultData,
+					},
+				},
+			],
+		};
+	}
+}
+
 // Debounced watchers for auto-saving
 watch(
 	() => state.value.metrics,
 	debounce(async () => await updateMetrics(testId.value), { debounceTime: 400 }),
 	{ deep: true },
 );
-
+watch(() => state.value.tags, getExamplePinnedDataForTags);
 watch(
 	() => [
 		state.value.description,
@@ -164,279 +212,93 @@ watch(
 </script>
 
 <template>
-	<div :class="$style.container">
-		<div :class="$style.formContent">
-			<!-- Name -->
-			<EvaluationHeader
-				v-model="state.name"
-				:class="{ 'has-issues': hasIssues('name') }"
-				:start-editing="startEditing"
-				:save-changes="saveChanges"
-				:handle-keydown="handleKeydown"
-			/>
-			<div :class="$style.panelBlock">
-				<!-- Description -->
-				<EvaluationStep
-					:class="$style.step"
-					:title="locale.baseText('testDefinition.edit.description')"
-					:expanded="false"
-					:tooltip="locale.baseText('testDefinition.edit.description.tooltip')"
-				>
-					<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
-					<template #cardContent>
-						<DescriptionInput v-model="state.description" />
-					</template>
-				</EvaluationStep>
+	<div :class="[$style.container, { [$style.noRuns]: !hasRuns }]">
+		<HeaderSection
+			v-model:name="state.name"
+			v-model:description="state.description"
+			v-model:tags="state.tags"
+			:has-runs="hasRuns"
+			:is-saving="isSaving"
+			:get-field-issues="getFieldIssues"
+			:start-editing="startEditing"
+			:save-changes="saveChanges"
+			:handle-keydown="handleKeydown"
+			:on-save-test="onSaveTest"
+			:run-test="runTest"
+			:show-config="showConfig"
+			:toggle-config="toggleConfig"
+			:run-test-enabled="isRunTestEnabled"
+		>
+			<template #runTestTooltip>
+				<template v-if="fieldsIssues.length > 0">
+					<div>{{ locale.baseText('testDefinition.completeConfig') }}</div>
+					<div v-for="issue in fieldsIssues" :key="issue.field">- {{ issue.message }}</div>
+				</template>
+				<template v-if="isRunning">
+					{{ locale.baseText('testDefinition.testIsRunning') }}
+				</template>
+			</template>
+		</HeaderSection>
 
-				<div :class="$style.panelIntro">
-					{{ locale.baseText('testDefinition.edit.step.intro') }}
-				</div>
-				<BlockArrow :class="$style.introArrow" />
-				<!-- Select Executions -->
-				<EvaluationStep
-					:class="$style.step"
-					:title="
-						locale.baseText('testDefinition.edit.step.executions', {
-							adjustToNumber: tagUsageCount,
-						})
-					"
-					:tooltip="locale.baseText('testDefinition.edit.step.executions.tooltip')"
-				>
-					<template #icon><font-awesome-icon icon="history" size="lg" /></template>
-					<template #cardContent>
-						<TagsInput
-							v-model="state.tags"
-							:class="{ 'has-issues': hasIssues('tags') }"
-							:all-tags="allTags"
-							:tags-by-id="tagsById"
-							:is-loading="isLoading"
-							:start-editing="startEditing"
-							:save-changes="saveChanges"
-							:cancel-editing="cancelEditing"
-							:create-tag="handleCreateTag"
-						/>
-					</template>
-				</EvaluationStep>
-				<div :class="$style.evaluationArrows">
-					<BlockArrow />
-					<BlockArrow />
-				</div>
-
-				<!-- Mocked Nodes -->
-				<EvaluationStep
-					:class="$style.step"
-					:title="
-						locale.baseText('testDefinition.edit.step.mockedNodes', {
-							adjustToNumber: state.mockedNodes?.length ?? 0,
-						})
-					"
-					:small="true"
-					:expanded="true"
-					:tooltip="locale.baseText('testDefinition.edit.step.nodes.tooltip')"
-				>
-					<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
-					<template #cardContent>
-						<n8n-button
-							size="small"
-							data-test-id="select-nodes-button"
-							:label="locale.baseText('testDefinition.edit.selectNodes')"
-							type="tertiary"
-							@click="openPinningModal"
-						/>
-					</template>
-				</EvaluationStep>
-
-				<!-- Re-run Executions -->
-				<EvaluationStep
-					:class="$style.step"
-					:title="locale.baseText('testDefinition.edit.step.reRunExecutions')"
-					:small="true"
-					:tooltip="locale.baseText('testDefinition.edit.step.reRunExecutions.tooltip')"
-				>
-					<template #icon><font-awesome-icon icon="redo" size="lg" /></template>
-				</EvaluationStep>
-
-				<!-- Compare Executions -->
-				<EvaluationStep
-					:class="$style.step"
-					:title="locale.baseText('testDefinition.edit.step.compareExecutions')"
-					:tooltip="locale.baseText('testDefinition.edit.step.compareExecutions.tooltip')"
-				>
-					<template #icon><font-awesome-icon icon="equals" size="lg" /></template>
-					<template #cardContent>
-						<WorkflowSelector
-							v-model="state.evaluationWorkflow"
-							:class="{ 'has-issues': hasIssues('evaluationWorkflow') }"
-						/>
-					</template>
-				</EvaluationStep>
-
-				<!-- Metrics -->
-				<EvaluationStep
-					:class="$style.step"
-					:title="locale.baseText('testDefinition.edit.step.metrics')"
-					:tooltip="locale.baseText('testDefinition.edit.step.metrics.tooltip')"
-				>
-					<template #icon><font-awesome-icon icon="chart-bar" size="lg" /></template>
-					<template #cardContent>
-						<MetricsInput
-							v-model="state.metrics"
-							:class="{ 'has-issues': hasIssues('metrics') }"
-							@delete-metric="onDeleteMetric"
-						/>
-					</template>
-				</EvaluationStep>
-			</div>
-
-			<n8n-button
-				v-if="state.evaluationWorkflow.value && state.tags.value.length > 0"
-				:class="$style.runTestButton"
-				size="small"
-				data-test-id="run-test-button"
-				:label="locale.baseText('testDefinition.runTest')"
-				type="primary"
-				@click="runTest"
-			/>
-			<n8n-button
-				v-else
-				:class="$style.runTestButton"
-				size="small"
-				data-test-id="run-test-button"
-				:label="'Save Test'"
-				type="primary"
-				@click="onSaveTest"
-			/>
-		</div>
-		<!-- Past Runs Table -->
-		<div v-if="runs.length > 0" :class="$style.runsTable">
-			<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
-				locale.baseText('testDefinition.edit.pastRuns')
-			}}</N8nHeading>
-			<TestRunsTable
+		<div :class="$style.content">
+			<RunsSection
+				v-if="runs.length > 0"
+				v-model:selectedMetric="selectedMetric"
 				:runs="runs"
-				:selectable="true"
-				data-test-id="past-runs-table"
+				:test-id="testId"
+				:applied-theme="appliedTheme"
 				@delete-runs="onDeleteRuns"
 			/>
-		</div>
 
-		<Modal ref="nodePinningModal" width="80vw" height="85vh" :name="NODE_PINNING_MODAL_KEY">
-			<template #header>
-				<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
-					locale.baseText('testDefinition.edit.selectNodes')
-				}}</N8nHeading>
-			</template>
-			<template #content>
-				<NodesPinning
-					v-model="state.mockedNodes"
-					:width="modalContentWidth"
-					data-test-id="nodes-pinning-modal"
-				/>
-			</template>
-		</Modal>
+			<ConfigSection
+				v-model:tags="state.tags"
+				v-model:evaluationWorkflow="state.evaluationWorkflow"
+				v-model:metrics="state.metrics"
+				v-model:mockedNodes="state.mockedNodes"
+				:cancel-editing="cancelEditing"
+				:show-config="showConfig"
+				:tag-usage-count="tagUsageCount"
+				:all-tags="allTags"
+				:tags-by-id="tagsById"
+				:is-loading="isLoading"
+				:get-field-issues="getFieldIssues"
+				:start-editing="startEditing"
+				:save-changes="saveChanges"
+				:create-tag="handleCreateTag"
+				:example-pinned-data="examplePinnedData"
+				:sample-workflow-name="workflowName"
+				@open-pinning-modal="openPinningModal"
+				@delete-metric="onDeleteMetric"
+			/>
+		</div>
 	</div>
 </template>
 
 <style module lang="scss">
 .container {
-	width: 100%;
+	--evaluation-edit-panel-width: 24rem;
+	--metrics-chart-height: 10rem;
 	height: 100%;
-	overflow: hidden;
-	padding: var(--spacing-s);
-	display: grid;
-	grid-template-columns: minmax(auto, 24rem) 1fr;
-	gap: var(--spacing-2xl);
-}
-
-.formContent {
-	width: 100%;
-	min-width: fit-content;
-	padding-bottom: 10px;
-	overflow: hidden;
 	display: flex;
 	flex-direction: column;
-}
-.runsTableTotal {
-	display: block;
-	margin-bottom: var(--spacing-xs);
-}
-.runsTable {
-	flex-shrink: 1;
-	max-width: 100%;
-	max-height: 80vh;
-	overflow: auto;
-}
-.runsTableHeading {
-	display: block;
-	margin-bottom: var(--spacing-xl);
-}
-.panelBlock {
-	max-width: var(--evaluation-edit-panel-width, 24rem);
-	display: grid;
-	overflow-y: auto;
-	min-height: 0;
-}
-.panelIntro {
-	font-size: var(--font-size-m);
-	color: var(--color-text-dark);
-	margin-top: var(--spacing-s);
-	justify-self: center;
-	position: relative;
-	display: block;
-}
-.step {
-	position: relative;
 
-	&:not(:first-child) {
-		margin-top: var(--spacing-m);
+	@media (min-height: 56rem) {
+		--metrics-chart-height: 16rem;
+	}
+
+	@include mixins.breakpoint('lg-and-up') {
+		--evaluation-edit-panel-width: 30rem;
 	}
 }
-.introArrow {
-	--arrow-height: 1.5rem;
-	justify-self: center;
-}
-.evaluationArrows {
-	--arrow-height: 13.8rem;
+
+.content {
 	display: flex;
-	justify-content: space-between;
-	width: 100%;
-	max-width: 80%;
-	margin: 0 auto;
-	margin-bottom: -100%;
-	z-index: 0;
-}
-.footer {
-	margin-top: var(--spacing-xl);
-	display: flex;
-	justify-content: flex-start;
-}
+	overflow-y: hidden;
+	position: relative;
 
-.workflow {
-	padding: var(--spacing-l);
-	background-color: var(--color-background-light);
-	border-radius: var(--border-radius-large);
-	border: var(--border-base);
-}
-
-.workflowSteps {
-	display: grid;
-	gap: var(--spacing-2xs);
-	max-width: 42rem;
-	margin: 0 auto;
-}
-
-.sideBySide {
-	display: grid;
-	grid-template-columns: 1fr auto 1fr;
-	gap: var(--spacing-2xs);
-	justify-items: end;
-	align-items: start;
-}
-.mockedNodesLabel {
-	min-height: 1.5rem;
-	display: block;
-}
-.runTestButton {
-	margin-top: var(--spacing-m);
+	.noRuns & {
+		justify-content: center;
+		overflow-y: auto;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
index d32516d4bb..5742060df4 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
@@ -1,15 +1,20 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { VIEWS } from '@/constants';
+import { MODAL_CONFIRM, VIEWS } from '@/constants';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import EmptyState from '@/components/TestDefinition/ListDefinition/EmptyState.vue';
 import TestsList from '@/components/TestDefinition/ListDefinition/TestsList.vue';
-import type { TestExecution, TestListItem } from '@/components/TestDefinition/types';
+import type {
+	TestExecution,
+	TestItemAction,
+	TestListItem,
+} from '@/components/TestDefinition/types';
 import { useAnnotationTagsStore } from '@/stores/tags.store';
 import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+import { useMessage } from '@/composables/useMessage';
 
 const router = useRouter();
 const tagsStore = useAnnotationTagsStore();
@@ -17,6 +22,46 @@ const testDefinitionStore = useTestDefinitionStore();
 const isLoading = ref(false);
 const toast = useToast();
 const locale = useI18n();
+const { confirm } = useMessage();
+
+const actions = computed<TestItemAction[]>(() => [
+	{
+		icon: 'play',
+		id: 'run',
+		event: onRunTest,
+		disabled: isRunDisabled,
+		show: (testId) => !isTestRunning(testId),
+		tooltip: (testId) =>
+			isRunDisabled(testId)
+				? getDisabledRunTooltip(testId)
+				: locale.baseText('testDefinition.runTest'),
+	},
+	{
+		icon: 'stop',
+		id: 'cancel',
+		event: onCancelTestRun,
+		tooltip: () => locale.baseText('testDefinition.cancelTestRun'),
+		show: (testId) => isTestRunning(testId),
+	},
+	{
+		icon: 'list',
+		id: 'view',
+		event: onViewDetails,
+		tooltip: () => locale.baseText('testDefinition.viewDetails'),
+	},
+	{
+		icon: 'pen',
+		id: 'edit',
+		event: onEditTest,
+		tooltip: () => locale.baseText('testDefinition.editTest'),
+	},
+	{
+		icon: 'trash',
+		id: 'delete',
+		event: onDeleteTest,
+		tooltip: () => locale.baseText('testDefinition.deleteTest'),
+	},
+]);
 
 const tests = computed<TestListItem[]>(() => {
 	return (
@@ -32,6 +77,7 @@ const tests = computed<TestListItem[]>(() => {
 			tagName: test.annotationTagId ? getTagName(test.annotationTagId) : '',
 			testCases: testDefinitionStore.testRunsByTestId[test.id]?.length ?? 0,
 			execution: getTestExecution(test.id),
+			fieldsIssues: testDefinitionStore.getFieldIssues(test.id),
 		}));
 });
 
@@ -43,11 +89,20 @@ function getTagName(tagId: string) {
 
 	return matchingTag?.name ?? '';
 }
+function getDisabledRunTooltip(testId: string) {
+	const issues = testDefinitionStore
+		.getFieldIssues(testId)
+		?.map((i) => i.message)
+		.join('<br />- ');
+
+	return `${locale.baseText('testDefinition.completeConfig')} <br /> - ${issues}`;
+}
 
 function getTestExecution(testId: string): TestExecution {
 	const lastRun = testDefinitionStore.lastRunByTestId[testId];
 	if (!lastRun) {
 		return {
+			id: null,
 			lastRun: null,
 			errorRate: 0,
 			metrics: {},
@@ -56,6 +111,7 @@ function getTestExecution(testId: string): TestExecution {
 	}
 
 	const mockExecutions = {
+		id: lastRun.id,
 		lastRun: lastRun.updatedAt ?? '',
 		errorRate: 0,
 		metrics: lastRun.metrics ?? {},
@@ -65,6 +121,13 @@ function getTestExecution(testId: string): TestExecution {
 	return mockExecutions;
 }
 
+function isTestRunning(testId: string) {
+	return testDefinitionStore.lastRunByTestId[testId]?.status === 'running';
+}
+
+function isRunDisabled(testId: string) {
+	return testDefinitionStore.getFieldIssues(testId)?.length > 0;
+}
 // Action handlers
 function onCreateTest() {
 	void router.push({ name: VIEWS.NEW_TEST_DEFINITION });
@@ -89,15 +152,54 @@ async function onRunTest(testId: string) {
 	}
 }
 
+async function onCancelTestRun(testId: string) {
+	try {
+		const testRunId = testDefinitionStore.lastRunByTestId[testId]?.id;
+		// FIXME: testRunId might be null for a short period of time between user clicking start and the test run being created and fetched. Just ignore it for now.
+		if (!testRunId) {
+			throw new Error('Failed to cancel test run');
+		}
+
+		const result = await testDefinitionStore.cancelTestRun(testId, testRunId);
+		if (result.success) {
+			toast.showMessage({
+				title: locale.baseText('testDefinition.list.testCancelled'),
+				type: 'success',
+			});
+
+			// Optionally fetch the updated test runs
+			await testDefinitionStore.fetchTestRuns(testId);
+		} else {
+			throw new Error('Failed to cancel test run');
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('testDefinition.list.testStartError'));
+	}
+}
+
 async function onViewDetails(testId: string) {
 	void router.push({ name: VIEWS.TEST_DEFINITION_RUNS, params: { testId } });
 }
 
-function onEditTest(testId: number) {
+function onEditTest(testId: string) {
 	void router.push({ name: VIEWS.TEST_DEFINITION_EDIT, params: { testId } });
 }
 
 async function onDeleteTest(testId: string) {
+	const deleteConfirmed = await confirm(
+		locale.baseText('testDefinition.deleteTest.warning'),
+		locale.baseText('testDefinition.deleteTest'),
+		{
+			type: 'warning',
+			confirmButtonText: locale.baseText('generic.delete'),
+			cancelButtonText: locale.baseText('generic.cancel'),
+			closeOnClickModal: true,
+		},
+	);
+
+	if (deleteConfirmed !== MODAL_CONFIRM) {
+		return;
+	}
 	await testDefinitionStore.deleteById(testId);
 
 	toast.showMessage({
@@ -112,12 +214,9 @@ async function loadInitialData() {
 		// Add guard to prevent multiple loading states
 		isLoading.value = true;
 		try {
-			await Promise.all([
-				tagsStore.fetchAll(),
-				testDefinitionStore.fetchAll({
-					workflowId: router.currentRoute.value.params.name as string,
-				}),
-			]);
+			await testDefinitionStore.fetchAll({
+				workflowId: router.currentRoute.value.params.name as string,
+			});
 			isLoading.value = false;
 		} catch (error) {
 			toast.showError(error, locale.baseText('testDefinition.list.loadError'));
@@ -127,7 +226,7 @@ async function loadInitialData() {
 	}
 }
 
-onMounted(() => {
+onMounted(async () => {
 	if (!testDefinitionStore.isFeatureEnabled) {
 		toast.showMessage({
 			title: locale.baseText('testDefinition.notImplemented'),
@@ -140,8 +239,8 @@ onMounted(() => {
 		});
 		return; // Add early return to prevent loading if feature is disabled
 	}
-
-	void loadInitialData();
+	await loadInitialData();
+	tests.value.forEach((test) => testDefinitionStore.updateRunFieldIssues(test.id));
 });
 </script>
 
@@ -160,21 +259,19 @@ onMounted(() => {
 			<TestsList
 				v-else
 				:tests="tests"
-				@create-test="onCreateTest"
-				@run-test="onRunTest"
+				:actions="actions"
 				@view-details="onViewDetails"
-				@edit-test="onEditTest"
-				@delete-test="onDeleteTest"
+				@create-test="onCreateTest"
 			/>
 		</template>
 	</div>
 </template>
 <style module lang="scss">
 .container {
-	padding: var(--spacing-xl) var(--spacing-l);
 	height: 100%;
 	width: 100%;
 	max-width: var(--content-container-width);
+	margin: auto;
 }
 .loading {
 	display: flex;
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
new file mode 100644
index 0000000000..ace36b6814
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useRouter } from 'vue-router';
+import { onMounted } from 'vue';
+const router = useRouter();
+const workflowHelpers = useWorkflowHelpers({ router });
+const workflowStore = useWorkflowsStore();
+
+async function initWorkflow() {
+	const workflowId = router.currentRoute.value.params.name as string;
+	const isAlreadyInitialized = workflowStore.workflow.id === workflowId;
+
+	if (isAlreadyInitialized) return;
+
+	const workflow = await workflowStore.fetchWorkflow(workflowId);
+	void workflowHelpers.initState(workflow);
+}
+
+onMounted(initWorkflow);
+</script>
+
+<template>
+	<div :class="$style.evaluationsView">
+		<router-view />
+	</div>
+</template>
+
+<style module lang="scss">
+.evaluationsView {
+	width: 100%;
+	height: 100%;
+	margin: auto;
+	padding: var(--spacing-xl) var(--spacing-l);
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
index 48c7ca8dc7..faa648f398 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
@@ -5,53 +5,50 @@ import { useRouter } from 'vue-router';
 import { convertToDisplayDate } from '@/utils/typesUtils';
 import { useI18n } from '@/composables/useI18n';
 import { N8nCard, N8nText } from 'n8n-design-system';
-import TestDefinitionTable from '@/components/TestDefinition/shared/TestDefinitionTable.vue';
-import type { TestDefinitionTableColumn } from '@/components/TestDefinition/shared/TestDefinitionTable.vue';
-import { useExecutionsStore } from '@/stores/executions.store';
-import { get } from 'lodash-es';
-import type { ExecutionSummaryWithScopes } from '@/Interface';
+import TestTableBase from '@/components/TestDefinition/shared/TestTableBase.vue';
+import type { TestTableColumn } from '@/components/TestDefinition/shared/TestTableBase.vue';
 import { VIEWS } from '@/constants';
-import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useToast } from '@/composables/useToast';
-
-interface TestCase extends ExecutionSummaryWithScopes {
-	metrics: Record<string, number>;
-}
+import type { TestCaseExecutionRecord } from '@/api/testDefinition.ee';
 
 const router = useRouter();
 const toast = useToast();
 const testDefinitionStore = useTestDefinitionStore();
-const executionsStore = useExecutionsStore();
-const workflowStore = useWorkflowsStore();
 const locale = useI18n();
 
 const isLoading = ref(true);
-const testCases = ref<TestCase[]>([]);
+const testCases = ref<TestCaseExecutionRecord[]>([]);
 
 const runId = computed(() => router.currentRoute.value.params.runId as string);
 const testId = computed(() => router.currentRoute.value.params.testId as string);
 
 const run = computed(() => testDefinitionStore.testRunsById[runId.value]);
 const test = computed(() => testDefinitionStore.testDefinitionsById[testId.value]);
-const workflow = computed(
-	() => workflowStore.workflowsById[test.value?.evaluationWorkflowId ?? ''],
-);
 const filteredTestCases = computed(() => {
 	return testCases.value;
 });
 
 const columns = computed(
-	(): Array<TestDefinitionTableColumn<TestCase>> => [
+	(): Array<TestTableColumn<TestCaseExecutionRecord>> => [
 		{
 			prop: 'id',
 			width: 200,
 			label: locale.baseText('testDefinition.runDetail.testCase'),
 			sortable: true,
-			route: (row: TestCase) => ({
-				name: VIEWS.EXECUTION_PREVIEW,
-				params: { name: row.workflowId, executionId: row.id },
-			}),
-			formatter: (row: TestCase) => `[${row.id}] ${workflow.value?.name}`,
+			route: (row: TestCaseExecutionRecord) => {
+				if (test.value?.evaluationWorkflowId && row.evaluationExecutionId) {
+					return {
+						name: VIEWS.EXECUTION_PREVIEW,
+						params: {
+							name: test.value?.evaluationWorkflowId,
+							executionId: row.evaluationExecutionId,
+						},
+					};
+				}
+
+				return undefined;
+			},
+			formatter: (row: TestCaseExecutionRecord) => `${row.id}`,
 			openInNewTab: true,
 		},
 		{
@@ -63,14 +60,14 @@ const columns = computed(
 				{ text: locale.baseText('testDefinition.listRuns.status.success'), value: 'success' },
 				{ text: locale.baseText('testDefinition.listRuns.status.error'), value: 'error' },
 			],
-			filterMethod: (value: string, row: TestCase) => row.status === value,
+			filterMethod: (value: string, row: TestCaseExecutionRecord) => row.status === value,
 		},
 		...Object.keys(run.value?.metrics ?? {}).map((metric) => ({
 			prop: `metrics.${metric}`,
 			label: metric,
 			sortable: true,
 			filter: true,
-			formatter: (row: TestCase) => row.metrics[metric]?.toFixed(2) ?? '-',
+			formatter: (row: TestCaseExecutionRecord) => row.metrics?.[metric]?.toFixed(2) ?? '-',
 		})),
 	],
 );
@@ -78,57 +75,24 @@ const columns = computed(
 const metrics = computed(() => run.value?.metrics ?? {});
 
 // Temporary workaround to fetch test cases by manually getting workflow executions
-// TODO: Replace with dedicated API endpoint once available
 const fetchExecutionTestCases = async () => {
 	if (!runId.value || !testId.value) return;
 
 	isLoading.value = true;
 	try {
+		await testDefinitionStore.fetchTestDefinition(testId.value);
+
 		const testRun = await testDefinitionStore.getTestRun({
 			testDefinitionId: testId.value,
 			runId: runId.value,
 		});
-		const testDefinition = await testDefinitionStore.fetchTestDefinition(testId.value);
 
-		// Fetch workflow executions that match this test run
-		const evaluationWorkflowExecutions = await executionsStore.fetchExecutions({
-			workflowId: testDefinition.evaluationWorkflowId ?? '',
-			metadata: [{ key: 'testRunId', value: testRun.id }],
+		const testCaseEvaluationExecutions = await testDefinitionStore.fetchTestCaseExecutions({
+			testDefinitionId: testId.value,
+			runId: testRun.id,
 		});
 
-		// For each execution, fetch full details and extract metrics
-		const executionsData = await Promise.all(
-			evaluationWorkflowExecutions?.results.map(async (execution) => {
-				const executionData = await executionsStore.fetchExecution(execution.id);
-				const lastExecutedNode = executionData?.data?.resultData?.lastNodeExecuted;
-				if (!lastExecutedNode) {
-					throw new Error('Last executed node is required');
-				}
-				const metricsData = get(
-					executionData,
-					[
-						'data',
-						'resultData',
-						'runData',
-						lastExecutedNode,
-						'0',
-						'data',
-						'main',
-						'0',
-						'0',
-						'json',
-					],
-					{},
-				);
-
-				return {
-					...execution,
-					metrics: metricsData,
-				};
-			}),
-		);
-
-		testCases.value = executionsData ?? [];
+		testCases.value = testCaseEvaluationExecutions ?? [];
 	} catch (error) {
 		toast.showError(error, 'Failed to load run details');
 	} finally {
@@ -198,7 +162,7 @@ onMounted(async () => {
 			<div v-if="isLoading" :class="$style.loading">
 				<n8n-loading :loading="true" :rows="5" />
 			</div>
-			<TestDefinitionTable
+			<TestTableBase
 				v-else
 				:data="filteredTestCases"
 				:columns="columns"
@@ -210,10 +174,10 @@ onMounted(async () => {
 
 <style module lang="scss">
 .container {
-	padding: var(--spacing-xl) var(--spacing-l);
 	height: 100%;
 	width: 100%;
 	max-width: var(--content-container-width);
+	margin: auto;
 }
 
 .backButton {
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
index 26609a0855..1f6ac49d96 100644
--- a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
@@ -4,10 +4,11 @@ import { useRouter } from 'vue-router';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import type { TestRunRecord } from '@/api/testDefinition.ee';
 import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
-import { VIEWS } from '@/constants';
+import { MODAL_CONFIRM, VIEWS } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useUIStore } from '@/stores/ui.store';
+import { useMessage } from '@/composables/useMessage';
 
 const router = useRouter();
 const testDefinitionStore = useTestDefinitionStore();
@@ -75,6 +76,19 @@ async function runTest() {
 }
 
 async function onDeleteRuns(runsToDelete: TestRunRecord[]) {
+	const { confirm } = useMessage();
+
+	const deleteConfirmed = await confirm(locale.baseText('testDefinition.deleteTest'), {
+		type: 'warning',
+		confirmButtonText: locale.baseText(
+			'settings.log-streaming.destinationDelete.confirmButtonText',
+		),
+		cancelButtonText: locale.baseText('settings.log-streaming.destinationDelete.cancelButtonText'),
+	});
+
+	if (deleteConfirmed !== MODAL_CONFIRM) {
+		return;
+	}
 	await Promise.all(
 		runsToDelete.map(async (run) => {
 			await testDefinitionStore.deleteTestRun({ testDefinitionId: testId.value, runId: run.id });
@@ -98,10 +112,10 @@ onMounted(async () => {
 			<N8nLoading :rows="5" />
 			<N8nLoading :rows="10" />
 		</template>
-		<template v-else-if="runs.length > 0">
+		<div v-else-if="runs.length > 0" :class="$style.details">
 			<MetricsChart v-model:selectedMetric="selectedMetric" :runs="runs" :theme="appliedTheme" />
 			<TestRunsTable :runs="runs" @get-run-detail="getRunDetail" @delete-runs="onDeleteRuns" />
-		</template>
+		</div>
 		<template v-else>
 			<N8nActionBox
 				:heading="locale.baseText('testDefinition.listRuns.noRuns')"
@@ -114,16 +128,24 @@ onMounted(async () => {
 </template>
 <style module lang="scss">
 .container {
-	padding: var(--spacing-xl) var(--spacing-l);
 	height: 100%;
 	width: 100%;
 	max-width: var(--content-container-width);
+	margin: auto;
+	display: flex;
+	flex-direction: column;
 }
 .backButton {
 	color: var(--color-text-base);
 }
 .description {
-	margin-top: var(--spacing-xs);
+	margin: var(--spacing-s) 0;
 	display: block;
 }
+.details {
+	display: flex;
+	height: 100%;
+	flex-direction: column;
+	gap: var(--spacing-xl);
+}
 </style>
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
index 2b290701bd..9824dda7d9 100644
--- a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
@@ -75,7 +75,7 @@ describe('TestDefinitionEditView', () => {
 		vi.mocked(useTestDefinitionForm).mockReturnValue({
 			state: ref({
 				name: { value: '', isEditing: false, tempValue: '' },
-				description: '',
+				description: { value: '', isEditing: false, tempValue: '' },
 				tags: { value: [], tempValue: [], isEditing: false },
 				evaluationWorkflow: { mode: 'list', value: '', __rl: true },
 				metrics: [],
@@ -147,21 +147,6 @@ describe('TestDefinitionEditView', () => {
 		expect(createTestMock).toHaveBeenCalled();
 	});
 
-	it('should update test and show success message on save if testId is present', async () => {
-		vi.mocked(useRoute).mockReturnValue({
-			params: { testId: '1' },
-			name: VIEWS.TEST_DEFINITION_EDIT,
-		} as unknown as ReturnType<typeof useRoute>);
-
-		const { getByTestId } = renderComponentWithFeatureEnabled();
-
-		const saveButton = getByTestId('run-test-button');
-		saveButton.click();
-		await nextTick();
-
-		expect(updateTestMock).toHaveBeenCalledWith('1');
-	});
-
 	it('should show error message on failed test creation', async () => {
 		createTestMock.mockRejectedValue(new Error('Save failed'));
 
@@ -180,53 +165,39 @@ describe('TestDefinitionEditView', () => {
 		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
 	});
 
-	it('should display "Save Test" button when editing test without eval workflow and tags', async () => {
+	it('should display disabled "run test" button when editing test without tags', async () => {
 		vi.mocked(useRoute).mockReturnValue({
 			params: { testId: '1' },
 			name: VIEWS.TEST_DEFINITION_EDIT,
 		} as unknown as ReturnType<typeof useRoute>);
 
-		const { getByTestId } = renderComponentWithFeatureEnabled();
+		const { getByTestId, mockedTestDefinitionStore } = renderComponentWithFeatureEnabled();
+
+		mockedTestDefinitionStore.getFieldIssues = vi
+			.fn()
+			.mockReturnValue([{ field: 'tags', message: 'Tag is required' }]);
 
 		await nextTick();
+
 		const updateButton = getByTestId('run-test-button');
-		expect(updateButton.textContent?.toLowerCase()).toContain('save');
-	});
+		expect(updateButton.textContent?.toLowerCase()).toContain('run test');
+		expect(updateButton).toHaveClass('disabled');
 
-	it('should display "Save Test" button when creating new test', async () => {
-		vi.mocked(useRoute).mockReturnValue({
-			params: {},
-			name: VIEWS.NEW_TEST_DEFINITION,
-		} as unknown as ReturnType<typeof useRoute>);
-
-		const { getByTestId } = renderComponentWithFeatureEnabled();
-
-		const saveButton = getByTestId('run-test-button');
-		expect(saveButton.textContent?.toLowerCase()).toContain('save test');
+		mockedTestDefinitionStore.getFieldIssues = vi.fn().mockReturnValue([]);
+		await nextTick();
+		expect(updateButton).not.toHaveClass('disabled');
 	});
 
 	it('should apply "has-issues" class to inputs with issues', async () => {
-		vi.mocked(useTestDefinitionForm).mockReturnValue({
-			...vi.mocked(useTestDefinitionForm)(),
-			fieldsIssues: ref([
-				{ field: 'name', message: 'Name is required' },
-				{ field: 'tags', message: 'Tag is required' },
-			]),
-		} as unknown as ReturnType<typeof useTestDefinitionForm>);
-
-		const { container } = renderComponentWithFeatureEnabled();
-
+		const { container, mockedTestDefinitionStore } = renderComponentWithFeatureEnabled();
+		mockedTestDefinitionStore.getFieldIssues = vi
+			.fn()
+			.mockReturnValue([{ field: 'tags', message: 'Tag is required' }]);
 		await nextTick();
 		const issueElements = container.querySelectorAll('.has-issues');
 		expect(issueElements.length).toBeGreaterThan(0);
 	});
 
-	it('should fetch all tags on mount', async () => {
-		renderComponentWithFeatureEnabled();
-		await nextTick();
-		expect(mockedStore(useAnnotationTagsStore).fetchAll).toHaveBeenCalled();
-	});
-
 	describe('Test Runs functionality', () => {
 		it('should display test runs table when runs exist', async () => {
 			vi.mocked(useRoute).mockReturnValue({
@@ -273,7 +244,7 @@ describe('TestDefinitionEditView', () => {
 				...vi.mocked(useTestDefinitionForm)(),
 				state: ref({
 					name: { value: 'Test', isEditing: false, tempValue: '' },
-					description: '',
+					description: { value: '', isEditing: false, tempValue: '' },
 					tags: { value: ['tag1'], tempValue: [], isEditing: false },
 					evaluationWorkflow: { mode: 'list', value: 'workflow1', __rl: true },
 					metrics: [],
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
index bf23b73a9e..c4b427f4bd 100644
--- a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
@@ -6,21 +6,22 @@ import { createComponentRenderer } from '@/__tests__/render';
 import TestDefinitionListView from '@/views/TestDefinition/TestDefinitionListView.vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useToast } from '@/composables/useToast';
-import { useAnnotationTagsStore } from '@/stores/tags.store';
+import { useMessage } from '@/composables/useMessage';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
 import { nextTick, ref } from 'vue';
 import { mockedStore, waitAllPromises } from '@/__tests__/utils';
-import { VIEWS } from '@/constants';
+import { MODAL_CONFIRM, VIEWS } from '@/constants';
 import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
 
 vi.mock('vue-router');
 vi.mock('@/composables/useToast');
-
+vi.mock('@/composables/useMessage');
 describe('TestDefinitionListView', () => {
 	const renderComponent = createComponentRenderer(TestDefinitionListView);
 
 	let showMessageMock: Mock;
 	let showErrorMock: Mock;
+	let confirmMock: Mock;
 	let startTestRunMock: Mock;
 	let fetchTestRunsMock: Mock;
 	let deleteByIdMock: Mock;
@@ -65,6 +66,7 @@ describe('TestDefinitionListView', () => {
 
 		showMessageMock = vi.fn();
 		showErrorMock = vi.fn();
+		confirmMock = vi.fn().mockResolvedValue(MODAL_CONFIRM);
 		startTestRunMock = vi.fn().mockResolvedValue({ success: true });
 		fetchTestRunsMock = vi.fn();
 		deleteByIdMock = vi.fn();
@@ -74,6 +76,10 @@ describe('TestDefinitionListView', () => {
 			showMessage: showMessageMock,
 			showError: showErrorMock,
 		} as unknown as ReturnType<typeof useToast>);
+
+		vi.mocked(useMessage).mockReturnValue({
+			confirm: confirmMock,
+		} as unknown as ReturnType<typeof useMessage>);
 	});
 
 	afterEach(() => {
@@ -89,7 +95,6 @@ describe('TestDefinitionListView', () => {
 		setActivePinia(pinia);
 
 		const testDefinitionStore = mockedStore(useTestDefinitionStore);
-		// const tagsStore = mockedStore(useAnnotationTagsStore);
 		testDefinitionStore.isFeatureEnabled = true;
 		testDefinitionStore.fetchAll = fetchAllMock;
 		testDefinitionStore.startTestRun = startTestRunMock;
@@ -120,7 +125,6 @@ describe('TestDefinitionListView', () => {
 		expect(testDefinitionStore.fetchAll).toHaveBeenCalledWith({
 			workflowId: 'workflow1',
 		});
-		expect(mockedStore(useAnnotationTagsStore).fetchAll).toHaveBeenCalled();
 	});
 
 	it('should start test run and show success message', async () => {
@@ -150,13 +154,12 @@ describe('TestDefinitionListView', () => {
 	});
 
 	it('should delete test and show success message', async () => {
-		const { getByTestId, testDefinitionStore } = await renderComponentWithFeatureEnabled();
-
+		const { getByTestId } = await renderComponentWithFeatureEnabled();
 		const deleteButton = getByTestId('delete-test-button-1');
 		deleteButton.click();
-		await nextTick();
+		await waitAllPromises();
 
-		expect(testDefinitionStore.deleteById).toHaveBeenCalledWith('1');
+		expect(deleteByIdMock).toHaveBeenCalledWith('1');
 		expect(showMessageMock).toHaveBeenCalledWith({
 			title: expect.any(String),
 			type: 'success',
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
new file mode 100644
index 0000000000..e39d53a8d5
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
@@ -0,0 +1,87 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import TestDefinitionRootView from '../TestDefinitionRootView.vue';
+import { useRouter } from 'vue-router';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { mockedStore } from '@/__tests__/utils';
+import type { IWorkflowDb } from '@/Interface';
+import * as workflowsApi from '@/api/workflows';
+
+vi.mock('vue-router');
+vi.mock('@/api/workflows');
+
+describe('TestDefinitionRootView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionRootView);
+
+	const mockWorkflow: IWorkflowDb = {
+		id: 'different-id',
+		name: 'Test Workflow',
+		active: false,
+		createdAt: Date.now(),
+		updatedAt: Date.now(),
+		nodes: [],
+		connections: {},
+		settings: {
+			executionOrder: 'v1',
+		},
+		tags: [],
+		pinData: {},
+		versionId: '',
+		usedCredentials: [],
+	};
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		vi.mocked(useRouter).mockReturnValue({
+			currentRoute: {
+				value: {
+					params: {
+						name: 'workflow123',
+					},
+				},
+			},
+		} as unknown as ReturnType<typeof useRouter>);
+
+		vi.mocked(workflowsApi.getWorkflow).mockResolvedValue({
+			...mockWorkflow,
+			id: 'workflow123',
+		});
+	});
+
+	it('should initialize workflow on mount if not already initialized', async () => {
+		const pinia = createTestingPinia();
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.workflow = mockWorkflow;
+
+		const newWorkflow = {
+			...mockWorkflow,
+			id: 'workflow123',
+		};
+		workflowsStore.fetchWorkflow.mockResolvedValue(newWorkflow);
+
+		renderComponent({ pinia });
+
+		expect(workflowsStore.fetchWorkflow).toHaveBeenCalledWith('workflow123');
+	});
+
+	it('should not initialize workflow if already loaded', async () => {
+		const pinia = createTestingPinia();
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.workflow = {
+			...mockWorkflow,
+			id: 'workflow123',
+		};
+
+		renderComponent({ pinia });
+
+		expect(workflowsStore.fetchWorkflow).not.toHaveBeenCalled();
+	});
+
+	it('should render router view', () => {
+		const { container } = renderComponent();
+		expect(container.querySelector('router-view')).toBeTruthy();
+	});
+});
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
index 537a5a5e31..63fabd6f5d 100644
--- a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
@@ -7,7 +7,6 @@ import TestDefinitionRunDetailView from '@/views/TestDefinition/TestDefinitionRu
 import { useRoute, useRouter } from 'vue-router';
 import { useToast } from '@/composables/useToast';
 import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
-import { useExecutionsStore } from '@/stores/executions.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { nextTick, ref } from 'vue';
 import { mockedStore, waitAllPromises } from '@/__tests__/utils';
@@ -23,8 +22,7 @@ describe('TestDefinitionRunDetailView', () => {
 
 	let showErrorMock: Mock;
 	let getTestRunMock: Mock;
-	let fetchExecutionsMock: Mock;
-	let fetchExecutionMock: Mock;
+	let fetchTestCaseExecutionsMock: Mock;
 
 	const mockTestRun: TestRunRecord = {
 		id: 'run1',
@@ -52,12 +50,10 @@ describe('TestDefinitionRunDetailView', () => {
 		name: 'Evaluation Workflow',
 	};
 
-	const mockExecutions = {
-		results: [
-			{ id: 'exec1', status: 'success' },
-			{ id: 'exec2', status: 'error' },
-		],
-	};
+	const mockTestCaseExecutions = [
+		{ id: 'exec1', status: 'success' },
+		{ id: 'exec2', status: 'error' },
+	];
 
 	beforeEach(() => {
 		setActivePinia(createPinia());
@@ -78,17 +74,7 @@ describe('TestDefinitionRunDetailView', () => {
 
 		showErrorMock = vi.fn();
 		getTestRunMock = vi.fn().mockResolvedValue(mockTestRun);
-		fetchExecutionsMock = vi.fn().mockResolvedValue(mockExecutions);
-		fetchExecutionMock = vi.fn().mockResolvedValue({
-			data: {
-				resultData: {
-					lastNodeExecuted: 'Node1',
-					runData: {
-						Node1: [{ data: { main: [[{ json: { accuracy: 0.95 } }]] } }],
-					},
-				},
-			},
-		});
+		fetchTestCaseExecutionsMock = vi.fn().mockResolvedValue(mockTestCaseExecutions);
 
 		vi.mocked(useToast).mockReturnValue({
 			showError: showErrorMock,
@@ -108,10 +94,6 @@ describe('TestDefinitionRunDetailView', () => {
 		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
 		testDefinitionStore.getTestRun = getTestRunMock;
 
-		const executionsStore = mockedStore(useExecutionsStore);
-		executionsStore.fetchExecutions = fetchExecutionsMock;
-		executionsStore.fetchExecution = fetchExecutionMock;
-
 		const workflowsStore = mockedStore(useWorkflowsStore);
 		workflowsStore.workflowsById = { workflow1: mockWorkflow as IWorkflowDb };
 
@@ -151,7 +133,7 @@ describe('TestDefinitionRunDetailView', () => {
 		testDefinitionStore.getTestRun = vi.fn().mockRejectedValue(new Error('Failed to load'));
 
 		renderComponent({ pinia });
-		await nextTick();
+		await waitAllPromises();
 
 		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), 'Failed to load run details');
 	});
@@ -243,7 +225,6 @@ describe('TestDefinitionRunDetailView', () => {
 		setActivePinia(pinia);
 
 		const testDefinitionStore = mockedStore(useTestDefinitionStore);
-		const executionsStore = mockedStore(useExecutionsStore);
 
 		// Mock all required store methods
 		testDefinitionStore.testRunsById = { run1: mockTestRun };
@@ -251,17 +232,14 @@ describe('TestDefinitionRunDetailView', () => {
 		testDefinitionStore.getTestRun = getTestRunMock;
 		// Add this mock for fetchTestDefinition
 		testDefinitionStore.fetchTestDefinition = vi.fn().mockResolvedValue(mockTestDefinition);
-
-		executionsStore.fetchExecutions = fetchExecutionsMock;
-		executionsStore.fetchExecution = fetchExecutionMock;
+		testDefinitionStore.fetchTestCaseExecutions = fetchTestCaseExecutionsMock;
 
 		const { container } = renderComponent({ pinia });
-		await nextTick();
 
 		// Wait for all promises to resolve
 		await waitAllPromises();
 
 		const tableRows = container.querySelectorAll('.el-table__row');
-		expect(tableRows.length).toBe(mockExecutions.results.length);
+		expect(tableRows.length).toBe(mockTestCaseExecutions.length);
 	});
 });
diff --git a/packages/editor-ui/src/views/VariablesView.test.ts b/packages/editor-ui/src/views/VariablesView.test.ts
index 9680a716b2..13398546fd 100644
--- a/packages/editor-ui/src/views/VariablesView.test.ts
+++ b/packages/editor-ui/src/views/VariablesView.test.ts
@@ -1,57 +1,53 @@
-import { afterAll, beforeAll } from 'vitest';
-import { setActivePinia, createPinia } from 'pinia';
-import { waitFor } from '@testing-library/vue';
-import { setupServer } from '@/__tests__/server';
 import VariablesView from '@/views/VariablesView.vue';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useRBACStore } from '@/stores/rbac.store';
+import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { EnterpriseEditionFeature, STORES } from '@/constants';
 import { createTestingPinia } from '@pinia/testing';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { mockedStore, SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import { createRouter, createWebHistory } from 'vue-router';
+import userEvent from '@testing-library/user-event';
+import { waitFor, within } from '@testing-library/vue';
+import type { IUser, EnvironmentVariable } from '@/Interface';
+import type { Scope } from '@n8n/permissions';
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/',
+			component: { template: '<div></div>' },
+		},
+	],
+});
+
+const renderComponent = createComponentRenderer(VariablesView, { global: { plugins: [router] } });
+
+const fullAccessScopes: Scope[] = [
+	'variable:create',
+	'variable:read',
+	'variable:update',
+	'variable:delete',
+	'variable:list',
+];
 
 describe('VariablesView', () => {
-	let server: ReturnType<typeof setupServer>;
-	let pinia: ReturnType<typeof createPinia>;
-	let settingsStore: ReturnType<typeof useSettingsStore>;
-	let usersStore: ReturnType<typeof useUsersStore>;
-	let rbacStore: ReturnType<typeof useRBACStore>;
-
-	const renderComponent = createComponentRenderer(VariablesView, {
-		pinia: createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: SETTINGS_STORE_DEFAULT_STATE,
-			},
-		}),
-	});
-
-	beforeAll(() => {
-		server = setupServer();
-	});
-
 	beforeEach(async () => {
-		pinia = createPinia();
-		setActivePinia(pinia);
-
-		settingsStore = useSettingsStore();
-		usersStore = useUsersStore();
-		rbacStore = useRBACStore();
-		await settingsStore.getSettings();
-		await usersStore.fetchUsers();
-		await usersStore.loginWithCookie();
-	});
-
-	afterAll(() => {
-		server.shutdown();
+		createTestingPinia({ initialState: { [STORES.SETTINGS]: SETTINGS_STORE_DEFAULT_STATE } });
+		await router.push('/');
+		await router.isReady();
 	});
 
 	describe('should render empty state', () => {
 		it('when feature is disabled and logged in user is not owner', async () => {
+			const settingsStore = mockedStore(useSettingsStore);
 			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = false;
-			rbacStore.setGlobalScopes(['variable:read', 'variable:list']);
+			const rbacStore = mockedStore(useRBACStore);
+			rbacStore.globalScopes = ['variable:read', 'variable:list'];
 
-			const { queryByTestId } = renderComponent({ pinia });
+			const { queryByTestId } = renderComponent();
 
 			await waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
@@ -61,16 +57,12 @@ describe('VariablesView', () => {
 		});
 
 		it('when feature is disabled and logged in user is owner', async () => {
+			const settingsStore = mockedStore(useSettingsStore);
 			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = false;
-			rbacStore.setGlobalScopes([
-				'variable:create',
-				'variable:read',
-				'variable:update',
-				'variable:delete',
-				'variable:list',
-			]);
+			const rbacStore = mockedStore(useRBACStore);
+			rbacStore.globalScopes = fullAccessScopes;
 
-			const { queryByTestId } = renderComponent({ pinia });
+			const { queryByTestId } = renderComponent();
 
 			await waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
@@ -80,16 +72,18 @@ describe('VariablesView', () => {
 		});
 
 		it('when feature is enabled and logged in user is owner', async () => {
-			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
-			rbacStore.setGlobalScopes([
+			const settingsStore = mockedStore(useSettingsStore);
+			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = false;
+			const rbacStore = mockedStore(useRBACStore);
+			rbacStore.globalScopes = [
 				'variable:create',
 				'variable:read',
 				'variable:update',
 				'variable:delete',
 				'variable:list',
-			]);
+			];
 
-			const { queryByTestId } = renderComponent({ pinia });
+			const { queryByTestId } = renderComponent();
 
 			await waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
@@ -99,10 +93,12 @@ describe('VariablesView', () => {
 		});
 
 		it('when feature is enabled and logged in user is not owner', async () => {
+			const settingsStore = mockedStore(useSettingsStore);
 			settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
-			rbacStore.setGlobalScopes(['variable:read', 'variable:list']);
+			const rbacStore = mockedStore(useRBACStore);
+			rbacStore.globalScopes = ['variable:read', 'variable:list'];
 
-			const { queryByTestId } = renderComponent({ pinia });
+			const { queryByTestId } = renderComponent();
 
 			await waitFor(() => {
 				expect(queryByTestId('empty-resources-list')).not.toBeInTheDocument();
@@ -112,14 +108,193 @@ describe('VariablesView', () => {
 		});
 	});
 
-	it('should render variable entries', async () => {
+	const userWithPrivileges = (variables: EnvironmentVariable[]) => {
+		const userStore = mockedStore(useUsersStore);
+		userStore.currentUser = { globalScopes: fullAccessScopes } as IUser;
+		const settingsStore = mockedStore(useSettingsStore);
 		settingsStore.settings.enterprise[EnterpriseEditionFeature.Variables] = true;
-		server.createList('variable', 3);
+		const environmentsStore = mockedStore(useEnvironmentsStore);
+		environmentsStore.variables = variables;
 
-		const wrapper = renderComponent({ pinia });
+		return { userStore, settingsStore, environmentsStore };
+	};
+
+	it('should render variable entries', async () => {
+		userWithPrivileges([
+			{
+				id: '1',
+				key: 'a',
+				value: 'a',
+			},
+			{
+				id: '2',
+				key: 'b',
+				value: 'b',
+			},
+			{
+				id: '3',
+				key: 'c',
+				value: 'c',
+			},
+		]);
+
+		const wrapper = renderComponent();
 
 		const table = await wrapper.findByTestId('resources-table');
 		expect(table).toBeVisible();
 		expect(wrapper.container.querySelectorAll('tr')).toHaveLength(4);
 	});
+
+	describe('CRUD', () => {
+		it('should create variables', async () => {
+			const { environmentsStore } = userWithPrivileges([
+				{
+					id: '1',
+					key: 'a',
+					value: 'a',
+				},
+			]);
+
+			const { getByTestId, queryAllByTestId, getByPlaceholderText } = renderComponent();
+			await waitFor(() => expect(getByTestId('resources-list-add')).toBeVisible());
+
+			expect(queryAllByTestId('variables-row').length).toBe(1);
+
+			await userEvent.click(getByTestId('resources-list-add'));
+
+			expect(queryAllByTestId('variables-row').length).toBe(2);
+
+			const newVariable = { key: 'b', value: 'b' };
+
+			await userEvent.type(getByPlaceholderText('Enter a name'), newVariable.key);
+			await userEvent.type(getByPlaceholderText('Enter a value'), newVariable.value);
+
+			await userEvent.click(getByTestId('variable-row-save-button'));
+
+			expect(environmentsStore.createVariable).toHaveBeenCalledWith(newVariable);
+		});
+
+		it('should delete variables', async () => {
+			const { environmentsStore } = userWithPrivileges([
+				{
+					id: '1',
+					key: 'a',
+					value: 'a',
+				},
+				{
+					id: '2',
+					key: 'b',
+					value: 'b',
+				},
+			]);
+
+			const { getByTestId, queryAllByTestId, getByLabelText, queryAllByLabelText } =
+				renderComponent();
+			await waitFor(() => expect(getByTestId('resources-list-add')).toBeVisible());
+
+			expect(queryAllByTestId('variables-row').length).toBe(2);
+
+			await userEvent.hover(queryAllByTestId('variables-row')[0]);
+			expect(queryAllByTestId('variable-row-delete-button')[0]).toBeVisible();
+			await userEvent.click(queryAllByTestId('variable-row-delete-button')[0]);
+
+			// Cancel
+			expect(getByLabelText('Delete variable')).toBeVisible();
+			await userEvent.click(within(getByLabelText('Delete variable')).getByText('Cancel'));
+			expect(environmentsStore.deleteVariable).not.toHaveBeenCalled();
+
+			await userEvent.hover(queryAllByTestId('variables-row')[0]);
+			expect(queryAllByTestId('variable-row-delete-button')[0]).toBeVisible();
+			await userEvent.click(queryAllByTestId('variable-row-delete-button')[0]);
+
+			// Delete
+			const dialog = queryAllByLabelText('Delete variable').at(-1);
+			expect(dialog).toBeVisible();
+			await userEvent.click(within(dialog as HTMLElement).getByText('Delete'));
+
+			expect(environmentsStore.deleteVariable).toHaveBeenCalledWith(environmentsStore.variables[0]);
+		});
+
+		it('should update variable', async () => {
+			const { environmentsStore } = userWithPrivileges([
+				{
+					id: '1',
+					key: 'a',
+					value: 'a',
+				},
+			]);
+
+			const { getByTestId, queryAllByTestId, getByPlaceholderText } = renderComponent();
+			await waitFor(() => expect(getByTestId('resources-list-add')).toBeVisible());
+
+			expect(queryAllByTestId('variables-row').length).toBe(1);
+
+			await userEvent.hover(getByTestId('variables-row'));
+
+			expect(getByTestId('variable-row-edit-button')).toBeVisible();
+			await userEvent.click(getByTestId('variable-row-edit-button'));
+
+			const newVariable = { id: '1', key: 'ab', value: 'ab' };
+
+			await userEvent.type(getByPlaceholderText('Enter a name'), 'b');
+			await userEvent.type(getByPlaceholderText('Enter a value'), 'b');
+
+			await userEvent.click(getByTestId('variable-row-save-button'));
+
+			expect(environmentsStore.updateVariable).toHaveBeenCalledWith(newVariable);
+		});
+	});
+
+	describe('filter', () => {
+		it('should filter by incomplete', async () => {
+			userWithPrivileges([
+				{
+					id: '1',
+					key: 'a',
+					value: 'a',
+				},
+				{
+					id: '2',
+					key: 'b',
+					value: '',
+				},
+			]);
+
+			const { getByTestId, queryAllByTestId } = renderComponent();
+			await waitFor(() => expect(getByTestId('resources-list-add')).toBeVisible());
+
+			expect(queryAllByTestId('variables-row').length).toBe(2);
+			await userEvent.click(getByTestId('variable-filter-incomplete'));
+
+			expect(queryAllByTestId('variables-row').length).toBe(1);
+		});
+	});
+
+	describe('sorting', () => {
+		it('should sort by name (asc | desc)', async () => {
+			userWithPrivileges([
+				{
+					id: '1',
+					key: 'a',
+					value: 'a',
+				},
+				{
+					id: '2',
+					key: 'b',
+					value: 'b',
+				},
+			]);
+
+			const { getByTestId, queryAllByTestId } = renderComponent();
+			await waitFor(() => expect(getByTestId('resources-list-add')).toBeVisible());
+
+			expect(queryAllByTestId('variables-row').length).toBe(2);
+			expect(queryAllByTestId('variables-row')[0].querySelector('td')?.textContent).toBe('a');
+
+			await userEvent.click(getByTestId('resources-list-sort'));
+			await userEvent.click(queryAllByTestId('resources-list-sort-item')[1]);
+
+			expect(queryAllByTestId('variables-row')[0].querySelector('td')?.textContent).toBe('b');
+		});
+	});
 });
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index e0966aa222..0d2ecb1390 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, ref, onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
+import { computed, ref, useTemplateRef, onMounted } from 'vue';
 import { useEnvironmentsStore } from '@/stores/environments.ee.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
@@ -10,17 +10,30 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { useRoute, useRouter, type LocationQueryRaw } from 'vue-router';
+import VariablesForm from '@/components/VariablesForm.vue';
+import VariablesUsageBadge from '@/components/VariablesUsageBadge.vue';
 
-import type { IResource } from '@/components/layouts/ResourcesListLayout.vue';
-import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
-import VariablesRow from '@/components/VariablesRow.vue';
+import ResourcesListLayout, {
+	type IResource,
+	type IFilters,
+} from '@/components/layouts/ResourcesListLayout.vue';
 
 import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
 import type { DatatableColumn, EnvironmentVariable } from '@/Interface';
 import { uid } from 'n8n-design-system/utils';
 import { getResourcePermissions } from '@/permissions';
-import type { BaseTextKey } from '@/plugins/i18n';
 import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import { useAsyncState } from '@vueuse/core';
+import { pickBy } from 'lodash-es';
+import {
+	N8nButton,
+	N8nTooltip,
+	N8nActionBox,
+	N8nInputLabel,
+	N8nCheckbox,
+	N8nBadge,
+} from 'n8n-design-system';
 
 const settingsStore = useSettingsStore();
 const environmentsStore = useEnvironmentsStore();
@@ -30,184 +43,94 @@ const telemetry = useTelemetry();
 const i18n = useI18n();
 const message = useMessage();
 const sourceControlStore = useSourceControlStore();
-const documentTitle = useDocumentTitle();
-const pageRedirectionHelper = usePageRedirectionHelper();
-let sourceControlStoreUnsubscribe = () => {};
+const route = useRoute();
+const router = useRouter();
 
-const layoutRef = ref<InstanceType<typeof ResourcesListLayout> | null>(null);
+const layoutRef = useTemplateRef<InstanceType<typeof ResourcesListLayout>>('layoutRef');
 
 const { showError } = useToast();
 
 const TEMPORARY_VARIABLE_UID_BASE = '@tmpvar';
 
-const allVariables = ref<EnvironmentVariable[]>([]);
-const editMode = ref<Record<string, boolean>>({});
-const loading = ref(false);
-
 const permissions = computed(
 	() => getResourcePermissions(usersStore.currentUser?.globalScopes).variable,
 );
 
+const { isLoading, execute } = useAsyncState(environmentsStore.fetchAllVariables, [], {
+	immediate: true,
+});
+
 const isFeatureEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Variables],
 );
 
-const variablesToResources = computed((): IResource[] =>
-	allVariables.value.map((v) => ({ id: v.id, name: v.key, value: v.value })),
-);
+const variableForms = ref<Map<string, EnvironmentVariable>>(new Map());
+const editableVariables = ref<string[]>([]);
+const addToEditableVariables = (variableId: string) => editableVariables.value.push(variableId);
+const removeEditableVariable = (variableId: string) => {
+	editableVariables.value = editableVariables.value.filter((id) => id !== variableId);
+	variableForms.value.delete(variableId);
+};
+
+const addEmptyVariableForm = () => {
+	const variable = { id: uid(TEMPORARY_VARIABLE_UID_BASE), key: '', value: '' };
+	variableForms.value.set(variable.id, variable);
+
+	// Reset pagination
+	if (layoutRef.value?.currentPage !== 1) {
+		layoutRef.value?.setCurrentPage(1);
+	}
+
+	addToEditableVariables(variable.id);
+	telemetry.track('User clicked add variable button');
+};
+
+const variables = computed(() => [...variableForms.value.values(), ...environmentsStore.variables]);
 
 const canCreateVariables = computed(() => isFeatureEnabled.value && permissions.value.create);
 
-const datatableColumns = computed<DatatableColumn[]>(() => [
-	{
-		id: 0,
-		path: 'name',
-		label: i18n.baseText('variables.table.key'),
-		classes: ['variables-key-column'],
-	},
-	{
-		id: 1,
-		path: 'value',
-		label: i18n.baseText('variables.table.value'),
-		classes: ['variables-value-column'],
-	},
-	{
-		id: 2,
-		path: 'usage',
-		label: i18n.baseText('variables.table.usage'),
-		classes: ['variables-usage-column'],
-	},
-	...(isFeatureEnabled.value
-		? [
-				{
-					id: 3,
-					path: 'actions',
-					label: '',
-				},
-			]
-		: []),
-]);
+const columns = computed(() => {
+	const cols: DatatableColumn[] = [
+		{
+			id: 0,
+			path: 'name',
+			label: i18n.baseText('variables.table.key'),
+			classes: ['variables-key-column'],
+		},
+		{
+			id: 1,
+			path: 'value',
+			label: i18n.baseText('variables.table.value'),
+			classes: ['variables-value-column'],
+		},
+		{
+			id: 2,
+			path: 'usage',
+			label: i18n.baseText('variables.table.usage'),
+			classes: ['variables-usage-column'],
+		},
+	];
 
-const contextBasedTranslationKeys = computed(() => uiStore.contextBasedTranslationKeys);
+	if (!isFeatureEnabled.value) return cols;
 
-const newlyAddedVariableIds = ref<string[]>([]);
-
-const nameSortFn = (a: IResource, b: IResource, direction: 'asc' | 'desc') => {
-	if (`${a.id}`.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
-		return -1;
-	} else if (`${b.id}`.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
-		return 1;
-	} else if (
-		newlyAddedVariableIds.value.includes(a.id) &&
-		newlyAddedVariableIds.value.includes(b.id)
-	) {
-		return newlyAddedVariableIds.value.indexOf(a.id) - newlyAddedVariableIds.value.indexOf(b.id);
-	} else if (newlyAddedVariableIds.value.includes(a.id)) {
-		return -1;
-	} else if (newlyAddedVariableIds.value.includes(b.id)) {
-		return 1;
-	}
-
-	return direction === 'asc'
-		? displayName(a).trim().localeCompare(displayName(b).trim())
-		: displayName(b).trim().localeCompare(displayName(a).trim());
-};
-const sortFns = {
-	nameAsc: (a: IResource, b: IResource) => {
-		return nameSortFn(a, b, 'asc');
-	},
-	nameDesc: (a: IResource, b: IResource) => {
-		return nameSortFn(a, b, 'desc');
-	},
-};
-
-function resetNewVariablesList() {
-	newlyAddedVariableIds.value = [];
-}
-
-const resourceToEnvironmentVariable = (data: IResource): EnvironmentVariable => ({
-	id: data.id,
-	key: data.name,
-	value: 'value' in data ? (data.value ?? '') : '',
+	return cols.concat({ id: 3, path: 'actions', label: '', classes: ['variables-actions-column'] });
 });
 
-const environmentVariableToResource = (data: EnvironmentVariable): IResource => ({
-	id: data.id,
-	name: data.key,
-	value: 'value' in data ? data.value : '',
-});
-
-async function initialize() {
-	if (!isFeatureEnabled.value) return;
-	loading.value = true;
-	await environmentsStore.fetchAllVariables();
-
-	allVariables.value = [...environmentsStore.variables];
-	loading.value = false;
-}
-
-function addTemporaryVariable() {
-	const temporaryVariable: EnvironmentVariable = {
-		id: uid(TEMPORARY_VARIABLE_UID_BASE),
-		key: '',
-		value: '',
-	};
-
-	if (layoutRef.value) {
-		// Reset scroll position
-		if (layoutRef.value.$refs.listWrapperRef) {
-			(layoutRef.value.$refs.listWrapperRef as HTMLDivElement).scrollTop = 0;
-		}
-
-		// Reset pagination
-		if (layoutRef.value.currentPage !== 1) {
-			layoutRef.value.setCurrentPage(1);
-		}
-	}
-
-	allVariables.value.unshift(temporaryVariable);
-	editMode.value[temporaryVariable.id] = true;
-
-	telemetry.track('User clicked add variable button');
-}
-
-async function saveVariable(data: IResource) {
-	const variable = resourceToEnvironmentVariable(data);
+const handleSubmit = async (variable: EnvironmentVariable) => {
 	try {
-		if (typeof variable.id === 'string' && variable.id.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
-			const { id, ...rest } = variable;
-			const updatedVariable = await environmentsStore.createVariable(rest);
-			allVariables.value.unshift(updatedVariable);
-			allVariables.value = allVariables.value.filter((variable) => variable.id !== data.id);
-			newlyAddedVariableIds.value.unshift(updatedVariable.id);
+		const { id, ...rest } = variable;
+		if (id.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
+			await environmentsStore.createVariable(rest);
 		} else {
-			const updatedVariable = await environmentsStore.updateVariable(variable);
-			allVariables.value = allVariables.value.filter((variable) => variable.id !== data.id);
-			allVariables.value.push(updatedVariable);
-			toggleEditing(environmentVariableToResource(updatedVariable));
+			await environmentsStore.updateVariable(variable);
 		}
+		removeEditableVariable(id);
 	} catch (error) {
 		showError(error, i18n.baseText('variables.errors.save'));
 	}
-}
+};
 
-function toggleEditing(data: IResource) {
-	editMode.value = {
-		...editMode.value,
-		[data.id]: !editMode.value[data.id],
-	};
-}
-
-function cancelEditing(data: IResource) {
-	if (typeof data.id === 'string' && data.id.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
-		allVariables.value = allVariables.value.filter((variable) => variable.id !== data.id);
-	} else {
-		toggleEditing(data);
-	}
-}
-
-async function deleteVariable(data: IResource) {
-	const variable = resourceToEnvironmentVariable(data);
+const handleDeleteVariable = async (variable: EnvironmentVariable) => {
 	try {
 		const confirmed = await message.confirm(
 			i18n.baseText('variables.modals.deleteConfirm.message', {
@@ -225,57 +148,95 @@ async function deleteVariable(data: IResource) {
 		}
 
 		await environmentsStore.deleteVariable(variable);
-		allVariables.value = allVariables.value.filter((variable) => variable.id !== data.id);
+		removeEditableVariable(variable.id);
 	} catch (error) {
 		showError(error, i18n.baseText('variables.errors.delete'));
 	}
-}
+};
+
+type Filters = IFilters & { incomplete?: boolean };
+const updateFilter = (state: Filters) => {
+	void router.replace({ query: pickBy(state) as LocationQueryRaw });
+};
+const filters = computed<Filters>(
+	() => ({ ...route.query, incomplete: route.query.incomplete?.toString() === 'true' }) as Filters,
+);
+
+const handleFilter = (resource: IResource, newFilters: IFilters, matches: boolean): boolean => {
+	const iResource = resource as EnvironmentVariable;
+	const filtersToApply = newFilters as Filters;
+
+	if (filtersToApply.incomplete) {
+		matches = matches && !iResource.value;
+	}
+
+	return matches;
+};
+
+const nameSortFn = (a: IResource, b: IResource, direction: 'asc' | 'desc') => {
+	if (`${a.id}`.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
+		return -1;
+	} else if (`${b.id}`.startsWith(TEMPORARY_VARIABLE_UID_BASE)) {
+		return 1;
+	}
+
+	return direction === 'asc'
+		? displayName(a).trim().localeCompare(displayName(b).trim())
+		: displayName(b).trim().localeCompare(displayName(a).trim());
+};
+const sortFns = {
+	nameAsc: (a: IResource, b: IResource) => nameSortFn(a, b, 'asc'),
+	nameDesc: (a: IResource, b: IResource) => nameSortFn(a, b, 'desc'),
+};
+
+const unavailableNoticeProps = computed(() => ({
+	emoji: '👋',
+	heading: i18n.baseText(uiStore.contextBasedTranslationKeys.variables.unavailable.title),
+	description: i18n.baseText(uiStore.contextBasedTranslationKeys.variables.unavailable.description),
+	buttonText: i18n.baseText(uiStore.contextBasedTranslationKeys.variables.unavailable.button),
+	buttonType: 'secondary' as const,
+	'onClick:button': goToUpgrade,
+	'data-test-id': 'unavailable-resources-list',
+}));
 
 function goToUpgrade() {
-	void pageRedirectionHelper.goToUpgrade('variables', 'upgrade-variables');
+	void usePageRedirectionHelper().goToUpgrade('variables', 'upgrade-variables');
 }
 
 function displayName(resource: IResource) {
-	return resource.name;
+	return (resource as EnvironmentVariable).key;
 }
 
-onBeforeMount(() => {
-	sourceControlStoreUnsubscribe = sourceControlStore.$onAction(({ name, after }) => {
-		if (name === 'pullWorkfolder' && after) {
-			after(() => {
-				void initialize();
-			});
-		}
-	});
-});
-
-onBeforeUnmount(() => {
-	sourceControlStoreUnsubscribe();
+sourceControlStore.$onAction(({ name, after }) => {
+	if (name === 'pullWorkfolder' && after) {
+		after(() => {
+			void execute();
+		});
+	}
 });
 
 onMounted(() => {
-	documentTitle.set(i18n.baseText('variables.heading'));
+	useDocumentTitle().set(i18n.baseText('variables.heading'));
 });
 </script>
 
 <template>
 	<ResourcesListLayout
 		ref="layoutRef"
-		class="variables-view"
 		resource-key="variables"
 		:disabled="!isFeatureEnabled"
-		:resources="variablesToResources"
-		:initialize="initialize"
+		:resources="variables"
+		:filters="filters"
+		:additional-filters-handler="handleFilter"
 		:shareable="false"
 		:display-name="displayName"
 		:sort-fns="sortFns"
 		:sort-options="['nameAsc', 'nameDesc']"
-		:show-filters-dropdown="false"
 		type="datatable"
-		:type-props="{ columns: datatableColumns }"
-		:loading="loading"
-		@sort="resetNewVariablesList"
-		@click:add="addTemporaryVariable"
+		:type-props="{ columns }"
+		:loading="isLoading"
+		@update:filters="updateFilter"
+		@click:add="addEmptyVariableForm"
 	>
 		<template #header>
 			<n8n-heading size="2xlarge" class="mb-m">
@@ -283,66 +244,50 @@ onMounted(() => {
 			</n8n-heading>
 		</template>
 		<template #add-button>
-			<n8n-tooltip placement="top" :disabled="canCreateVariables">
+			<N8nTooltip placement="top" :disabled="canCreateVariables">
 				<div>
-					<n8n-button
+					<N8nButton
 						size="large"
 						block
 						:disabled="!canCreateVariables"
 						data-test-id="resources-list-add"
-						@click="addTemporaryVariable"
+						@click="addEmptyVariableForm"
 					>
 						{{ i18n.baseText(`variables.add`) }}
-					</n8n-button>
+					</N8nButton>
 				</div>
 				<template #content>
 					<span v-if="!isFeatureEnabled">{{
-						i18n.baseText(`variables.add.unavailable${allVariables.length === 0 ? '.empty' : ''}`)
+						i18n.baseText(`variables.add.unavailable${variables.length === 0 ? '.empty' : ''}`)
 					}}</span>
 					<span v-else>{{ i18n.baseText('variables.add.onlyOwnerCanCreate') }}</span>
 				</template>
-			</n8n-tooltip>
+			</N8nTooltip>
+		</template>
+		<template #filters="{ setKeyValue }">
+			<div class="mb-s">
+				<N8nInputLabel
+					:label="i18n.baseText('credentials.filters.status')"
+					:bold="false"
+					size="small"
+					color="text-base"
+					class="mb-3xs"
+				/>
+
+				<N8nCheckbox
+					label="Value missing"
+					data-test-id="variable-filter-incomplete"
+					:model-value="filters.incomplete"
+					@update:model-value="setKeyValue('incomplete', $event)"
+				/>
+			</div>
 		</template>
 		<template v-if="!isFeatureEnabled" #preamble>
-			<n8n-action-box
-				class="mb-m"
-				data-test-id="unavailable-resources-list"
-				emoji="👋"
-				:heading="
-					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.title as BaseTextKey)
-				"
-				:description="
-					i18n.baseText(
-						contextBasedTranslationKeys.variables.unavailable.description as BaseTextKey,
-					)
-				"
-				:button-text="
-					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.button as BaseTextKey)
-				"
-				button-type="secondary"
-				@click:button="goToUpgrade"
-			/>
+			<N8nActionBox class="mb-m" v-bind="unavailableNoticeProps" />
 		</template>
 		<template v-if="!isFeatureEnabled || (isFeatureEnabled && !canCreateVariables)" #empty>
-			<n8n-action-box
-				v-if="!isFeatureEnabled"
-				data-test-id="unavailable-resources-list"
-				emoji="👋"
-				:heading="
-					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.title as BaseTextKey)
-				"
-				:description="
-					i18n.baseText(
-						contextBasedTranslationKeys.variables.unavailable.description as BaseTextKey,
-					)
-				"
-				:button-text="
-					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.button as BaseTextKey)
-				"
-				button-type="secondary"
-				@click:button="goToUpgrade"
-			/>
-			<n8n-action-box
+			<N8nActionBox v-if="!isFeatureEnabled" v-bind="unavailableNoticeProps" />
+			<N8nActionBox
 				v-else-if="!canCreateVariables"
 				data-test-id="cannot-create-variables"
 				emoji="👋"
@@ -356,72 +301,90 @@ onMounted(() => {
 			/>
 		</template>
 		<template #default="{ data }">
-			<VariablesRow
+			<VariablesForm
+				v-if="editableVariables.includes(data.id)"
 				:key="data.id"
-				:editing="editMode[data.id]"
-				:data="data"
-				@save="saveVariable"
-				@edit="toggleEditing"
-				@cancel="cancelEditing"
-				@delete="deleteVariable"
+				data-test-id="variables-row"
+				:variable="data"
+				@submit="handleSubmit"
+				@cancel="removeEditableVariable(data.id)"
 			/>
+
+			<tr v-else data-test-id="variables-row">
+				<td>
+					{{ data.key }}
+				</td>
+				<td>
+					<template v-if="data.value">
+						{{ data.value }}
+					</template>
+					<N8nBadge v-else theme="warning"> Value missing </N8nBadge>
+				</td>
+				<td>
+					<VariablesUsageBadge v-if="data.key" :name="data.key" />
+				</td>
+				<td v-if="isFeatureEnabled" align="right">
+					<div class="action-buttons">
+						<N8nTooltip :disabled="permissions.update" placement="top">
+							<N8nButton
+								data-test-id="variable-row-edit-button"
+								type="tertiary"
+								class="mr-xs"
+								:disabled="!permissions.update"
+								@click="addToEditableVariables(data.id)"
+							>
+								{{ i18n.baseText('variables.row.button.edit') }}
+							</N8nButton>
+							<template #content>
+								{{ i18n.baseText('variables.row.button.edit.onlyRoleCanEdit') }}
+							</template>
+						</N8nTooltip>
+						<N8nTooltip :disabled="permissions.delete" placement="top">
+							<N8nButton
+								data-test-id="variable-row-delete-button"
+								type="tertiary"
+								:disabled="!permissions.delete"
+								@click="handleDeleteVariable(data)"
+							>
+								{{ i18n.baseText('variables.row.button.delete') }}
+							</N8nButton>
+							<template #content>
+								{{ i18n.baseText('variables.row.button.delete.onlyRoleCanDelete') }}
+							</template>
+						</N8nTooltip>
+					</div>
+				</td>
+			</tr>
 		</template>
 	</ResourcesListLayout>
 </template>
 
-<style lang="scss" module>
-.type-input {
-	--max-width: 265px;
-}
-
-.sidebarContainer ul {
-	padding: 0 !important;
-}
-</style>
-
 <style lang="scss" scoped>
-@use 'n8n-design-system/css/common/var.scss';
+.action-buttons {
+	opacity: 0;
+	transition: opacity 0.2s ease;
+}
 
-.variables-view {
-	:deep(.datatable) {
-		table {
-			table-layout: fixed;
-		}
+:deep(.datatable) {
+	white-space: nowrap;
 
-		th,
-		td {
-			width: 25%;
-
-			@media screen and (max-width: var.$md) {
-				width: 33.33%;
-			}
-
-			&.variables-value-column,
-			&.variables-key-column,
-			&.variables-usage-column {
-				> div {
-					width: 100%;
-
-					> span {
-						max-width: 100%;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						white-space: nowrap;
-						height: 18px;
-					}
-
-					> div {
-						width: 100%;
-					}
-				}
-			}
-		}
-
-		.variables-usage-column {
-			@media screen and (max-width: var.$md) {
-				display: none;
+	table tr {
+		&:hover {
+			.action-buttons {
+				opacity: 1;
 			}
 		}
 	}
+
+	@media screen and (max-width: $breakpoint-sm) {
+		table tr th:nth-child(3),
+		table tr td:nth-child(3) {
+			display: none;
+		}
+	}
+
+	.variables-actions-column {
+		width: 170px;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
index f467406726..8fa4a6367a 100644
--- a/packages/editor-ui/src/views/WorkflowOnboardingView.vue
+++ b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useI18n } from '@/composables/useI18n';
-import { NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL, VIEWS } from '@/constants';
+import { VIEWS } from '@/constants';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-import type { IWorkflowDataCreate } from '@/Interface';
-import { SAMPLE_SUBWORKFLOW_WORKFLOW } from '@/constants.workflows';
 
 const loadingService = useLoadingService();
 const templateStore = useTemplatesStore();
@@ -17,10 +15,6 @@ const route = useRoute();
 const i18n = useI18n();
 
 const openWorkflowTemplate = async (templateId: string) => {
-	if (templateId === SAMPLE_SUBWORKFLOW_WORKFLOW.meta.templateId) {
-		await openSampleSubworkflow();
-		return;
-	}
 	try {
 		loadingService.startLoading();
 		const template = await templateStore.getFixedWorkflowTemplate(templateId);
@@ -58,42 +52,6 @@ const openWorkflowTemplate = async (templateId: string) => {
 	}
 };
 
-const openSampleSubworkflow = async () => {
-	try {
-		loadingService.startLoading();
-
-		const projectId = route.query?.projectId;
-
-		const sampleSubWorkflows = Number(route.query?.sampleSubWorkflows ?? 0);
-
-		const workflowName = `${SAMPLE_SUBWORKFLOW_WORKFLOW.name} ${sampleSubWorkflows + 1}`;
-
-		const workflow: IWorkflowDataCreate = {
-			...SAMPLE_SUBWORKFLOW_WORKFLOW,
-			name: workflowName,
-		};
-
-		if (projectId) {
-			workflow.projectId = projectId as string;
-		}
-
-		const newWorkflow = await workflowsStore.createNewWorkflow(workflow);
-
-		const sampleSubworkflowChannel = new BroadcastChannel(NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL);
-
-		sampleSubworkflowChannel.postMessage({ workflowId: newWorkflow.id });
-
-		await router.replace({
-			name: VIEWS.WORKFLOW,
-			params: { name: newWorkflow.id },
-		});
-		loadingService.stopLoading();
-	} catch (e) {
-		await router.replace({ name: VIEWS.NEW_WORKFLOW });
-		loadingService.stopLoading();
-	}
-};
-
 onMounted(async () => {
 	const templateId = route.params.id;
 	if (!templateId || typeof templateId !== 'string') {
diff --git a/packages/editor-ui/tsconfig.json b/packages/editor-ui/tsconfig.json
index 7ba161b78d..f0b5642a9d 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/editor-ui/tsconfig.json
@@ -1,16 +1,14 @@
 {
-	"extends": "../../tsconfig.json",
+	"extends": "@n8n/frontend-typescript-config",
 	"compilerOptions": {
-		"rootDirs": [".", "../design-system/src", "../@n8n/chat/src"],
-		"outDir": "dist",
-		"target": "esnext",
-		"module": "esnext",
-		"allowJs": true,
-		"importHelpers": true,
-		"incremental": false,
-		"allowSyntheticDefaultImports": true,
-		"resolveJsonModule": true,
 		"baseUrl": ".",
+		"rootDirs": [
+			".",
+			"../../frontend/@n8n/composables/src",
+			"../design-system/src",
+			"../@n8n/chat/src"
+		],
+		"outDir": "dist",
 		"types": [
 			"vitest/globals",
 			"unplugin-icons/types/vue",
@@ -18,12 +16,11 @@
 		],
 		"paths": {
 			"@/*": ["./src/*"],
-			"n8n-design-system": ["../design-system/src/main.ts"],
-			"n8n-design-system/*": ["../design-system/src/*"],
+			"n8n-design-system*": ["../design-system/src*"],
+			"@n8n/composables*": ["../frontend/@n8n/composables/src*"],
 			"@n8n/chat/*": ["../@n8n/chat/src/*"],
 			"@n8n/api-types*": ["../@n8n/api-types/src*"]
 		},
-		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
 	},
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index 0a5c157c39..fd2004f382 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -1,9 +1,10 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
+import { viteStaticCopy } from 'vite-plugin-static-copy';
 import svgLoader from 'vite-svg-loader';
 
-import { vitestConfig } from '../design-system/vite.config.mts';
+import { vitestConfig } from '@n8n/frontend-vitest-config';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import components from 'unplugin-vue-components/vite';
@@ -22,7 +23,7 @@ const alias = [
 	{ find: 'stream', replacement: 'stream-browserify' },
 	{
 		find: /^n8n-design-system$/,
-		replacement: resolve(__dirname, '..', 'design-system', 'src', 'main.ts'),
+		replacement: resolve(__dirname, '..', 'design-system', 'src', 'index.ts'),
 	},
 	{
 		find: /^n8n-design-system\//,
@@ -36,6 +37,10 @@ const alias = [
 		find: /^@n8n\/chat\//,
 		replacement: resolve(__dirname, '..', '@n8n', 'chat', 'src') + '/',
 	},
+	{
+		find: /^@n8n\/composables(.+)$/,
+		replacement: resolve(__dirname, '..', 'frontend', '@n8n', 'composables', 'src$1'),
+	},
 	...['orderBy', 'camelCase', 'cloneDeep', 'startCase'].map((name) => ({
 		find: new RegExp(`^lodash.${name}$`, 'i'),
 		replacement: `lodash-es/${name}`,
@@ -59,6 +64,12 @@ const plugins = [
 			}),
 		],
 	}),
+	viteStaticCopy({
+		targets: [
+			{ src: resolve('node_modules/web-tree-sitter/tree-sitter.wasm'), dest: '' },
+			{ src: resolve('node_modules/curlconverter/dist/tree-sitter-bash.wasm'), dest: '' },
+		],
+	}),
 	vue(),
 	svgLoader(),
 	legacy({
@@ -69,6 +80,7 @@ const plugins = [
 ];
 
 const { RELEASE: release } = process.env;
+const target = browserslistToEsbuild(browsers);
 
 export default mergeConfig(
 	defineConfig({
@@ -96,7 +108,12 @@ export default mergeConfig(
 		build: {
 			minify: !!release,
 			sourcemap: !!release,
-			target: browserslistToEsbuild(browsers),
+			target,
+		},
+		optimizeDeps: {
+			esbuildOptions: {
+				target,
+			},
 		},
 		worker: {
 			format: 'es',
diff --git a/packages/frontend/@n8n/composables/.eslintrc.cjs b/packages/frontend/@n8n/composables/.eslintrc.cjs
new file mode 100644
index 0000000000..94152c01f7
--- /dev/null
+++ b/packages/frontend/@n8n/composables/.eslintrc.cjs
@@ -0,0 +1,3 @@
+const { createFrontendEslintConfig } = require('@n8n/frontend-eslint-config');
+
+module.exports = createFrontendEslintConfig(__dirname);
diff --git a/packages/frontend/@n8n/composables/.gitignore b/packages/frontend/@n8n/composables/.gitignore
new file mode 100644
index 0000000000..a547bf36d8
--- /dev/null
+++ b/packages/frontend/@n8n/composables/.gitignore
@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?
diff --git a/packages/frontend/@n8n/composables/README.md b/packages/frontend/@n8n/composables/README.md
new file mode 100644
index 0000000000..6f97856b69
--- /dev/null
+++ b/packages/frontend/@n8n/composables/README.md
@@ -0,0 +1,24 @@
+# @n8n/composables
+
+A collection of Vue composables that provide common functionality across n8n's Front-End packages.
+
+## Table of Contents
+
+- [Features](#features)
+- [Contributing](#contributing)
+- [License](#license)
+
+## Features
+
+- **Reusable Logic**: Encapsulate complex stateful logic into composable functions.
+- **Consistency**: Ensure consistent patterns and practices across our Vue components.
+- **Extensible**: Easily add new composables as our project grows.
+- **Optimized**: Fully compatible with the Composition API.
+
+## Contributing
+
+For more details, please read our [CONTRIBUTING.md](CONTRIBUTING.md).
+
+## License
+
+For more details, please read our [LICENSE.md](LICENSE.md).
diff --git a/packages/frontend/@n8n/composables/biome.jsonc b/packages/frontend/@n8n/composables/biome.jsonc
new file mode 100644
index 0000000000..f882da95a5
--- /dev/null
+++ b/packages/frontend/@n8n/composables/biome.jsonc
@@ -0,0 +1,4 @@
+{
+	"$schema": "../../../../node_modules/@biomejs/biome/configuration_schema.json",
+	"extends": ["../../../../biome.jsonc"]
+}
diff --git a/packages/frontend/@n8n/composables/package.json b/packages/frontend/@n8n/composables/package.json
new file mode 100644
index 0000000000..eeb1e1b7c0
--- /dev/null
+++ b/packages/frontend/@n8n/composables/package.json
@@ -0,0 +1,47 @@
+{
+  "name": "@n8n/composables",
+  "type": "module",
+  "version": "1.1.0",
+  "files": [
+    "dist"
+  ],
+  "exports": {
+    "./*": {
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js",
+      "require": "./dist/*.cjs"
+    }
+  },
+  "scripts": {
+    "dev": "vite",
+    "build": "pnpm run typecheck && tsup",
+    "preview": "vite preview",
+    "typecheck": "vue-tsc --noEmit",
+    "test": "vitest run",
+    "test:dev": "vitest --silent=false",
+    "lint": "eslint src --ext .js,.ts,.vue --quiet",
+    "lintfix": "eslint src --ext .js,.ts,.vue --fix",
+    "format": "biome format --write . && prettier --write . --ignore-path ../../../../.prettierignore",
+    "format:check": "biome ci . && prettier --check . --ignore-path ../../../../.prettierignore"
+  },
+  "dependencies": {
+    "vue": "catalog:frontend"
+  },
+  "devDependencies": {
+    "@n8n/frontend-eslint-config": "workspace:*",
+    "@n8n/frontend-typescript-config": "workspace:*",
+    "@n8n/frontend-vitest-config": "workspace:*",
+    "@testing-library/jest-dom": "catalog:frontend",
+    "@testing-library/user-event": "catalog:frontend",
+    "@testing-library/vue": "catalog:frontend",
+    "@vitejs/plugin-vue": "catalog:frontend",
+    "@vue/tsconfig": "catalog:frontend",
+    "tsup": "catalog:frontend",
+    "typescript": "catalog:frontend",
+    "vite": "catalog:frontend",
+    "vite-plugin-dts": "catalog:frontend",
+    "vitest": "catalog:frontend",
+    "vue-tsc": "catalog:frontend"
+  },
+  "license": "See LICENSE.md file in the root of the repository"
+}
diff --git a/packages/frontend/@n8n/composables/src/__tests__/setup.ts b/packages/frontend/@n8n/composables/src/__tests__/setup.ts
new file mode 100644
index 0000000000..92354816ad
--- /dev/null
+++ b/packages/frontend/@n8n/composables/src/__tests__/setup.ts
@@ -0,0 +1,4 @@
+import '@testing-library/jest-dom';
+import { configure } from '@testing-library/vue';
+
+configure({ testIdAttribute: 'data-test-id' });
diff --git a/packages/frontend/@n8n/composables/src/shims.d.ts b/packages/frontend/@n8n/composables/src/shims.d.ts
new file mode 100644
index 0000000000..11f02fe2a0
--- /dev/null
+++ b/packages/frontend/@n8n/composables/src/shims.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/packages/design-system/src/composables/useDeviceSupport.test.ts b/packages/frontend/@n8n/composables/src/useDeviceSupport.test.ts
similarity index 98%
rename from packages/design-system/src/composables/useDeviceSupport.test.ts
rename to packages/frontend/@n8n/composables/src/useDeviceSupport.test.ts
index 4cfc5f3533..8d4b712e5d 100644
--- a/packages/design-system/src/composables/useDeviceSupport.test.ts
+++ b/packages/frontend/@n8n/composables/src/useDeviceSupport.test.ts
@@ -1,4 +1,4 @@
-import { useDeviceSupport } from 'n8n-design-system/composables/useDeviceSupport';
+import { useDeviceSupport } from './useDeviceSupport';
 
 const detectPointerType = (query: string) => {
 	const isCoarse = query === '(any-pointer: coarse)';
diff --git a/packages/design-system/src/composables/useDeviceSupport.ts b/packages/frontend/@n8n/composables/src/useDeviceSupport.ts
similarity index 100%
rename from packages/design-system/src/composables/useDeviceSupport.ts
rename to packages/frontend/@n8n/composables/src/useDeviceSupport.ts
diff --git a/packages/frontend/@n8n/composables/tsconfig.json b/packages/frontend/@n8n/composables/tsconfig.json
new file mode 100644
index 0000000000..3884b84bf2
--- /dev/null
+++ b/packages/frontend/@n8n/composables/tsconfig.json
@@ -0,0 +1,10 @@
+{
+	"extends": "@n8n/frontend-typescript-config",
+	"compilerOptions": {
+		"baseUrl": ".",
+		"rootDir": ".",
+		"outDir": "dist",
+		"types": ["vite/client", "vitest/globals"]
+	},
+	"include": ["src/**/*.ts", "src/**/*.vue", "vite.config.ts", "tsup.config.ts"]
+}
diff --git a/packages/frontend/@n8n/composables/tsup.config.ts b/packages/frontend/@n8n/composables/tsup.config.ts
new file mode 100644
index 0000000000..a9dc991b43
--- /dev/null
+++ b/packages/frontend/@n8n/composables/tsup.config.ts
@@ -0,0 +1,11 @@
+import { defineConfig } from 'tsup';
+
+export default defineConfig({
+	entry: ['src/useDeviceSupport.ts'],
+	format: ['cjs', 'esm'],
+	clean: true,
+	dts: true,
+	cjsInterop: true,
+	splitting: true,
+	sourcemap: true,
+});
diff --git a/packages/frontend/@n8n/composables/vite.config.ts b/packages/frontend/@n8n/composables/vite.config.ts
new file mode 100644
index 0000000000..68833e7059
--- /dev/null
+++ b/packages/frontend/@n8n/composables/vite.config.ts
@@ -0,0 +1,4 @@
+import { defineConfig, mergeConfig } from 'vite';
+import { vitestConfig } from '@n8n/frontend-vitest-config';
+
+export default mergeConfig(defineConfig({}), vitestConfig);
diff --git a/packages/frontend/tooling/eslint-config/index.cjs b/packages/frontend/tooling/eslint-config/index.cjs
new file mode 100644
index 0000000000..c50ec4f16c
--- /dev/null
+++ b/packages/frontend/tooling/eslint-config/index.cjs
@@ -0,0 +1,14 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/**
+ * @param {string} path
+ * @param {import('@types/eslint').ESLint.ConfigData} config
+ * @returns {import('@types/eslint').ESLint.ConfigData}
+ */
+module.exports.createFrontendEslintConfig = function (path, config = {}) {
+	return {
+		extends: ['@n8n_io/eslint-config/frontend'],
+		...sharedOptions(path, 'frontend'),
+		...config,
+	};
+};
diff --git a/packages/frontend/tooling/eslint-config/index.d.ts b/packages/frontend/tooling/eslint-config/index.d.ts
new file mode 100644
index 0000000000..ff0f8a329b
--- /dev/null
+++ b/packages/frontend/tooling/eslint-config/index.d.ts
@@ -0,0 +1,3 @@
+import type { ESLint } from '@types/eslint';
+
+export function createFrontendEslintConfig(path: string): ESLint.ConfigData;
diff --git a/packages/frontend/tooling/eslint-config/package.json b/packages/frontend/tooling/eslint-config/package.json
new file mode 100644
index 0000000000..af67c1680d
--- /dev/null
+++ b/packages/frontend/tooling/eslint-config/package.json
@@ -0,0 +1,23 @@
+{
+  "name": "@n8n/frontend-eslint-config",
+  "version": "1.1.0",
+  "type": "module",
+  "dependencies": {
+    "@n8n_io/eslint-config": "workspace:*",
+    "eslint-plugin-n8n-local-rules": "^1.0.0"
+  },
+  "files": [
+    "index.cjs"
+  ],
+  "main": "./index.cjs",
+  "module": "./index.cjs",
+  "exports": {
+    ".": {
+      "import": "./index.cjs",
+      "require": "./index.cjs",
+      "types": "./index.d.ts"
+    },
+    "./*": "./*"
+  },
+  "license": "See LICENSE.md file in the root of the repository"
+}
diff --git a/packages/frontend/tooling/typescript-config/package.json b/packages/frontend/tooling/typescript-config/package.json
new file mode 100644
index 0000000000..5699cd2b74
--- /dev/null
+++ b/packages/frontend/tooling/typescript-config/package.json
@@ -0,0 +1,18 @@
+{
+  "name": "@n8n/frontend-typescript-config",
+  "version": "1.1.0",
+  "type": "module",
+  "files": [
+    "tsconfig.json"
+  ],
+  "main": "./tsconfig.json",
+  "module": "./tsconfig.json",
+  "exports": {
+    ".": {
+      "import": "./tsconfig.json",
+      "require": "./tsconfig.json"
+    },
+    "./*": "./*"
+  },
+  "license": "See LICENSE.md file in the root of the repository"
+}
diff --git a/packages/frontend/tooling/typescript-config/tsconfig.json b/packages/frontend/tooling/typescript-config/tsconfig.json
new file mode 100644
index 0000000000..2ceacaaac3
--- /dev/null
+++ b/packages/frontend/tooling/typescript-config/tsconfig.json
@@ -0,0 +1,13 @@
+{
+	"extends": "../../../../tsconfig.json",
+	"compilerOptions": {
+		"target": "esnext",
+		"module": "esnext",
+		"importHelpers": true,
+		"allowJs": true,
+		"incremental": false,
+		"allowSyntheticDefaultImports": true,
+		"lib": ["esnext", "dom", "dom.iterable", "scripthost"]
+	},
+	"include": ["src/**/*.ts", "src/**/*.vue"]
+}
diff --git a/packages/frontend/tooling/vitest-config/index.d.ts b/packages/frontend/tooling/vitest-config/index.d.ts
new file mode 100644
index 0000000000..d6ecb6d5d5
--- /dev/null
+++ b/packages/frontend/tooling/vitest-config/index.d.ts
@@ -0,0 +1,3 @@
+import type { UserConfig } from 'vitest/node';
+
+export const vitestConfig: UserConfig;
diff --git a/packages/frontend/tooling/vitest-config/index.mjs b/packages/frontend/tooling/vitest-config/index.mjs
new file mode 100644
index 0000000000..5e68f23f7a
--- /dev/null
+++ b/packages/frontend/tooling/vitest-config/index.mjs
@@ -0,0 +1,30 @@
+import { defineConfig as defineVitestConfig } from 'vitest/config';
+
+/**
+ * Define a Vitest configuration
+ *
+ * @returns {import('vitest/node').UserConfig}
+ */
+export const vitestConfig = defineVitestConfig({
+	test: {
+		silent: true,
+		globals: true,
+		environment: 'jsdom',
+		setupFiles: ['./src/__tests__/setup.ts'],
+		...(process.env.COVERAGE_ENABLED === 'true'
+			? {
+					coverage: {
+						enabled: true,
+						provider: 'v8',
+						reporter: process.env.CI === 'true' ? 'cobertura' : 'text-summary',
+						all: true,
+					},
+				}
+			: {}),
+		css: {
+			modules: {
+				classNameStrategy: 'non-scoped',
+			},
+		},
+	},
+});
diff --git a/packages/frontend/tooling/vitest-config/package.json b/packages/frontend/tooling/vitest-config/package.json
new file mode 100644
index 0000000000..5c2423f334
--- /dev/null
+++ b/packages/frontend/tooling/vitest-config/package.json
@@ -0,0 +1,27 @@
+{
+  "name": "@n8n/frontend-vitest-config",
+  "version": "1.1.0",
+  "type": "module",
+  "peerDependencies": {
+    "vite": "catalog:frontend",
+    "vitest": "catalog:frontend"
+  },
+  "devDependencies": {
+    "vite": "catalog:frontend",
+    "vitest": "catalog:frontend"
+  },
+  "files": [
+    "index.mjs"
+  ],
+  "main": "./index.mjs",
+  "module": "./index.mjs",
+  "exports": {
+    ".": {
+      "import": "./index.mjs",
+      "require": "./index.mjs",
+      "types": "./index.d.ts"
+    },
+    "./*": "./*"
+  },
+  "license": "See LICENSE.md file in the root of the repository"
+}
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 92d1eaf2e9..1485883514 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.74.0",
+  "version": "1.78.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
diff --git a/packages/nodes-base/biome.jsonc b/packages/nodes-base/biome.jsonc
index 6f4325bafd..1fb7652013 100644
--- a/packages/nodes-base/biome.jsonc
+++ b/packages/nodes-base/biome.jsonc
@@ -2,6 +2,6 @@
 	"$schema": "../../node_modules/@biomejs/biome/configuration_schema.json",
 	"extends": ["../../biome.jsonc"],
 	"formatter": {
-		"ignore": ["nodes/**/test/*.json"]
+		"ignore": ["nodes/**/test/*.json", "nodes/**/__schema__/**/*.json"]
 	}
 }
diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index 9e968fdce5..3d5b37c6f2 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -138,6 +138,7 @@ export type AwsCredentialsType = {
 	sesEndpoint?: string;
 	sqsEndpoint?: string;
 	s3Endpoint?: string;
+	ssmEndpoint?: string;
 };
 
 // Some AWS services are global and don't have a region
@@ -294,6 +295,19 @@ export class Aws implements ICredentialType {
 			default: '',
 			placeholder: 'https://s3.{region}.amazonaws.com',
 		},
+		{
+			displayName: 'SSM Endpoint',
+			name: 'ssmEndpoint',
+			description: 'Endpoint for AWS Systems Manager (SSM)',
+			type: 'string',
+			displayOptions: {
+				show: {
+					customEndpoints: [true],
+				},
+			},
+			default: '',
+			placeholder: 'https://ssm.{region}.amazonaws.com',
+		},
 	];
 
 	async authenticate(
@@ -356,6 +370,8 @@ export class Aws implements ICredentialType {
 					endpointString = credentials.sqsEndpoint;
 				} else if (service) {
 					endpointString = `https://${service}.${region}.amazonaws.com`;
+				} else if (service === 'ssm' && credentials.ssmEndpoint) {
+					endpointString = credentials.ssmEndpoint;
 				}
 				endpoint = new URL(endpointString!.replace('{region}', region) + path);
 			} else {
diff --git a/packages/nodes-base/credentials/GoogleChatOAuth2Api.credentials.ts b/packages/nodes-base/credentials/GoogleChatOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..3bc678b3c4
--- /dev/null
+++ b/packages/nodes-base/credentials/GoogleChatOAuth2Api.credentials.ts
@@ -0,0 +1,26 @@
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
+const scopes = [
+	'https://www.googleapis.com/auth/chat.spaces',
+	'https://www.googleapis.com/auth/chat.messages',
+	'https://www.googleapis.com/auth/chat.memberships',
+];
+
+export class GoogleChatOAuth2Api implements ICredentialType {
+	name = 'googleChatOAuth2Api';
+
+	extends = ['googleOAuth2Api'];
+
+	displayName = 'Chat OAuth2 API';
+
+	documentationUrl = 'google/oauth-single-service';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: scopes.join(' '),
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/JenkinsApi.credentials.ts b/packages/nodes-base/credentials/JenkinsApi.credentials.ts
index 5c8166be21..cac3bbcc01 100644
--- a/packages/nodes-base/credentials/JenkinsApi.credentials.ts
+++ b/packages/nodes-base/credentials/JenkinsApi.credentials.ts
@@ -9,7 +9,7 @@ export class JenkinsApi implements ICredentialType {
 
 	properties: INodeProperties[] = [
 		{
-			displayName: 'Jenking Username',
+			displayName: 'Jenkins Username',
 			name: 'username',
 			type: 'string',
 			default: '',
diff --git a/packages/nodes-base/credentials/JiraSoftwareServerPatApi.credentials.ts b/packages/nodes-base/credentials/JiraSoftwareServerPatApi.credentials.ts
new file mode 100644
index 0000000000..96dabd5808
--- /dev/null
+++ b/packages/nodes-base/credentials/JiraSoftwareServerPatApi.credentials.ts
@@ -0,0 +1,47 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class JiraSoftwareServerPatApi implements ICredentialType {
+	name = 'jiraSoftwareServerPatApi';
+
+	displayName = 'Jira SW Server (PAT) API';
+
+	documentationUrl = 'jira';
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Personal Access Token',
+			name: 'personalAccessToken',
+			typeOptions: { password: true },
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Domain',
+			name: 'domain',
+			type: 'string',
+			default: '',
+			placeholder: 'https://example.com',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.personalAccessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials?.domain}}',
+			url: '/rest/api/2/project',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/MicrosoftAzureMonitorOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftAzureMonitorOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..e671a2789c
--- /dev/null
+++ b/packages/nodes-base/credentials/MicrosoftAzureMonitorOAuth2Api.credentials.ts
@@ -0,0 +1,102 @@
+import type { Icon, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class MicrosoftAzureMonitorOAuth2Api implements ICredentialType {
+	name = 'microsoftAzureMonitorOAuth2Api';
+
+	displayName = 'Microsoft Azure Monitor OAuth2 API';
+
+	extends = ['oAuth2Api'];
+
+	documentationUrl = 'microsoftazuremonitor';
+
+	icon: Icon = 'file:icons/Microsoft.svg';
+
+	httpRequestNode = {
+		name: 'Microsoft Azure Monitor',
+		docsUrl: 'https://learn.microsoft.com/en-us/azure/azure-monitor/logs/api/request-format',
+		apiBaseUrlPlaceholder: 'https://api.loganalytics.azure.com/v1/workspaces/[workspace_id]/query',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'options',
+			options: [
+				{
+					name: 'Authorization Code',
+					value: 'authorizationCode',
+				},
+				{
+					name: 'Client Credentials',
+					value: 'clientCredentials',
+				},
+			],
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Tenant ID',
+			required: true,
+			name: 'tenantId',
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'Resource',
+			name: 'resource',
+			type: 'options',
+			options: [
+				{
+					name: 'Azure Log Analytics',
+					value: 'https://api.loganalytics.azure.com',
+				},
+				{
+					name: 'Log Analytics',
+					value: 'https://api.loganalytics.io',
+				},
+				{
+					name: 'Azure Monitor',
+					value: 'https://monitor.azure.com',
+				},
+				{
+					name: 'Azure Management',
+					value: 'https://management.azure.com',
+				},
+			],
+			default: 'https://api.loganalytics.azure.com',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: '=https://login.microsoftonline.com/{{$self["tenantId"]}}/oauth2/authorize',
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default:
+				'=https://login.microsoftonline.com/{{$self["tenantId"]}}/oauth2/{{$self["grantType"] === "clientCredentials" ? "v2.0/" : ""}}token',
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default:
+				'={{$self["grantType"] === "clientCredentials" ? "" : "resource=" + $self["resource"]}}',
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default:
+				'={{$self["grantType"] === "clientCredentials" ? $self["resource"] + "/.default" : ""}}',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/MiroOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MiroOAuth2Api.credentials.ts
new file mode 100644
index 0000000000..16e5a0bb7a
--- /dev/null
+++ b/packages/nodes-base/credentials/MiroOAuth2Api.credentials.ts
@@ -0,0 +1,61 @@
+import type { Icon, ICredentialType, INodeProperties } from 'n8n-workflow';
+
+export class MiroOAuth2Api implements ICredentialType {
+	name = 'miroOAuth2Api';
+
+	extends = ['oAuth2Api'];
+
+	displayName = 'Miro OAuth2 API';
+
+	documentationUrl = 'miro';
+
+	icon: Icon = 'file:icons/Miro.svg';
+
+	httpRequestNode = {
+		name: 'Miro',
+		docsUrl: 'https://developers.miro.com/reference/overview',
+		apiBaseUrl: 'https://api.miro.com/v2/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Grant Type',
+			name: 'grantType',
+			type: 'hidden',
+			default: 'authorizationCode',
+		},
+		{
+			displayName: 'Authorization URL',
+			name: 'authUrl',
+			type: 'hidden',
+			default: 'https://miro.com/oauth/authorize',
+			required: true,
+		},
+		{
+			displayName: 'Access Token URL',
+			name: 'accessTokenUrl',
+			type: 'hidden',
+			default: 'https://api.miro.com/v1/oauth/token',
+			required: true,
+		},
+		{
+			displayName: 'Scope',
+			name: 'scope',
+			type: 'hidden',
+			default: '',
+			required: true,
+		},
+		{
+			displayName: 'Auth URI Query Parameters',
+			name: 'authQueryParameters',
+			type: 'hidden',
+			default: '',
+		},
+		{
+			displayName: 'Authentication',
+			name: 'authentication',
+			type: 'hidden',
+			default: 'body',
+		},
+	];
+}
diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
index 227ad7ce27..744ba3539f 100644
--- a/packages/nodes-base/credentials/Postgres.credentials.ts
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -37,6 +37,14 @@ export class Postgres implements ICredentialType {
 			},
 			default: '',
 		},
+		{
+			displayName: 'Maximum Number of Connections',
+			name: 'maxConnections',
+			type: 'number',
+			default: 100,
+			description:
+				'Make sure this value times the number of workers you have is lower than the maximum number of connections your postgres instance allows.',
+		},
 		{
 			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
diff --git a/packages/nodes-base/credentials/icons/Miro.svg b/packages/nodes-base/credentials/icons/Miro.svg
new file mode 100644
index 0000000000..b5c804f467
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Miro.svg
@@ -0,0 +1,22 @@
+<svg version="1.1" id="Layer_1" xmlns:x="ns_extend;" xmlns:i="ns_ai;" xmlns:graph="ns_graphs;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 48 48" style="enable-background:new 0 0 48 48;" xml:space="preserve">
+ <style type="text/css">
+  .st0{fill:#FFD02F;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#050038;}
+ </style>
+ <metadata>
+  <sfw xmlns="ns_sfw;">
+   <slices>
+   </slices>
+   <sliceSourceBounds bottomLeftOrigin="true" height="48" width="48" x="175.8" y="-224.2">
+   </sliceSourceBounds>
+  </sfw>
+ </metadata>
+ <g>
+  <path class="st0" d="M10.4,0h27.2C43.3,0,48,4.7,48,10.4v27.2C48,43.3,43.3,48,37.6,48H10.4C4.7,48,0,43.3,0,37.6V10.4
+		C0,4.7,4.7,0,10.4,0z">
+  </path>
+  <path class="st1" d="M33.3,6h-5.3l4.4,7.7L22.8,6h-5.3l4.8,9.4L12.3,6H7l5.3,12L7,42h5.3l10.1-25.7L17.5,42h5.3l9.7-27.4L28.1,42
+		h5.3L43,12L33.3,6z">
+  </path>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/jest.config.js b/packages/nodes-base/jest.config.js
index 721030d49c..f602d20b5b 100644
--- a/packages/nodes-base/jest.config.js
+++ b/packages/nodes-base/jest.config.js
@@ -5,6 +5,7 @@ process.env.TZ = 'UTC';
 module.exports = {
 	...require('../../jest.config'),
 	collectCoverageFrom: ['credentials/**/*.ts', 'nodes/**/*.ts', 'utils/**/*.ts'],
+	globalSetup: '<rootDir>/test/globalSetup.ts',
 	setupFilesAfterEnv: [
 		'jest-expect-message',
 		'n8n-workflow/test/setup.ts',
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
index 7938489569..50d16c3c90 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
@@ -54,6 +54,7 @@ export class ActionNetwork implements INodeType {
 		defaults: {
 			name: 'Action Network',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index 8468af3a7f..9b000f2b55 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -77,6 +77,7 @@ export class ActiveCampaign implements INodeType {
 		defaults: {
 			name: 'ActiveCampaign',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/account/get.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/account/get.json
new file mode 100644
index 0000000000..7cee20ce06
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/account/get.json
@@ -0,0 +1,51 @@
+{
+	"type": "object",
+	"properties": {
+		"account": {
+			"type": "object",
+			"properties": {
+				"accountUrl": {
+					"type": "string"
+				},
+				"createdTimestamp": {
+					"type": "string"
+				},
+				"updatedTimestamp": {
+					"type": "string"
+				},
+				"id": {
+					"type": "string"
+				},
+				"links": {
+					"type": "object",
+					"properties": {
+						"accountContacts": {
+							"type": "string"
+						},
+						"accountCustomFieldData": {
+							"type": "string"
+						},
+						"contactEmails": {
+							"type": "string"
+						},
+						"emailActivities": {
+							"type": "string"
+						},
+						"notes": {
+							"type": "string"
+						},
+						"owner": {
+							"type": "string"
+						}
+					}
+				},
+				"name": {
+					"type": "string"
+				},
+				"owner": {
+					"type": "string"
+				}
+			}
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/account/getAll.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/account/getAll.json
new file mode 100644
index 0000000000..acccfe3010
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/account/getAll.json
@@ -0,0 +1,57 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "createdTimestamp": {
+            "type": "string"
+        },
+        "updatedTimestamp": {
+            "type": "string"
+        },
+        "owner": {
+            "type": "string"
+        },
+        "contactCount": {
+            "type": "string"
+        },
+        "dealCount": {
+            "type": "string"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "notes": {
+                    "type": "string"
+                },
+                "accountCustomFieldData": {
+                    "type": "string"
+                },
+                "accountContacts": {
+                    "type": "string"
+                },
+                "emailActivities": {
+                    "type": "string"
+                },
+                "contactEmails": {
+                    "type": "string"
+                },
+                "owner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "notes",
+                "accountCustomFieldData",
+                "accountContacts",
+                "emailActivities",
+                "contactEmails",
+                "owner"
+            ]
+        },
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/create.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/create.json
new file mode 100644
index 0000000000..69965af2a2
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/create.json
@@ -0,0 +1,170 @@
+{
+    "type": "object",
+    "properties": {
+        "email": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "cdate": {
+            "type": "string"
+        },
+        "udate": {
+            "type": "string"
+        },
+        "orgid": {
+            "type": "string"
+        },
+        "orgname": {
+            "type": "string"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "bounceLogs": {
+                    "type": "string"
+                },
+                "contactAutomations": {
+                    "type": "string"
+                },
+                "contactData": {
+                    "type": "string"
+                },
+                "contactGoals": {
+                    "type": "string"
+                },
+                "contactLists": {
+                    "type": "string"
+                },
+                "contactLogs": {
+                    "type": "string"
+                },
+                "contactTags": {
+                    "type": "string"
+                },
+                "contactDeals": {
+                    "type": "string"
+                },
+                "deals": {
+                    "type": "string"
+                },
+                "fieldValues": {
+                    "type": "string"
+                },
+                "geoIps": {
+                    "type": "string"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "organization": {
+                    "type": "string"
+                },
+                "plusAppend": {
+                    "type": "string"
+                },
+                "trackingLogs": {
+                    "type": "string"
+                },
+                "scoreValues": {
+                    "type": "string"
+                },
+                "accountContacts": {
+                    "type": "string"
+                },
+                "automationEntryCounts": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "bounceLogs",
+                "contactAutomations",
+                "contactData",
+                "contactGoals",
+                "contactLists",
+                "contactLogs",
+                "contactTags",
+                "contactDeals",
+                "deals",
+                "fieldValues",
+                "geoIps",
+                "notes",
+                "organization",
+                "plusAppend",
+                "trackingLogs",
+                "scoreValues",
+                "automationEntryCounts"
+            ]
+        },
+        "fieldValues": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "id": {
+            "type": "string"
+        },
+        "segmentio_id": {
+            "type": "string"
+        },
+        "bounced_hard": {
+            "type": "string"
+        },
+        "bounced_soft": {
+            "type": "string"
+        },
+        "ip": {
+            "type": "string"
+        },
+        "hash": {
+            "type": "string"
+        },
+        "socialdata_lastcheck": {
+            "type": "null"
+        },
+        "email_local": {
+            "type": "string"
+        },
+        "email_domain": {
+            "type": "string"
+        },
+        "sentcnt": {
+            "type": "string"
+        },
+        "gravatar": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "string"
+        },
+        "anonymized": {
+            "type": "string"
+        },
+        "deleted_at": {
+            "type": "null"
+        },
+        "created_utc_timestamp": {
+            "type": "string"
+        },
+        "updated_utc_timestamp": {
+            "type": "string"
+        },
+        "created_timestamp": {
+            "type": "string"
+        },
+        "updated_timestamp": {
+            "type": "string"
+        },
+        "mpp_tracking": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/get.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/get.json
new file mode 100644
index 0000000000..84f21abd84
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/get.json
@@ -0,0 +1,911 @@
+{
+    "type": "object",
+    "properties": {
+        "contactAutomations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "contact": {
+                        "type": "string"
+                    },
+                    "seriesid": {
+                        "type": "string"
+                    },
+                    "startid": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "adddate": {
+                        "type": "string"
+                    },
+                    "lastblock": {
+                        "type": "string"
+                    },
+                    "lastlogid": {
+                        "type": "string"
+                    },
+                    "lastdate": {
+                        "type": "string"
+                    },
+                    "completedElements": {
+                        "type": "integer"
+                    },
+                    "totalElements": {
+                        "type": "integer"
+                    },
+                    "completed": {
+                        "type": "integer"
+                    },
+                    "completeValue": {
+                        "type": "integer"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "automation": {
+                                "type": "string"
+                            },
+                            "contact": {
+                                "type": "string"
+                            },
+                            "contactGoals": {
+                                "type": "string"
+                            },
+                            "automationLogs": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "automation",
+                            "contact",
+                            "contactGoals",
+                            "automationLogs"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "automation": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "contact",
+                    "seriesid",
+                    "startid",
+                    "status",
+                    "batchid",
+                    "adddate",
+                    "remdate",
+                    "timespan",
+                    "lastblock",
+                    "lastlogid",
+                    "lastdate",
+                    "in_als",
+                    "completedElements",
+                    "totalElements",
+                    "completed",
+                    "completeValue",
+                    "links",
+                    "id",
+                    "automation"
+                ]
+            }
+        },
+        "contactData": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "contact": {
+                        "type": "string"
+                    },
+                    "tstamp": {
+                        "type": "string"
+                    },
+                    "geoIp4": {
+                        "type": "string"
+                    },
+                    "geoCountry2": {
+                        "type": "string"
+                    },
+                    "geo_country": {
+                        "type": "string"
+                    },
+                    "geoState": {
+                        "type": "string"
+                    },
+                    "geoCity": {
+                        "type": "string"
+                    },
+                    "geoZip": {
+                        "type": "string"
+                    },
+                    "geoArea": {
+                        "type": "string"
+                    },
+                    "geoLat": {
+                        "type": "string"
+                    },
+                    "geoLon": {
+                        "type": "string"
+                    },
+                    "geoTz": {
+                        "type": "string"
+                    },
+                    "geoTzOffset": {
+                        "type": "string"
+                    },
+                    "ga_campaign_source": {
+                        "type": "string"
+                    },
+                    "ga_campaign_name": {
+                        "type": "string"
+                    },
+                    "ga_campaign_medium": {
+                        "type": "string"
+                    },
+                    "ga_campaign_term": {
+                        "type": "string"
+                    },
+                    "ga_campaign_content": {
+                        "type": "string"
+                    },
+                    "ga_campaign_customsegment": {
+                        "type": "string"
+                    },
+                    "ga_first_visit": {
+                        "type": "null"
+                    },
+                    "ga_times_visited": {
+                        "type": "string"
+                    },
+                    "fb_id": {
+                        "type": "string"
+                    },
+                    "fb_name": {
+                        "type": "string"
+                    },
+                    "tw_id": {
+                        "type": "string"
+                    },
+                    "created_timestamp": {
+                        "type": "string"
+                    },
+                    "updated_timestamp": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "contact",
+                    "tstamp",
+                    "geoTstamp",
+                    "geoIp4",
+                    "geoCountry2",
+                    "geo_country",
+                    "geoState",
+                    "geoCity",
+                    "geoZip",
+                    "geoArea",
+                    "geoLat",
+                    "geoLon",
+                    "geoTz",
+                    "geoTzOffset",
+                    "ga_campaign_source",
+                    "ga_campaign_name",
+                    "ga_campaign_medium",
+                    "ga_campaign_term",
+                    "ga_campaign_content",
+                    "ga_campaign_customsegment",
+                    "ga_first_visit",
+                    "ga_times_visited",
+                    "fb_id",
+                    "fb_name",
+                    "tw_id",
+                    "created_timestamp",
+                    "updated_timestamp",
+                    "created_by",
+                    "updated_by",
+                    "links",
+                    "id"
+                ]
+            }
+        },
+        "contactLists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "contact": {
+                        "type": "string"
+                    },
+                    "list": {
+                        "type": "string"
+                    },
+                    "seriesid": {
+                        "type": "string"
+                    },
+                    "sdate": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "responder": {
+                        "type": "string"
+                    },
+                    "sync": {
+                        "type": "string"
+                    },
+                    "message": {
+                        "type": "null"
+                    },
+                    "first_name": {
+                        "type": "string"
+                    },
+                    "last_name": {
+                        "type": "string"
+                    },
+                    "ip4Sub": {
+                        "type": "string"
+                    },
+                    "sourceid": {
+                        "type": "string"
+                    },
+                    "autosyncLog": {
+                        "type": "null"
+                    },
+                    "ip4_last": {
+                        "type": "string"
+                    },
+                    "ip4Unsub": {
+                        "type": "string"
+                    },
+                    "created_timestamp": {
+                        "type": "string"
+                    },
+                    "updated_timestamp": {
+                        "type": "string"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "automation": {
+                                "type": "string"
+                            },
+                            "list": {
+                                "type": "string"
+                            },
+                            "contact": {
+                                "type": "string"
+                            },
+                            "form": {
+                                "type": "string"
+                            },
+                            "autosyncLog": {
+                                "type": "string"
+                            },
+                            "campaign": {
+                                "type": "string"
+                            },
+                            "unsubscribeAutomation": {
+                                "type": "string"
+                            },
+                            "message": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "automation",
+                            "list",
+                            "contact",
+                            "form",
+                            "autosyncLog",
+                            "campaign",
+                            "unsubscribeAutomation",
+                            "message"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "contact",
+                    "list",
+                    "form",
+                    "seriesid",
+                    "sdate",
+                    "udate",
+                    "status",
+                    "responder",
+                    "sync",
+                    "unsubreason",
+                    "campaign",
+                    "message",
+                    "first_name",
+                    "last_name",
+                    "ip4Sub",
+                    "sourceid",
+                    "autosyncLog",
+                    "ip4_last",
+                    "ip4Unsub",
+                    "created_timestamp",
+                    "updated_timestamp",
+                    "created_by",
+                    "updated_by",
+                    "unsubscribeAutomation",
+                    "links",
+                    "id",
+                    "automation"
+                ]
+            }
+        },
+        "deals": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "hash": {
+                        "type": "string"
+                    },
+                    "owner": {
+                        "type": "string"
+                    },
+                    "contact": {
+                        "type": "string"
+                    },
+                    "group": {
+                        "type": "string"
+                    },
+                    "stage": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "percent": {
+                        "type": "string"
+                    },
+                    "cdate": {
+                        "type": "string"
+                    },
+                    "mdate": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "currency": {
+                        "type": "string"
+                    },
+                    "winProbability": {
+                        "type": "null"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "activitycount": {
+                        "type": "string"
+                    },
+                    "nextdealid": {
+                        "type": "string"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "dealActivities": {
+                                "type": "string"
+                            },
+                            "contact": {
+                                "type": "string"
+                            },
+                            "contactDeals": {
+                                "type": "string"
+                            },
+                            "group": {
+                                "type": "string"
+                            },
+                            "nextTask": {
+                                "type": "string"
+                            },
+                            "notes": {
+                                "type": "string"
+                            },
+                            "account": {
+                                "type": "string"
+                            },
+                            "customerAccount": {
+                                "type": "string"
+                            },
+                            "organization": {
+                                "type": "string"
+                            },
+                            "owner": {
+                                "type": "string"
+                            },
+                            "scoreValues": {
+                                "type": "string"
+                            },
+                            "stage": {
+                                "type": "string"
+                            },
+                            "tasks": {
+                                "type": "string"
+                            },
+                            "dealCustomFieldData": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "dealActivities",
+                            "contact",
+                            "contactDeals",
+                            "group",
+                            "nextTask",
+                            "notes",
+                            "account",
+                            "customerAccount",
+                            "organization",
+                            "owner",
+                            "scoreValues",
+                            "stage",
+                            "tasks",
+                            "dealCustomFieldData"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "isDisabled": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "hash",
+                    "owner",
+                    "contact",
+                    "organization",
+                    "group",
+                    "stage",
+                    "title",
+                    "description",
+                    "percent",
+                    "cdate",
+                    "mdate",
+                    "nextdate",
+                    "nexttaskid",
+                    "value",
+                    "currency",
+                    "winProbability",
+                    "winProbabilityMdate",
+                    "status",
+                    "activitycount",
+                    "nextdealid",
+                    "edate",
+                    "links",
+                    "id",
+                    "isDisabled",
+                    "account",
+                    "customerAccount"
+                ]
+            }
+        },
+        "fieldValues": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "contact": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "cdate": {
+                        "type": "string"
+                    },
+                    "udate": {
+                        "type": "string"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "owner": {
+                                "type": "string"
+                            },
+                            "field": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "owner",
+                            "field"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "owner": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "contact",
+                    "field",
+                    "value",
+                    "cdate",
+                    "udate",
+                    "created_by",
+                    "updated_by",
+                    "links",
+                    "id",
+                    "owner"
+                ]
+            }
+        },
+        "geoIps": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "contact": {
+                        "type": "string"
+                    },
+                    "campaignid": {
+                        "type": "string"
+                    },
+                    "messageid": {
+                        "type": "string"
+                    },
+                    "geoaddrid": {
+                        "type": "string"
+                    },
+                    "ip4": {
+                        "type": "string"
+                    },
+                    "tstamp": {
+                        "type": "string"
+                    },
+                    "geoAddress": {
+                        "type": "string"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "geoAddress": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "geoAddress"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "contact",
+                    "campaignid",
+                    "messageid",
+                    "geoaddrid",
+                    "ip4",
+                    "tstamp",
+                    "geoAddress",
+                    "links",
+                    "id"
+                ]
+            }
+        },
+        "contact": {
+            "type": "object",
+            "properties": {
+                "cdate": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                },
+                "firstName": {
+                    "type": "string"
+                },
+                "lastName": {
+                    "type": "string"
+                },
+                "orgid": {
+                    "type": "string"
+                },
+                "orgname": {
+                    "type": "string"
+                },
+                "segmentio_id": {
+                    "type": "string"
+                },
+                "bounced_hard": {
+                    "type": "string"
+                },
+                "bounced_soft": {
+                    "type": "string"
+                },
+                "ip": {
+                    "type": "string"
+                },
+                "hash": {
+                    "type": "string"
+                },
+                "socialdata_lastcheck": {
+                    "type": "null"
+                },
+                "email_local": {
+                    "type": "string"
+                },
+                "email_domain": {
+                    "type": "string"
+                },
+                "sentcnt": {
+                    "type": "string"
+                },
+                "gravatar": {
+                    "type": "string"
+                },
+                "deleted": {
+                    "type": "string"
+                },
+                "anonymized": {
+                    "type": "string"
+                },
+                "udate": {
+                    "type": "string"
+                },
+                "deleted_at": {
+                    "type": "null"
+                },
+                "created_utc_timestamp": {
+                    "type": "string"
+                },
+                "updated_utc_timestamp": {
+                    "type": "string"
+                },
+                "created_timestamp": {
+                    "type": "string"
+                },
+                "updated_timestamp": {
+                    "type": "string"
+                },
+                "mpp_tracking": {
+                    "type": "string"
+                },
+                "contactAutomations": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "contactLists": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "contactData": {
+                    "type": "string"
+                },
+                "fieldValues": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "geoIps": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "deals": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "accountContacts": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "links": {
+                    "type": "object",
+                    "properties": {
+                        "bounceLogs": {
+                            "type": "string"
+                        },
+                        "contactAutomations": {
+                            "type": "string"
+                        },
+                        "contactData": {
+                            "type": "string"
+                        },
+                        "contactGoals": {
+                            "type": "string"
+                        },
+                        "contactLists": {
+                            "type": "string"
+                        },
+                        "contactLogs": {
+                            "type": "string"
+                        },
+                        "contactTags": {
+                            "type": "string"
+                        },
+                        "contactDeals": {
+                            "type": "string"
+                        },
+                        "deals": {
+                            "type": "string"
+                        },
+                        "fieldValues": {
+                            "type": "string"
+                        },
+                        "geoIps": {
+                            "type": "string"
+                        },
+                        "notes": {
+                            "type": "string"
+                        },
+                        "organization": {
+                            "type": "string"
+                        },
+                        "plusAppend": {
+                            "type": "string"
+                        },
+                        "trackingLogs": {
+                            "type": "string"
+                        },
+                        "scoreValues": {
+                            "type": "string"
+                        },
+                        "automationEntryCounts": {
+                            "type": "string"
+                        },
+                        "accountContacts": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "bounceLogs",
+                        "contactAutomations",
+                        "contactData",
+                        "contactGoals",
+                        "contactLists",
+                        "contactLogs",
+                        "contactTags",
+                        "contactDeals",
+                        "deals",
+                        "fieldValues",
+                        "geoIps",
+                        "notes",
+                        "organization",
+                        "plusAppend",
+                        "trackingLogs",
+                        "scoreValues",
+                        "automationEntryCounts"
+                    ]
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "cdate",
+                "email",
+                "phone",
+                "firstName",
+                "lastName",
+                "orgid",
+                "orgname",
+                "segmentio_id",
+                "bounced_hard",
+                "bounced_soft",
+                "bounced_date",
+                "ip",
+                "ua",
+                "hash",
+                "socialdata_lastcheck",
+                "email_local",
+                "email_domain",
+                "sentcnt",
+                "rating_tstamp",
+                "gravatar",
+                "deleted",
+                "anonymized",
+                "adate",
+                "udate",
+                "edate",
+                "deleted_at",
+                "created_utc_timestamp",
+                "updated_utc_timestamp",
+                "created_timestamp",
+                "updated_timestamp",
+                "created_by",
+                "updated_by",
+                "mpp_tracking",
+                "last_click_date",
+                "last_open_date",
+                "last_mpp_open_date",
+                "contactAutomations",
+                "contactLists",
+                "fieldValues",
+                "geoIps",
+                "deals",
+                "accountContacts",
+                "links",
+                "id",
+                "organization"
+            ]
+        },
+        "accountContacts": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "account": {
+                        "type": "string"
+                    },
+                    "contact": {
+                        "type": "string"
+                    },
+                    "jobTitle": {
+                        "type": "string"
+                    },
+                    "createdTimestamp": {
+                        "type": "string"
+                    },
+                    "updatedTimestamp": {
+                        "type": "string"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "account": {
+                                "type": "string"
+                            },
+                            "contact": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "account",
+                            "contact"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "account",
+                    "contact",
+                    "jobTitle",
+                    "createdTimestamp",
+                    "updatedTimestamp",
+                    "links",
+                    "id"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..ae3b678c1f
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,142 @@
+{
+    "type": "object",
+    "properties": {
+        "email": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "orgid": {
+            "type": "string"
+        },
+        "orgname": {
+            "type": "string"
+        },
+        "segmentio_id": {
+            "type": "string"
+        },
+        "bounced_hard": {
+            "type": "string"
+        },
+        "bounced_soft": {
+            "type": "string"
+        },
+        "ip": {
+            "type": "string"
+        },
+        "hash": {
+            "type": "string"
+        },
+        "socialdata_lastcheck": {
+            "type": "null"
+        },
+        "email_local": {
+            "type": "string"
+        },
+        "email_domain": {
+            "type": "string"
+        },
+        "sentcnt": {
+            "type": "string"
+        },
+        "gravatar": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "string"
+        },
+        "anonymized": {
+            "type": "string"
+        },
+        "udate": {
+            "type": "string"
+        },
+        "deleted_at": {
+            "type": "null"
+        },
+        "created_utc_timestamp": {
+            "type": "string"
+        },
+        "updated_utc_timestamp": {
+            "type": "string"
+        },
+        "created_timestamp": {
+            "type": "string"
+        },
+        "updated_timestamp": {
+            "type": "string"
+        },
+        "mpp_tracking": {
+            "type": "string"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "bounceLogs": {
+                    "type": "string"
+                },
+                "contactAutomations": {
+                    "type": "string"
+                },
+                "contactData": {
+                    "type": "string"
+                },
+                "contactGoals": {
+                    "type": "string"
+                },
+                "contactLists": {
+                    "type": "string"
+                },
+                "contactLogs": {
+                    "type": "string"
+                },
+                "contactTags": {
+                    "type": "string"
+                },
+                "contactDeals": {
+                    "type": "string"
+                },
+                "deals": {
+                    "type": "string"
+                },
+                "fieldValues": {
+                    "type": "string"
+                },
+                "geoIps": {
+                    "type": "string"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "organization": {
+                    "type": "string"
+                },
+                "plusAppend": {
+                    "type": "string"
+                },
+                "trackingLogs": {
+                    "type": "string"
+                },
+                "scoreValues": {
+                    "type": "string"
+                },
+                "accountContacts": {
+                    "type": "string"
+                },
+                "automationEntryCounts": {
+                    "type": "string"
+                }
+            }
+        },
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/update.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/update.json
new file mode 100644
index 0000000000..ab3bf392db
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contact/update.json
@@ -0,0 +1,208 @@
+{
+    "type": "object",
+    "properties": {
+        "cdate": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "orgid": {
+            "type": "string"
+        },
+        "orgname": {
+            "type": "string"
+        },
+        "segmentio_id": {
+            "type": "string"
+        },
+        "bounced_hard": {
+            "type": "string"
+        },
+        "bounced_soft": {
+            "type": "string"
+        },
+        "ip": {
+            "type": "string"
+        },
+        "hash": {
+            "type": "string"
+        },
+        "socialdata_lastcheck": {
+            "type": "null"
+        },
+        "email_local": {
+            "type": "string"
+        },
+        "email_domain": {
+            "type": "string"
+        },
+        "sentcnt": {
+            "type": "string"
+        },
+        "gravatar": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "string"
+        },
+        "anonymized": {
+            "type": "string"
+        },
+        "udate": {
+            "type": "string"
+        },
+        "deleted_at": {
+            "type": "null"
+        },
+        "created_utc_timestamp": {
+            "type": "string"
+        },
+        "updated_utc_timestamp": {
+            "type": "string"
+        },
+        "created_timestamp": {
+            "type": "string"
+        },
+        "updated_timestamp": {
+            "type": "string"
+        },
+        "mpp_tracking": {
+            "type": "string"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "bounceLogs": {
+                    "type": "string"
+                },
+                "contactAutomations": {
+                    "type": "string"
+                },
+                "contactData": {
+                    "type": "string"
+                },
+                "contactGoals": {
+                    "type": "string"
+                },
+                "contactLists": {
+                    "type": "string"
+                },
+                "contactLogs": {
+                    "type": "string"
+                },
+                "contactTags": {
+                    "type": "string"
+                },
+                "contactDeals": {
+                    "type": "string"
+                },
+                "deals": {
+                    "type": "string"
+                },
+                "fieldValues": {
+                    "type": "string"
+                },
+                "geoIps": {
+                    "type": "string"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "organization": {
+                    "type": "string"
+                },
+                "plusAppend": {
+                    "type": "string"
+                },
+                "trackingLogs": {
+                    "type": "string"
+                },
+                "scoreValues": {
+                    "type": "string"
+                },
+                "accountContacts": {
+                    "type": "string"
+                },
+                "automationEntryCounts": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "bounceLogs",
+                "contactAutomations",
+                "contactData",
+                "contactGoals",
+                "contactLists",
+                "contactLogs",
+                "contactTags",
+                "contactDeals",
+                "deals",
+                "fieldValues",
+                "geoIps",
+                "notes",
+                "organization",
+                "plusAppend",
+                "trackingLogs",
+                "scoreValues",
+                "automationEntryCounts"
+            ]
+        },
+        "fieldValues": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "cdate",
+        "email",
+        "phone",
+        "firstName",
+        "lastName",
+        "orgid",
+        "orgname",
+        "segmentio_id",
+        "bounced_hard",
+        "bounced_soft",
+        "bounced_date",
+        "ip",
+        "ua",
+        "hash",
+        "socialdata_lastcheck",
+        "email_local",
+        "email_domain",
+        "sentcnt",
+        "rating_tstamp",
+        "gravatar",
+        "deleted",
+        "anonymized",
+        "adate",
+        "udate",
+        "edate",
+        "deleted_at",
+        "created_utc_timestamp",
+        "updated_utc_timestamp",
+        "created_timestamp",
+        "updated_timestamp",
+        "created_by",
+        "updated_by",
+        "mpp_tracking",
+        "links",
+        "id",
+        "organization"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contactList/add.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contactList/add.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contactList/add.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contactTag/add.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contactTag/add.json
new file mode 100644
index 0000000000..6c24c4ddb8
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/contactTag/add.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "cdate": {
+            "type": "string"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "tag": {
+                    "type": "string"
+                },
+                "contact": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "tag",
+                "contact"
+            ]
+        },
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/create.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/create.json
new file mode 100644
index 0000000000..4301da3105
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/create.json
@@ -0,0 +1,518 @@
+{
+    "type": "object",
+    "properties": {
+        "contacts": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "cdate": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    },
+                    "phone": {
+                        "type": "string"
+                    },
+                    "firstName": {
+                        "type": "string"
+                    },
+                    "lastName": {
+                        "type": "string"
+                    },
+                    "orgid": {
+                        "type": "string"
+                    },
+                    "orgname": {
+                        "type": "string"
+                    },
+                    "segmentio_id": {
+                        "type": "string"
+                    },
+                    "bounced_hard": {
+                        "type": "string"
+                    },
+                    "bounced_soft": {
+                        "type": "string"
+                    },
+                    "bounced_date": {
+                        "type": "null"
+                    },
+                    "ip": {
+                        "type": "string"
+                    },
+                    "hash": {
+                        "type": "string"
+                    },
+                    "socialdata_lastcheck": {
+                        "type": "null"
+                    },
+                    "email_local": {
+                        "type": "string"
+                    },
+                    "email_domain": {
+                        "type": "string"
+                    },
+                    "sentcnt": {
+                        "type": "string"
+                    },
+                    "gravatar": {
+                        "type": "string"
+                    },
+                    "deleted": {
+                        "type": "string"
+                    },
+                    "anonymized": {
+                        "type": "string"
+                    },
+                    "udate": {
+                        "type": "string"
+                    },
+                    "deleted_at": {
+                        "type": "null"
+                    },
+                    "created_utc_timestamp": {
+                        "type": "string"
+                    },
+                    "updated_utc_timestamp": {
+                        "type": "string"
+                    },
+                    "created_timestamp": {
+                        "type": "string"
+                    },
+                    "updated_timestamp": {
+                        "type": "string"
+                    },
+                    "mpp_tracking": {
+                        "type": "string"
+                    },
+                    "last_mpp_open_date": {
+                        "type": "null"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "bounceLogs": {
+                                "type": "string"
+                            },
+                            "contactAutomations": {
+                                "type": "string"
+                            },
+                            "contactData": {
+                                "type": "string"
+                            },
+                            "contactGoals": {
+                                "type": "string"
+                            },
+                            "contactLists": {
+                                "type": "string"
+                            },
+                            "contactLogs": {
+                                "type": "string"
+                            },
+                            "contactTags": {
+                                "type": "string"
+                            },
+                            "contactDeals": {
+                                "type": "string"
+                            },
+                            "deals": {
+                                "type": "string"
+                            },
+                            "fieldValues": {
+                                "type": "string"
+                            },
+                            "geoIps": {
+                                "type": "string"
+                            },
+                            "notes": {
+                                "type": "string"
+                            },
+                            "organization": {
+                                "type": "string"
+                            },
+                            "plusAppend": {
+                                "type": "string"
+                            },
+                            "trackingLogs": {
+                                "type": "string"
+                            },
+                            "scoreValues": {
+                                "type": "string"
+                            },
+                            "accountContacts": {
+                                "type": "string"
+                            },
+                            "automationEntryCounts": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "bounceLogs",
+                            "contactAutomations",
+                            "contactData",
+                            "contactGoals",
+                            "contactLists",
+                            "contactLogs",
+                            "contactTags",
+                            "contactDeals",
+                            "deals",
+                            "fieldValues",
+                            "geoIps",
+                            "notes",
+                            "organization",
+                            "plusAppend",
+                            "trackingLogs",
+                            "scoreValues",
+                            "accountContacts",
+                            "automationEntryCounts"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "organization": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "cdate",
+                    "email",
+                    "phone",
+                    "firstName",
+                    "lastName",
+                    "orgid",
+                    "orgname",
+                    "segmentio_id",
+                    "bounced_hard",
+                    "bounced_soft",
+                    "bounced_date",
+                    "ip",
+                    "ua",
+                    "hash",
+                    "socialdata_lastcheck",
+                    "email_local",
+                    "email_domain",
+                    "sentcnt",
+                    "rating_tstamp",
+                    "gravatar",
+                    "deleted",
+                    "anonymized",
+                    "adate",
+                    "udate",
+                    "edate",
+                    "deleted_at",
+                    "created_utc_timestamp",
+                    "updated_utc_timestamp",
+                    "created_timestamp",
+                    "updated_timestamp",
+                    "created_by",
+                    "updated_by",
+                    "mpp_tracking",
+                    "last_click_date",
+                    "last_open_date",
+                    "last_mpp_open_date",
+                    "links",
+                    "id",
+                    "organization"
+                ]
+            }
+        },
+        "dealGroups": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "title": {
+                        "type": "string"
+                    },
+                    "currency": {
+                        "type": "string"
+                    },
+                    "autoassign": {
+                        "type": "string"
+                    },
+                    "allusers": {
+                        "type": "string"
+                    },
+                    "allgroups": {
+                        "type": "string"
+                    },
+                    "win_probability_initialize_date": {
+                        "type": "null"
+                    },
+                    "cdate": {
+                        "type": "string"
+                    },
+                    "udate": {
+                        "type": "string"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "stages": {
+                                "type": "string"
+                            },
+                            "dealGroupUsers": {
+                                "type": "string"
+                            },
+                            "dealGroupGroups": {
+                                "type": "string"
+                            },
+                            "winProbabilityFeatures": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "stages",
+                            "dealGroupUsers",
+                            "dealGroupGroups",
+                            "winProbabilityFeatures"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "title",
+                    "currency",
+                    "autoassign",
+                    "allusers",
+                    "allgroups",
+                    "win_probability_initialize_date",
+                    "cdate",
+                    "udate",
+                    "links",
+                    "id"
+                ]
+            }
+        },
+        "dealStages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "group": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "order": {
+                        "type": "string"
+                    },
+                    "width": {
+                        "type": "string"
+                    },
+                    "dealOrder": {
+                        "type": "string"
+                    },
+                    "cardRegion1": {
+                        "type": "string"
+                    },
+                    "cardRegion2": {
+                        "type": "string"
+                    },
+                    "cardRegion3": {
+                        "type": "string"
+                    },
+                    "cardRegion4": {
+                        "type": "string"
+                    },
+                    "cardRegion5": {
+                        "type": "string"
+                    },
+                    "cdate": {
+                        "type": "null"
+                    },
+                    "links": {
+                        "type": "object",
+                        "properties": {
+                            "group": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "group"
+                        ]
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "group",
+                    "title",
+                    "color",
+                    "order",
+                    "width",
+                    "dealOrder",
+                    "cardRegion1",
+                    "cardRegion2",
+                    "cardRegion3",
+                    "cardRegion4",
+                    "cardRegion5",
+                    "cdate",
+                    "udate",
+                    "links",
+                    "id"
+                ]
+            }
+        },
+        "deal": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "currency": {
+                    "type": "string"
+                },
+                "contact": {
+                    "type": "string"
+                },
+                "cdate": {
+                    "type": "string"
+                },
+                "mdate": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "organization": {
+                    "type": "null"
+                },
+                "status": {
+                    "type": "integer"
+                },
+                "nextdate": {
+                    "type": "null"
+                },
+                "nextdealid": {
+                    "type": "string"
+                },
+                "hash": {
+                    "type": "string"
+                },
+                "winProbability": {
+                    "type": "null"
+                },
+                "winProbabilityMdate": {
+                    "type": "null"
+                },
+                "links": {
+                    "type": "object",
+                    "properties": {
+                        "dealActivities": {
+                            "type": "string"
+                        },
+                        "contact": {
+                            "type": "string"
+                        },
+                        "contactDeals": {
+                            "type": "string"
+                        },
+                        "group": {
+                            "type": "string"
+                        },
+                        "nextTask": {
+                            "type": "string"
+                        },
+                        "notes": {
+                            "type": "string"
+                        },
+                        "account": {
+                            "type": "string"
+                        },
+                        "customerAccount": {
+                            "type": "string"
+                        },
+                        "organization": {
+                            "type": "string"
+                        },
+                        "owner": {
+                            "type": "string"
+                        },
+                        "scoreValues": {
+                            "type": "string"
+                        },
+                        "stage": {
+                            "type": "string"
+                        },
+                        "tasks": {
+                            "type": "string"
+                        },
+                        "dealCustomFieldData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "dealActivities",
+                        "contact",
+                        "contactDeals",
+                        "group",
+                        "nextTask",
+                        "notes",
+                        "account",
+                        "customerAccount",
+                        "organization",
+                        "owner",
+                        "scoreValues",
+                        "stage",
+                        "tasks",
+                        "dealCustomFieldData"
+                    ]
+                },
+                "id": {
+                    "type": "string"
+                },
+                "isDisabled": {
+                    "type": "boolean"
+                },
+                "account": {
+                    "type": "null"
+                },
+                "customerAccount": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "title",
+                "value",
+                "currency",
+                "contact",
+                "group",
+                "cdate",
+                "mdate",
+                "description",
+                "owner",
+                "stage",
+                "organization",
+                "status",
+                "nextdate",
+                "nextdealid",
+                "hash",
+                "winProbability",
+                "winProbabilityMdate",
+                "links",
+                "fields",
+                "id",
+                "isDisabled",
+                "account",
+                "customerAccount"
+            ]
+        }
+    },
+    "required": [
+        "contacts",
+        "dealGroups",
+        "dealStages",
+        "deal"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/get.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/get.json
new file mode 100644
index 0000000000..d2b4aa44db
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/get.json
@@ -0,0 +1,152 @@
+{
+	"type": "object",
+	"properties": {
+		"deal": {
+			"type": "object",
+			"properties": {
+				"hash": {
+					"type": "string"
+				},
+				"owner": {
+					"type": "string"
+				},
+				"group": {
+					"type": "string"
+				},
+				"stage": {
+					"type": "string"
+				},
+				"title": {
+					"type": "string"
+				},
+				"description": {
+					"type": "string"
+				},
+				"percent": {
+					"type": "string"
+				},
+				"cdate": {
+					"type": "string"
+				},
+				"mdate": {
+					"type": "string"
+				},
+				"value": {
+					"type": "string"
+				},
+				"currency": {
+					"type": "string"
+				},
+				"status": {
+					"type": "string"
+				},
+				"activitycount": {
+					"type": "string"
+				},
+				"nextdealid": {
+					"type": "string"
+				},
+				"links": {
+					"type": "object",
+					"properties": {
+						"dealActivities": {
+							"type": "string"
+						},
+						"contact": {
+							"type": "string"
+						},
+						"contactDeals": {
+							"type": "string"
+						},
+						"group": {
+							"type": "string"
+						},
+						"nextTask": {
+							"type": "string"
+						},
+						"notes": {
+							"type": "string"
+						},
+						"account": {
+							"type": "string"
+						},
+						"customerAccount": {
+							"type": "string"
+						},
+						"organization": {
+							"type": "string"
+						},
+						"owner": {
+							"type": "string"
+						},
+						"scoreValues": {
+							"type": "string"
+						},
+						"stage": {
+							"type": "string"
+						},
+						"tasks": {
+							"type": "string"
+						},
+						"dealCustomFieldData": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"dealActivities",
+						"contact",
+						"contactDeals",
+						"group",
+						"nextTask",
+						"notes",
+						"account",
+						"customerAccount",
+						"organization",
+						"owner",
+						"scoreValues",
+						"stage",
+						"tasks",
+						"dealCustomFieldData"
+					]
+				},
+				"id": {
+					"type": "string"
+				},
+				"isDisabled": {
+					"type": "boolean"
+				}
+			},
+			"required": [
+				"hash",
+				"owner",
+				"contact",
+				"organization",
+				"group",
+				"stage",
+				"title",
+				"description",
+				"percent",
+				"cdate",
+				"mdate",
+				"nextdate",
+				"nexttaskid",
+				"value",
+				"currency",
+				"winProbability",
+				"winProbabilityMdate",
+				"status",
+				"activitycount",
+				"nextdealid",
+				"edate",
+				"links",
+				"id",
+				"isDisabled",
+				"account",
+				"customerAccount"
+			]
+		}
+	},
+	"required": [
+		"deal"
+	]
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/getAll.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/getAll.json
new file mode 100644
index 0000000000..7330a41e42
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/getAll.json
@@ -0,0 +1,116 @@
+{
+	"type": "object",
+	"properties": {
+		"hash": {
+			"type": "string"
+		},
+		"owner": {
+			"type": "string"
+		},
+		"group": {
+			"type": "string"
+		},
+		"stage": {
+			"type": "string"
+		},
+		"title": {
+			"type": "string"
+		},
+		"description": {
+			"type": "string"
+		},
+		"percent": {
+			"type": "string"
+		},
+		"cdate": {
+			"type": "string"
+		},
+		"mdate": {
+			"type": "string"
+		},
+		"value": {
+			"type": "string"
+		},
+		"currency": {
+			"type": "string"
+		},
+		"status": {
+			"type": "string"
+		},
+		"activitycount": {
+			"type": "string"
+		},
+		"nextdealid": {
+			"type": "string"
+		},
+		"links": {
+			"type": "object",
+			"properties": {
+				"dealActivities": {
+					"type": "string"
+				},
+				"contact": {
+					"type": "string"
+				},
+				"contactDeals": {
+					"type": "string"
+				},
+				"group": {
+					"type": "string"
+				},
+				"nextTask": {
+					"type": "string"
+				},
+				"notes": {
+					"type": "string"
+				},
+				"account": {
+					"type": "string"
+				},
+				"customerAccount": {
+					"type": "string"
+				},
+				"organization": {
+					"type": "string"
+				},
+				"owner": {
+					"type": "string"
+				},
+				"scoreValues": {
+					"type": "string"
+				},
+				"stage": {
+					"type": "string"
+				},
+				"tasks": {
+					"type": "string"
+				},
+				"dealCustomFieldData": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"dealActivities",
+				"contact",
+				"contactDeals",
+				"group",
+				"nextTask",
+				"notes",
+				"account",
+				"customerAccount",
+				"organization",
+				"owner",
+				"scoreValues",
+				"stage",
+				"tasks",
+				"dealCustomFieldData"
+			]
+		},
+		"id": {
+			"type": "string"
+		},
+		"isDisabled": {
+			"type": "boolean"
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/update.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/update.json
new file mode 100644
index 0000000000..740d62121b
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/deal/update.json
@@ -0,0 +1,231 @@
+{
+	"type": "object",
+	"properties": {
+		"dealStages": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"group": {
+						"type": "string"
+					},
+					"title": {
+						"type": "string"
+					},
+					"color": {
+						"type": "string"
+					},
+					"order": {
+						"type": "string"
+					},
+					"width": {
+						"type": "string"
+					},
+					"dealOrder": {
+						"type": "string"
+					},
+					"cardRegion1": {
+						"type": "string"
+					},
+					"cardRegion2": {
+						"type": "string"
+					},
+					"cardRegion3": {
+						"type": "string"
+					},
+					"cardRegion4": {
+						"type": "string"
+					},
+					"cardRegion5": {
+						"type": "string"
+					},
+					"udate": {
+						"type": "string"
+					},
+					"links": {
+						"type": "object",
+						"properties": {
+							"group": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"group"
+						]
+					},
+					"id": {
+						"type": "string"
+					}
+				},
+				"required": [
+					"group",
+					"title",
+					"color",
+					"order",
+					"width",
+					"dealOrder",
+					"cardRegion1",
+					"cardRegion2",
+					"cardRegion3",
+					"cardRegion4",
+					"cardRegion5",
+					"cdate",
+					"udate",
+					"links",
+					"id"
+				]
+			}
+		},
+		"deal": {
+			"type": "object",
+			"properties": {
+				"hash": {
+					"type": "string"
+				},
+				"owner": {
+					"type": "string"
+				},
+				"contact": {
+					"type": "string"
+				},
+				"organization": {
+					"type": "null"
+				},
+				"group": {
+					"type": "string"
+				},
+				"stage": {
+					"type": "string"
+				},
+				"title": {
+					"type": "string"
+				},
+				"description": {
+					"type": "string"
+				},
+				"percent": {
+					"type": "string"
+				},
+				"cdate": {
+					"type": "string"
+				},
+				"mdate": {
+					"type": "string"
+				},
+				"currency": {
+					"type": "string"
+				},
+				"activitycount": {
+					"type": "string"
+				},
+				"nextdealid": {
+					"type": "string"
+				},
+				"links": {
+					"type": "object",
+					"properties": {
+						"dealActivities": {
+							"type": "string"
+						},
+						"contact": {
+							"type": "string"
+						},
+						"contactDeals": {
+							"type": "string"
+						},
+						"group": {
+							"type": "string"
+						},
+						"nextTask": {
+							"type": "string"
+						},
+						"notes": {
+							"type": "string"
+						},
+						"account": {
+							"type": "string"
+						},
+						"customerAccount": {
+							"type": "string"
+						},
+						"organization": {
+							"type": "string"
+						},
+						"owner": {
+							"type": "string"
+						},
+						"scoreValues": {
+							"type": "string"
+						},
+						"stage": {
+							"type": "string"
+						},
+						"tasks": {
+							"type": "string"
+						},
+						"dealCustomFieldData": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"dealActivities",
+						"contact",
+						"contactDeals",
+						"group",
+						"nextTask",
+						"notes",
+						"account",
+						"customerAccount",
+						"organization",
+						"owner",
+						"scoreValues",
+						"stage",
+						"tasks",
+						"dealCustomFieldData"
+					]
+				},
+				"id": {
+					"type": "string"
+				},
+				"isDisabled": {
+					"type": "boolean"
+				},
+				"account": {
+					"type": "null"
+				},
+				"customerAccount": {
+					"type": "null"
+				}
+			},
+			"required": [
+				"hash",
+				"owner",
+				"contact",
+				"organization",
+				"group",
+				"stage",
+				"title",
+				"description",
+				"percent",
+				"cdate",
+				"mdate",
+				"nextdate",
+				"nexttaskid",
+				"value",
+				"currency",
+				"status",
+				"activitycount",
+				"nextdealid",
+				"edate",
+				"winProbability",
+				"winProbabilityMdate",
+				"links",
+				"fields",
+				"id",
+				"isDisabled",
+				"account",
+				"customerAccount"
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/list/getAll.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/list/getAll.json
new file mode 100644
index 0000000000..c58093ab2c
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/list/getAll.json
@@ -0,0 +1,150 @@
+{
+    "type": "object",
+    "properties": {
+        "stringid": {
+            "type": "string"
+        },
+        "userid": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "cdate": {
+            "type": "string"
+        },
+        "p_use_tracking": {
+            "type": "string"
+        },
+        "p_use_analytics_read": {
+            "type": "string"
+        },
+        "p_use_analytics_link": {
+            "type": "string"
+        },
+        "p_use_twitter": {
+            "type": "string"
+        },
+        "p_use_facebook": {
+            "type": "string"
+        },
+        "p_embed_image": {
+            "type": "string"
+        },
+        "p_use_captcha": {
+            "type": "string"
+        },
+        "send_last_broadcast": {
+            "type": "string"
+        },
+        "private": {
+            "type": "string"
+        },
+        "analytics_domains": {
+            "type": "null"
+        },
+        "analytics_source": {
+            "type": "string"
+        },
+        "analytics_ua": {
+            "type": "string"
+        },
+        "twitter_token": {
+            "type": "string"
+        },
+        "twitter_token_secret": {
+            "type": "string"
+        },
+        "facebook_session": {
+            "type": "null"
+        },
+        "require_name": {
+            "type": "string"
+        },
+        "get_unsubscribe_reason": {
+            "type": "string"
+        },
+        "to_name": {
+            "type": "string"
+        },
+        "optinoptout": {
+            "type": "string"
+        },
+        "sender_name": {
+            "type": "string"
+        },
+        "sender_addr1": {
+            "type": "string"
+        },
+        "sender_addr2": {
+            "type": "string"
+        },
+        "sender_city": {
+            "type": "string"
+        },
+        "sender_state": {
+            "type": "string"
+        },
+        "sender_zip": {
+            "type": "string"
+        },
+        "sender_country": {
+            "type": "string"
+        },
+        "sender_phone": {
+            "type": "string"
+        },
+        "sender_url": {
+            "type": "string"
+        },
+        "sender_reminder": {
+            "type": "string"
+        },
+        "optinmessageid": {
+            "type": "string"
+        },
+        "optoutconf": {
+            "type": "string"
+        },
+        "deletestamp": {
+            "type": "null"
+        },
+        "created_timestamp": {
+            "type": "string"
+        },
+        "updated_timestamp": {
+            "type": "string"
+        },
+        "created_by": {
+            "type": "null"
+        },
+        "updated_by": {
+            "type": "null"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "contactGoalLists": {
+                    "type": "string"
+                },
+                "user": {
+                    "type": "string"
+                },
+                "addressLists": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contactGoalLists",
+                "user",
+                "addressLists"
+            ]
+        },
+        "id": {
+            "type": "string"
+        },
+        "user": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/tag/get.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/tag/get.json
new file mode 100644
index 0000000000..bdaef9b2c1
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/tag/get.json
@@ -0,0 +1,66 @@
+{
+    "type": "object",
+    "properties": {
+        "tag": {
+            "type": "object",
+            "properties": {
+                "tagType": {
+                    "type": "string"
+                },
+                "tag": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "subscriber_count": {
+                    "type": "string"
+                },
+                "created_timestamp": {
+                    "type": "string"
+                },
+                "updated_timestamp": {
+                    "type": "string"
+                },
+                "deleted": {
+                    "type": "string"
+                },
+                "links": {
+                    "type": "object",
+                    "properties": {
+                        "contactGoalTags": {
+                            "type": "string"
+                        },
+                        "templateTags": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "contactGoalTags",
+                        "templateTags"
+                    ]
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "tagType",
+                "tag",
+                "description",
+                "subscriber_count",
+                "cdate",
+                "created_timestamp",
+                "updated_timestamp",
+                "created_by",
+                "updated_by",
+                "deleted",
+                "links",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "tag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/tag/getAll.json b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/tag/getAll.json
new file mode 100644
index 0000000000..a1add4e372
--- /dev/null
+++ b/packages/nodes-base/nodes/ActiveCampaign/__schema__/v1.0.0/tag/getAll.json
@@ -0,0 +1,44 @@
+{
+    "type": "object",
+    "properties": {
+        "tagType": {
+            "type": "string"
+        },
+        "tag": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "subscriber_count": {
+            "type": "string"
+        },
+        "created_timestamp": {
+            "type": "string"
+        },
+        "updated_timestamp": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "string"
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "contactGoalTags": {
+                    "type": "string"
+                },
+                "templateTags": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contactGoalTags",
+                "templateTags"
+            ]
+        },
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Adalo/Adalo.node.ts b/packages/nodes-base/nodes/Adalo/Adalo.node.ts
index 5c0ae35d46..e682e01a92 100644
--- a/packages/nodes-base/nodes/Adalo/Adalo.node.ts
+++ b/packages/nodes-base/nodes/Adalo/Adalo.node.ts
@@ -22,6 +22,7 @@ export class Adalo implements INodeType {
 		defaults: {
 			name: 'Adalo',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index 21fecbaab6..6d27e650c3 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -29,6 +29,7 @@ export class Affinity implements INodeType {
 		defaults: {
 			name: 'Affinity',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/listEntry/create.json b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/listEntry/create.json
new file mode 100644
index 0000000000..b1156230a4
--- /dev/null
+++ b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/listEntry/create.json
@@ -0,0 +1,57 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "list_id": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "entity_id": {
+            "type": "integer"
+        },
+        "entity_type": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "entity": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "domain": {
+                    "type": "string"
+                },
+                "domains": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "crunchbase_uuid": {
+                    "type": "null"
+                },
+                "global": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "domain",
+                "domains",
+                "crunchbase_uuid",
+                "global"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/listEntry/getAll.json b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/listEntry/getAll.json
new file mode 100644
index 0000000000..db7b0aa809
--- /dev/null
+++ b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/listEntry/getAll.json
@@ -0,0 +1,59 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "list_id": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "entity_id": {
+            "type": "integer"
+        },
+        "entity_type": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "entity": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "domains": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "crunchbase_uuid": {
+                    "type": "null"
+                },
+                "global": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "list_id",
+        "creator_id",
+        "entity_id",
+        "entity_type",
+        "created_at",
+        "entity"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/organization/create.json b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/organization/create.json
new file mode 100644
index 0000000000..7ace9d76bf
--- /dev/null
+++ b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/organization/create.json
@@ -0,0 +1,41 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "domains": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "crunchbase_uuid": {
+            "type": "null"
+        },
+        "global": {
+            "type": "boolean"
+        },
+        "person_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "domain",
+        "domains",
+        "crunchbase_uuid",
+        "global",
+        "person_ids"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/organization/get.json b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/organization/get.json
new file mode 100644
index 0000000000..96811c0670
--- /dev/null
+++ b/packages/nodes-base/nodes/Affinity/__schema__/v1.0.0/organization/get.json
@@ -0,0 +1,76 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "domains": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "crunchbase_uuid": {
+            "type": "null"
+        },
+        "global": {
+            "type": "boolean"
+        },
+        "person_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "list_entries": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "list_id": {
+                        "type": "integer"
+                    },
+                    "creator_id": {
+                        "type": "integer"
+                    },
+                    "entity_id": {
+                        "type": "integer"
+                    },
+                    "entity_type": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "list_id",
+                    "creator_id",
+                    "entity_id",
+                    "entity_type",
+                    "created_at"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "domain",
+        "domains",
+        "crunchbase_uuid",
+        "global",
+        "person_ids",
+        "list_entries"
+    ]
+}
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index 5762a81a30..17353299a4 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -35,6 +35,7 @@ export class AgileCrm implements INodeType {
 		defaults: {
 			name: 'Agile CRM',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
index d3c6a6662f..88f570620d 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as getMany from '../../../../v2/actions/base/getMany.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -33,15 +31,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, base => getMany', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should return all bases', async () => {
 		const nodeParameters = {
 			resource: 'base',
@@ -60,11 +49,6 @@ describe('Test AirtableV2, base => getMany', () => {
 					name: 'base 1',
 					permissionLevel: 'create',
 				},
-				pairedItem: [
-					{
-						item: 0,
-					},
-				],
 			},
 			{
 				json: {
@@ -72,11 +56,6 @@ describe('Test AirtableV2, base => getMany', () => {
 					name: 'base 2',
 					permissionLevel: 'edit',
 				},
-				pairedItem: [
-					{
-						item: 0,
-					},
-				],
 			},
 			{
 				json: {
@@ -84,11 +63,6 @@ describe('Test AirtableV2, base => getMany', () => {
 					name: 'base 3',
 					permissionLevel: 'create',
 				},
-				pairedItem: [
-					{
-						item: 0,
-					},
-				],
 			},
 		]);
 	});
@@ -112,11 +86,6 @@ describe('Test AirtableV2, base => getMany', () => {
 					name: 'base 2',
 					permissionLevel: 'edit',
 				},
-				pairedItem: [
-					{
-						item: 0,
-					},
-				],
 			},
 		]);
 	});
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
index 4f6bda2a89..fe07bc7c93 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as getSchema from '../../../../v2/actions/base/getSchema.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, base => getSchema', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should return all bases', async () => {
 		const nodeParameters = {
 			resource: 'base',
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
index 85f5d0db7e..3ca1da0576 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as create from '../../../../v2/actions/record/create.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -15,18 +13,7 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, create operation', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
-	afterEach(() => {
-		jest.restoreAllMocks();
-	});
+	beforeEach(() => jest.clearAllMocks());
 
 	it('should create a record, autoMapInputData', async () => {
 		const nodeParameters = {
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
index 36e8e828e6..bcf5ca9483 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as deleteRecord from '../../../../v2/actions/record/deleteRecord.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -15,19 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, deleteRecord operation', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
-	afterEach(() => {
-		jest.restoreAllMocks();
-	});
-
 	it('should delete a record', async () => {
 		const nodeParameters = {
 			operation: 'deleteRecord',
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
index eb9a612cf6..a7726c5346 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as get from '../../../../v2/actions/record/get.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -23,19 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, create operation', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
-	afterEach(() => {
-		jest.restoreAllMocks();
-	});
-
 	it('should create a record, autoMapInputData', async () => {
 		const nodeParameters = {
 			operation: 'get',
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
index b5c1215907..c3099248b1 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as search from '../../../../v2/actions/record/search.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -49,15 +47,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, search operation', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should return all records', async () => {
 		const nodeParameters = {
 			operation: 'search',
@@ -109,11 +98,7 @@ describe('Test AirtableV2, search operation', () => {
 		expect(result).toHaveLength(2);
 		expect(result[0]).toEqual({
 			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
-			pairedItem: [
-				{
-					item: 0,
-				},
-			],
+			pairedItem: [],
 		});
 	});
 
@@ -153,11 +138,7 @@ describe('Test AirtableV2, search operation', () => {
 		expect(result).toHaveLength(1);
 		expect(result[0]).toEqual({
 			json: { id: 'recYYY', foo: 'foo 2', bar: 'bar 2' },
-			pairedItem: [
-				{
-					item: 0,
-				},
-			],
+			pairedItem: [],
 		});
 	});
 });
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
index 89cdc0d9ef..7887066401 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as update from '../../../../v2/actions/record/update.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
@@ -40,15 +38,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('Test AirtableV2, update operation', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should update a record by id, autoMapInputData', async () => {
 		const nodeParameters = {
 			operation: 'update',
diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
index 27214c6192..2ba25cf84e 100644
--- a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -12,7 +12,6 @@ import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type { IRecord } from './GenericFunctions';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
 import { oldVersionNotice } from '../../../utils/descriptions';
-import { generatePairedItemData } from '../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Airtable',
@@ -737,24 +736,16 @@ export class AirtableV1 implements INodeType {
 					const downloadFieldNames = (
 						this.getNodeParameter('downloadFieldNames', 0) as string
 					).split(',');
-					const pairedItem = generatePairedItemData(items.length);
+
 					const data = await downloadRecordAttachments.call(
 						this,
 						responseData.records as IRecord[],
 						downloadFieldNames,
-						pairedItem,
 					);
 					return [data];
 				}
 
-				// We can return from here
-				const itemData = generatePairedItemData(items.length);
-
-				return [
-					this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(returnData), {
-						itemData,
-					}),
-				];
+				return [this.helpers.returnJsonArray(returnData)];
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ json: { error: error.message } });
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
index 5272be1a2a..869c3c0c63 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
@@ -5,11 +5,7 @@ import type {
 	IExecuteFunctions,
 } from 'n8n-workflow';
 
-import {
-	generatePairedItemData,
-	updateDisplayOptions,
-	wrapData,
-} from '../../../../../utils/utilities';
+import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
@@ -112,11 +108,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		bases = bases.filter((base) => permissionLevel.includes(base.permissionLevel as string));
 	}
 
-	const itemData = generatePairedItemData(this.getInputData().length);
-
-	const returnData = this.helpers.constructExecutionMetaData(wrapData(bases), {
-		itemData,
-	});
+	const returnData = wrapData(bases);
 
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
index ae698d8a7a..324a0d611d 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
@@ -5,7 +5,7 @@ import type {
 	IExecuteFunctions,
 } from 'n8n-workflow';
 
-import { generatePairedItemData, updateDisplayOptions } from '../../../../../utils/utilities';
+import { updateDisplayOptions } from '../../../../../utils/utilities';
 import type { IRecord } from '../../helpers/interfaces';
 import { flattenOutput } from '../../helpers/utils';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
@@ -156,12 +156,9 @@ export async function execute(
 	const endpoint = `${base}/${table}`;
 
 	let itemsLength = items.length ? 1 : 0;
-	let fallbackPairedItems;
 
 	if (nodeVersion >= 2.1) {
 		itemsLength = items.length;
-	} else {
-		fallbackPairedItems = generatePairedItemData(items.length);
 	}
 
 	for (let i = 0; i < itemsLength; i++) {
@@ -208,7 +205,7 @@ export async function execute(
 					this,
 					responseData.records as IRecord[],
 					options.downloadFields as string[],
-					fallbackPairedItems || [{ item: i }],
+					nodeVersion >= 2.1 ? [{ item: i }] : undefined,
 				);
 				returnData.push(...itemWithAttachments);
 				continue;
@@ -220,7 +217,7 @@ export async function execute(
 				json: flattenOutput(record),
 			})) as INodeExecutionData[];
 
-			const itemData = fallbackPairedItems || [{ item: i }];
+			const itemData = nodeVersion >= 2.1 ? [{ item: i }] : [];
 
 			const executionData = this.helpers.constructExecutionMetaData(records, {
 				itemData,
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index 1283558d37..1400ae12cc 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -64,6 +64,7 @@ export class Amqp implements INodeType {
 		defaults: {
 			name: 'AMQP Sender',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
index 1d03f57f40..5dc2d091dc 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -28,6 +28,7 @@ export class ApiTemplateIo implements INodeType {
 		defaults: {
 			name: 'APITemplate.io',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/__schema__/v1.0.0/pdf/create.json b/packages/nodes-base/nodes/ApiTemplateIo/__schema__/v1.0.0/pdf/create.json
new file mode 100644
index 0000000000..8f4f7c88bb
--- /dev/null
+++ b/packages/nodes-base/nodes/ApiTemplateIo/__schema__/v1.0.0/pdf/create.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "download_url": {
+            "type": "string"
+        },
+        "template_id": {
+            "type": "string"
+        },
+        "transaction_ref": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "download_url",
+        "template_id",
+        "transaction_ref",
+        "status"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index 72b93594f3..8e45f1cb38 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -32,6 +32,7 @@ export class Asana implements INodeType {
 		defaults: {
 			name: 'Asana',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/create.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/create.json
new file mode 100644
index 0000000000..01b05d40e2
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/create.json
@@ -0,0 +1,200 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "start_on": {
+            "type": "null"
+        },
+        "minimum_access_level_for_sharing": {
+            "type": "string"
+        },
+        "minimum_access_level_for_customization": {
+            "type": "string"
+        },
+        "default_access_level": {
+            "type": "string"
+        },
+        "default_view": {
+            "type": "string"
+        },
+        "permalink_url": {
+            "type": "string"
+        },
+        "team": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "workspace": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "privacy_setting": {
+            "type": "string"
+        },
+        "public": {
+            "type": "boolean"
+        },
+        "current_status": {
+            "type": "null"
+        },
+        "current_status_update": {
+            "type": "null"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "completed_at": {
+            "type": "null"
+        },
+        "completed_by": {
+            "type": "null"
+        },
+        "members": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        },
+        "icon": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "gid",
+        "resource_type",
+        "created_at",
+        "modified_at",
+        "start_on",
+        "minimum_access_level_for_sharing",
+        "minimum_access_level_for_customization",
+        "default_access_level",
+        "default_view",
+        "permalink_url",
+        "team",
+        "workspace",
+        "archived",
+        "notes",
+        "name",
+        "privacy_setting",
+        "public",
+        "current_status",
+        "current_status_update",
+        "due_on",
+        "due_date",
+        "owner",
+        "completed",
+        "completed_at",
+        "completed_by",
+        "members",
+        "followers",
+        "icon",
+        "color"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/get.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/get.json
new file mode 100644
index 0000000000..1dc243bade
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/get.json
@@ -0,0 +1,405 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "completed_at": {
+            "type": "null"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "enabled": {
+                        "type": "boolean"
+                    },
+                    "enum_options": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "gid": {
+                                    "type": "string"
+                                },
+                                "color": {
+                                    "type": "string"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "resource_type": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "gid",
+                                "color",
+                                "enabled",
+                                "name",
+                                "resource_type"
+                            ]
+                        }
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "created_by": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "name",
+                            "resource_type"
+                        ]
+                    },
+                    "resource_subtype": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "is_formula_field": {
+                        "type": "boolean"
+                    },
+                    "is_value_read_only": {
+                        "type": "boolean"
+                    },
+                    "type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "enabled",
+                    "name",
+                    "description",
+                    "created_by",
+                    "display_value",
+                    "resource_subtype",
+                    "resource_type",
+                    "is_formula_field",
+                    "is_value_read_only",
+                    "type"
+                ]
+            }
+        },
+        "custom_field_settings": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "custom_field": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "enum_options": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "gid": {
+                                            "type": "string"
+                                        },
+                                        "color": {
+                                            "type": "string"
+                                        },
+                                        "enabled": {
+                                            "type": "boolean"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "resource_type": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "gid",
+                                        "color",
+                                        "enabled",
+                                        "name",
+                                        "resource_type"
+                                    ]
+                                }
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "resource_subtype": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "is_formula_field": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "name",
+                            "resource_subtype",
+                            "resource_type",
+                            "type",
+                            "is_formula_field"
+                        ]
+                    },
+                    "is_important": {
+                        "type": "boolean"
+                    },
+                    "parent": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "name",
+                            "resource_type"
+                        ]
+                    },
+                    "project": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "name",
+                            "resource_type"
+                        ]
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "custom_field",
+                    "is_important",
+                    "parent",
+                    "project",
+                    "resource_type"
+                ]
+            }
+        },
+        "default_access_level": {
+            "type": "string"
+        },
+        "default_view": {
+            "type": "string"
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "name",
+                    "resource_type"
+                ]
+            }
+        },
+        "members": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "name",
+                    "resource_type"
+                ]
+            }
+        },
+        "minimum_access_level_for_customization": {
+            "type": "string"
+        },
+        "minimum_access_level_for_sharing": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "name",
+                "resource_type"
+            ]
+        },
+        "permalink_url": {
+            "type": "string"
+        },
+        "privacy_setting": {
+            "type": "string"
+        },
+        "public": {
+            "type": "boolean"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "team": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "name",
+                "resource_type"
+            ]
+        },
+        "workspace": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "name",
+                "resource_type"
+            ]
+        }
+    },
+    "required": [
+        "gid",
+        "archived",
+        "color",
+        "completed",
+        "completed_at",
+        "created_at",
+        "current_status",
+        "current_status_update",
+        "custom_fields",
+        "default_access_level",
+        "default_view",
+        "due_on",
+        "due_date",
+        "followers",
+        "members",
+        "minimum_access_level_for_customization",
+        "minimum_access_level_for_sharing",
+        "modified_at",
+        "name",
+        "notes",
+        "owner",
+        "permalink_url",
+        "privacy_setting",
+        "public",
+        "resource_type",
+        "start_on",
+        "team",
+        "workspace"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/getAll.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/getAll.json
new file mode 100644
index 0000000000..26d1592a5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/project/getAll.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "gid",
+        "name",
+        "resource_type"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/subtask/create.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/subtask/create.json
new file mode 100644
index 0000000000..a79feb7944
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/subtask/create.json
@@ -0,0 +1,195 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "assignee": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "actual_time_minutes": {
+            "type": "integer"
+        },
+        "workspace": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "start_on": {
+            "type": "null"
+        },
+        "resource_subtype": {
+            "type": "string"
+        },
+        "due_at": {
+            "type": "null"
+        },
+        "completed_at": {
+            "type": "null"
+        },
+        "assignee_status": {
+            "type": "string"
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "num_hearts": {
+            "type": "integer"
+        },
+        "num_likes": {
+            "type": "integer"
+        },
+        "start_at": {
+            "type": "null"
+        },
+        "liked": {
+            "type": "boolean"
+        },
+        "hearted": {
+            "type": "boolean"
+        },
+        "assignee_section": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "resource_subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name",
+                "resource_subtype"
+            ]
+        },
+        "permalink_url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "gid",
+        "projects",
+        "memberships",
+        "resource_type",
+        "created_at",
+        "modified_at",
+        "name",
+        "notes",
+        "assignee",
+        "actual_time_minutes",
+        "workspace",
+        "start_on",
+        "resource_subtype",
+        "due_at",
+        "due_on",
+        "completed_at",
+        "assignee_status",
+        "completed",
+        "num_hearts",
+        "tags",
+        "num_likes",
+        "start_at",
+        "liked",
+        "likes",
+        "hearted",
+        "hearts",
+        "followers",
+        "parent",
+        "permalink_url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/subtask/getAll.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/subtask/getAll.json
new file mode 100644
index 0000000000..2267f67bbf
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/subtask/getAll.json
@@ -0,0 +1,34 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type"
+            ]
+        }
+    },
+    "required": [
+        "gid",
+        "name",
+        "resource_type"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/create.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/create.json
new file mode 100644
index 0000000000..efef95c177
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/create.json
@@ -0,0 +1,342 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "projects": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        },
+        "num_likes": {
+            "type": "integer"
+        },
+        "num_hearts": {
+            "type": "integer"
+        },
+        "workspace": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "start_at": {
+            "type": "null"
+        },
+        "start_on": {
+            "type": "null"
+        },
+        "resource_subtype": {
+            "type": "string"
+        },
+        "due_at": {
+            "type": "null"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "completed_at": {
+            "type": "null"
+        },
+        "assignee_status": {
+            "type": "string"
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "actual_time_minutes": {
+            "type": "integer"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "project": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    },
+                    "section": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "project",
+                    "section"
+                ]
+            }
+        },
+        "parent": {
+            "type": "null"
+        },
+        "likes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "user"
+                ]
+            }
+        },
+        "hearts": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "user"
+                ]
+            }
+        },
+        "liked": {
+            "type": "boolean"
+        },
+        "hearted": {
+            "type": "boolean"
+        },
+        "permalink_url": {
+            "type": "string"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "enabled": {
+                        "type": "boolean"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "resource_subtype": {
+                        "type": "string"
+                    },
+                    "enum_value": {
+                        "type": "null"
+                    },
+                    "created_by": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    },
+                    "enum_options": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "gid": {
+                                    "type": "string"
+                                },
+                                "resource_type": {
+                                    "type": "string"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "color": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "gid",
+                                "resource_type",
+                                "enabled",
+                                "name",
+                                "color"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "enabled",
+                    "name",
+                    "type",
+                    "resource_subtype",
+                    "display_value",
+                    "created_by"
+                ]
+            }
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/get.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/get.json
new file mode 100644
index 0000000000..1fd5ec25ce
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/get.json
@@ -0,0 +1,303 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "actual_time_minutes": {
+            "type": "null"
+        },
+        "assignee_status": {
+            "type": "string"
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "enabled": {
+                        "type": "boolean"
+                    },
+                    "enum_options": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "gid": {
+                                    "type": "string"
+                                },
+                                "color": {
+                                    "type": "string"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "resource_type": {
+                                    "type": "string"
+                                },
+                                "completion_state": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "gid",
+                                "color",
+                                "enabled",
+                                "name",
+                                "resource_type"
+                            ]
+                        }
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "resource_subtype": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "is_formula_field": {
+                        "type": "boolean"
+                    },
+                    "is_value_read_only": {
+                        "type": "boolean"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "precision": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "enabled",
+                    "name",
+                    "description",
+                    "created_by",
+                    "display_value",
+                    "resource_subtype",
+                    "resource_type",
+                    "is_formula_field",
+                    "is_value_read_only",
+                    "type"
+                ]
+            }
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "name",
+                    "resource_type"
+                ]
+            }
+        },
+        "hearted": {
+            "type": "boolean"
+        },
+        "liked": {
+            "type": "boolean"
+        },
+        "memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "project": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "name",
+                            "resource_type"
+                        ]
+                    },
+                    "section": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "name",
+                            "resource_type"
+                        ]
+                    }
+                },
+                "required": [
+                    "project",
+                    "section"
+                ]
+            }
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "num_hearts": {
+            "type": "integer"
+        },
+        "num_likes": {
+            "type": "integer"
+        },
+        "permalink_url": {
+            "type": "string"
+        },
+        "projects": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "name",
+                    "resource_type"
+                ]
+            }
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "start_at": {
+            "type": "null"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "name",
+                    "resource_type"
+                ]
+            }
+        },
+        "resource_subtype": {
+            "type": "string"
+        },
+        "workspace": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "name",
+                "resource_type"
+            ]
+        }
+    },
+    "required": [
+        "gid",
+        "actual_time_minutes",
+        "assignee",
+        "assignee_status",
+        "completed",
+        "completed_at",
+        "created_at",
+        "due_at",
+        "due_on",
+        "followers",
+        "hearted",
+        "hearts",
+        "liked",
+        "likes",
+        "memberships",
+        "modified_at",
+        "name",
+        "notes",
+        "num_hearts",
+        "num_likes",
+        "parent",
+        "permalink_url",
+        "projects",
+        "resource_type",
+        "start_at",
+        "start_on",
+        "tags",
+        "resource_subtype",
+        "workspace"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/getAll.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/getAll.json
new file mode 100644
index 0000000000..3b98b25836
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/getAll.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "gid"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/move.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/move.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/move.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/search.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/search.json
new file mode 100644
index 0000000000..6926dd991f
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/search.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "resource_subtype": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "gid",
+        "name",
+        "resource_type",
+        "resource_subtype"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/update.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/update.json
new file mode 100644
index 0000000000..27f4474c7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/task/update.json
@@ -0,0 +1,310 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "projects": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        },
+        "num_likes": {
+            "type": "integer"
+        },
+        "num_hearts": {
+            "type": "integer"
+        },
+        "workspace": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        },
+        "start_at": {
+            "type": "null"
+        },
+        "resource_subtype": {
+            "type": "string"
+        },
+        "due_at": {
+            "type": "null"
+        },
+        "assignee_status": {
+            "type": "string"
+        },
+        "completed": {
+            "type": "boolean"
+        },
+        "actual_time_minutes": {
+            "type": "integer"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "liked": {
+            "type": "boolean"
+        },
+        "hearted": {
+            "type": "boolean"
+        },
+        "permalink_url": {
+            "type": "string"
+        },
+        "memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "project": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    },
+                    "section": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "project",
+                    "section"
+                ]
+            }
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "enabled": {
+                        "type": "boolean"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "resource_subtype": {
+                        "type": "string"
+                    },
+                    "created_by": {
+                        "type": "object",
+                        "properties": {
+                            "gid": {
+                                "type": "string"
+                            },
+                            "resource_type": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "gid",
+                            "resource_type",
+                            "name"
+                        ]
+                    },
+                    "enum_options": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "gid": {
+                                    "type": "string"
+                                },
+                                "resource_type": {
+                                    "type": "string"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "color": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "gid",
+                                "resource_type",
+                                "enabled",
+                                "name",
+                                "color"
+                            ]
+                        }
+                    },
+                    "precision": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "enabled",
+                    "name",
+                    "type",
+                    "resource_subtype",
+                    "display_value",
+                    "created_by"
+                ]
+            }
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "gid": {
+                        "type": "string"
+                    },
+                    "resource_type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "gid",
+                    "resource_type",
+                    "name"
+                ]
+            }
+        }
+    },
+    "required": [
+        "gid",
+        "projects",
+        "num_likes",
+        "num_hearts",
+        "workspace",
+        "tags",
+        "start_at",
+        "start_on",
+        "resource_subtype",
+        "due_at",
+        "due_on",
+        "completed_at",
+        "assignee_status",
+        "completed",
+        "actual_time_minutes",
+        "assignee",
+        "notes",
+        "name",
+        "modified_at",
+        "created_at",
+        "resource_type",
+        "parent",
+        "likes",
+        "hearts",
+        "liked",
+        "hearted",
+        "permalink_url",
+        "memberships",
+        "followers"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/taskComment/add.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/taskComment/add.json
new file mode 100644
index 0000000000..3fac8fecca
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/taskComment/add.json
@@ -0,0 +1,110 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "num_likes": {
+            "type": "integer"
+        },
+        "num_hearts": {
+            "type": "integer"
+        },
+        "resource_subtype": {
+            "type": "string"
+        },
+        "is_edited": {
+            "type": "boolean"
+        },
+        "text": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "is_pinned": {
+            "type": "boolean"
+        },
+        "source": {
+            "type": "string"
+        },
+        "hearted": {
+            "type": "boolean"
+        },
+        "liked": {
+            "type": "boolean"
+        },
+        "is_editable": {
+            "type": "boolean"
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name"
+            ]
+        },
+        "target": {
+            "type": "object",
+            "properties": {
+                "gid": {
+                    "type": "string"
+                },
+                "resource_type": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "resource_subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "gid",
+                "resource_type",
+                "name",
+                "resource_subtype"
+            ]
+        }
+    },
+    "required": [
+        "gid",
+        "resource_type",
+        "created_at",
+        "num_likes",
+        "num_hearts",
+        "resource_subtype",
+        "is_edited",
+        "text",
+        "type",
+        "is_pinned",
+        "source",
+        "hearts",
+        "likes",
+        "hearted",
+        "liked",
+        "previews",
+        "is_editable",
+        "created_by",
+        "target"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/user/get.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/user/get.json
new file mode 100644
index 0000000000..ce834122d4
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/user/get.json
@@ -0,0 +1,36 @@
+{
+	"type": "object",
+	"properties": {
+		"gid": {
+			"type": "string"
+		},
+		"email": {
+			"type": "string"
+		},
+		"name": {
+			"type": "string"
+		},
+		"resource_type": {
+			"type": "string"
+		},
+		"workspaces": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"gid": {
+						"type": "string"
+					},
+					"name": {
+						"type": "string"
+					},
+					"resource_type": {
+						"type": "string"
+					}
+				},
+				"required": ["gid", "name", "resource_type"]
+			}
+		}
+	},
+	"required": ["gid", "email", "name", "photo", "resource_type", "workspaces"]
+}
diff --git a/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..26d1592a5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Asana/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "gid": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "resource_type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "gid",
+        "name",
+        "resource_type"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
index d3b123761f..7e07696888 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
@@ -28,6 +28,7 @@ export class Autopilot implements INodeType {
 		defaults: {
 			name: 'Autopilot',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index b7c19cfcbc..80e30f4587 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -24,6 +24,7 @@ export class AwsLambda implements INodeType {
 		defaults: {
 			name: 'AWS Lambda',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
index 858f93774a..dd24912e33 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
@@ -24,6 +24,7 @@ export class AwsSns implements INodeType {
 		defaults: {
 			name: 'AWS SNS',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/__schema__/v1.0.0/text/detectEntities.json b/packages/nodes-base/nodes/Aws/Comprehend/__schema__/v1.0.0/text/detectEntities.json
new file mode 100644
index 0000000000..c87b74f2e3
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Comprehend/__schema__/v1.0.0/text/detectEntities.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "BeginOffset": {
+            "type": "integer"
+        },
+        "EndOffset": {
+            "type": "integer"
+        },
+        "Score": {
+            "type": "number"
+        },
+        "Text": {
+            "type": "string"
+        },
+        "Type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "BeginOffset",
+        "EndOffset",
+        "Score",
+        "Text",
+        "Type"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
index ecedd70672..4be8285434 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
@@ -25,7 +25,6 @@ describe('Test AWS Comprehend Node', () => {
 
 			await initBinaryDataService();
 
-			nock.disableNetConnect();
 			const baseUrl = 'https://comprehend.eu-central-1.amazonaws.com';
 
 			mock = nock(baseUrl);
@@ -34,9 +33,6 @@ describe('Test AWS Comprehend Node', () => {
 		beforeEach(async () => {
 			mock.post('/').reply(200, response);
 		});
-		afterAll(() => {
-			nock.restore();
-		});
 
 		testWorkflows(workflows);
 	});
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
index 49b1465307..f57696c690 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
@@ -291,7 +291,6 @@ describe('Test AWS Rekogntion Node', () => {
 		let mock: nock.Scope;
 
 		beforeAll(async () => {
-			nock.disableNetConnect();
 			mock = nock(baseUrl);
 		});
 
@@ -299,9 +298,6 @@ describe('Test AWS Rekogntion Node', () => {
 			mock.post('/').reply(200, responseLabels);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
 		testWorkflows(workflows);
 	});
 });
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index bd08de167f..ca271ac8cc 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -36,6 +36,7 @@ export class AwsS3V2 implements INodeType {
 			defaults: {
 				name: 'AWS S3',
 			},
+			usableAsTool: true,
 			inputs: [NodeConnectionType.Main],
 			outputs: [NodeConnectionType.Main],
 			credentials: [
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/create.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/create.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/getAll.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/getAll.json
new file mode 100644
index 0000000000..a9ff0bcf1a
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/getAll.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "Name": {
+            "type": "string"
+        },
+        "CreationDate": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/search.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/search.json
new file mode 100644
index 0000000000..15e857a34c
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/bucket/search.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "Key": {
+            "type": "string"
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        },
+        "Size": {
+            "type": "string"
+        },
+        "StorageClass": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Key",
+        "LastModified",
+        "ETag",
+        "Size",
+        "StorageClass"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/copy.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/copy.json
new file mode 100644
index 0000000000..74f3e776ac
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/copy.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "$": {
+            "type": "object",
+            "properties": {
+                "xmlns": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "xmlns"
+            ]
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/delete.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/delete.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/download.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/download.json
new file mode 100644
index 0000000000..5786814015
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/download.json
@@ -0,0 +1,20 @@
+{
+	"type": "object",
+	"properties": {
+		"Key": {
+			"type": "string"
+		},
+		"LastModified": {
+			"type": "string"
+		},
+		"ETag": {
+			"type": "string"
+		},
+		"Size": {
+			"type": "string"
+		},
+		"StorageClass": {
+			"type": "string"
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/getAll.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/getAll.json
new file mode 100644
index 0000000000..15e857a34c
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/getAll.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "Key": {
+            "type": "string"
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        },
+        "Size": {
+            "type": "string"
+        },
+        "StorageClass": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Key",
+        "LastModified",
+        "ETag",
+        "Size",
+        "StorageClass"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/upload.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/upload.json
new file mode 100644
index 0000000000..7659af6475
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/file/upload.json
@@ -0,0 +1,28 @@
+{
+    "type": "object",
+    "properties": {
+        "$": {
+            "type": "object",
+            "properties": {
+                "xmlns": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "xmlns"
+            ]
+        },
+        "Location": {
+            "type": "string"
+        },
+        "Bucket": {
+            "type": "string"
+        },
+        "Key": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/folder/create.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/folder/create.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/folder/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/folder/getAll.json b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/folder/getAll.json
new file mode 100644
index 0000000000..15e857a34c
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/S3/__schema__/v2.0.0/folder/getAll.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "Key": {
+            "type": "string"
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        },
+        "Size": {
+            "type": "string"
+        },
+        "StorageClass": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Key",
+        "LastModified",
+        "ETag",
+        "Size",
+        "StorageClass"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
index a5770b0b9c..145ca84516 100644
--- a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
@@ -14,7 +14,6 @@ describe('Test S3 V1 Node', () => {
 
 			await initBinaryDataService();
 
-			nock.disableNetConnect();
 			mock = nock('https://bucket.s3.eu-central-1.amazonaws.com');
 		});
 
@@ -40,10 +39,6 @@ describe('Test S3 V1 Node', () => {
 				.reply(200, { success: true });
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		testWorkflows(workflows);
 	});
 });
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
index fe6b625331..ff8aded605 100644
--- a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
@@ -14,7 +14,6 @@ describe('Test S3 V2 Node', () => {
 
 			await initBinaryDataService();
 
-			nock.disableNetConnect();
 			mock = nock('https://s3.eu-central-1.amazonaws.com/buc.ket');
 		});
 
@@ -40,10 +39,6 @@ describe('Test S3 V2 Node', () => {
 				.reply(200, { success: true });
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		testWorkflows(workflows);
 	});
 });
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index ebbc2496ff..1482c0aa08 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -30,6 +30,7 @@ export class AwsSes implements INodeType {
 		defaults: {
 			name: 'AWS SES',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Aws/SES/__schema__/v1.0.0/email/send.json b/packages/nodes-base/nodes/Aws/SES/__schema__/v1.0.0/email/send.json
new file mode 100644
index 0000000000..d61b8ba677
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/SES/__schema__/v1.0.0/email/send.json
@@ -0,0 +1,48 @@
+{
+    "type": "object",
+    "properties": {
+        "SendEmailResponse": {
+            "type": "object",
+            "properties": {
+                "$": {
+                    "type": "object",
+                    "properties": {
+                        "xmlns": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "xmlns"
+                    ]
+                },
+                "SendEmailResult": {
+                    "type": "object",
+                    "properties": {
+                        "MessageId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MessageId"
+                    ]
+                },
+                "ResponseMetadata": {
+                    "type": "object",
+                    "properties": {
+                        "RequestId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RequestId"
+                    ]
+                }
+            },
+            "required": [
+                "$",
+                "SendEmailResult",
+                "ResponseMetadata"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
index 6d032b3d89..b1bb2c56d1 100644
--- a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
@@ -26,6 +26,7 @@ export class AwsTextract implements INodeType {
 		defaults: {
 			name: 'AWS Textract',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
index 013279db5d..cb3d6c7481 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
@@ -21,6 +21,7 @@ export class AwsTranscribe implements INodeType {
 		defaults: {
 			name: 'AWS Transcribe',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/__schema__/v1.0.0/transcriptionJob/create.json b/packages/nodes-base/nodes/Aws/Transcribe/__schema__/v1.0.0/transcriptionJob/create.json
new file mode 100644
index 0000000000..59ddbb1a87
--- /dev/null
+++ b/packages/nodes-base/nodes/Aws/Transcribe/__schema__/v1.0.0/transcriptionJob/create.json
@@ -0,0 +1,28 @@
+{
+    "type": "object",
+    "properties": {
+        "CreationTime": {
+            "type": "number"
+        },
+        "IdentifyLanguage": {
+            "type": "boolean"
+        },
+        "Media": {
+            "type": "object",
+            "properties": {
+                "MediaFileUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MediaFileUri"
+            ]
+        },
+        "TranscriptionJobName": {
+            "type": "string"
+        },
+        "TranscriptionJobStatus": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts b/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts
index 1b7795f215..a80e646e7e 100644
--- a/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts
+++ b/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts
@@ -16,6 +16,7 @@ export class BambooHr implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/companyReport/get.json b/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/companyReport/get.json
new file mode 100644
index 0000000000..709685de5c
--- /dev/null
+++ b/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/companyReport/get.json
@@ -0,0 +1,55 @@
+{
+    "type": "object",
+    "properties": {
+        "title": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "type",
+                    "name"
+                ]
+            }
+        },
+        "employees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "firstName": {
+                        "type": "string"
+                    },
+                    "lastName": {
+                        "type": "string"
+                    },
+                    "hireDate": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        }
+    },
+    "required": [
+        "title",
+        "fields",
+        "employees"
+    ]
+}
diff --git a/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/employee/get.json b/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/employee/get.json
new file mode 100644
index 0000000000..1d9e00ebd6
--- /dev/null
+++ b/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/employee/get.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "1357": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/employee/getAll.json b/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/employee/getAll.json
new file mode 100644
index 0000000000..64d8fff6a1
--- /dev/null
+++ b/packages/nodes-base/nodes/BambooHr/__schema__/v1.0.0/employee/getAll.json
@@ -0,0 +1,43 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "pronouns": {
+            "type": "null"
+        },
+        "photoUploaded": {
+            "type": "boolean"
+        },
+        "photoUrl": {
+            "type": "string"
+        },
+        "canUploadPhoto": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "displayName",
+        "firstName",
+        "lastName",
+        "preferredName",
+        "jobTitle",
+        "workEmail",
+        "department",
+        "pronouns",
+        "photoUploaded",
+        "photoUrl",
+        "canUploadPhoto"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Bannerbear/__schema__/v1.0.0/image/create.json b/packages/nodes-base/nodes/Bannerbear/__schema__/v1.0.0/image/create.json
new file mode 100644
index 0000000000..99037033b2
--- /dev/null
+++ b/packages/nodes-base/nodes/Bannerbear/__schema__/v1.0.0/image/create.json
@@ -0,0 +1,92 @@
+{
+    "type": "object",
+    "properties": {
+        "created_at": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "self": {
+            "type": "string"
+        },
+        "uid": {
+            "type": "string"
+        },
+        "template": {
+            "type": "string"
+        },
+        "template_version": {
+            "type": "null"
+        },
+        "modifications": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "image_url": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name"
+                ]
+            }
+        },
+        "webhook_url": {
+            "type": "null"
+        },
+        "webhook_response_code": {
+            "type": "null"
+        },
+        "transparent": {
+            "type": "boolean"
+        },
+        "metadata": {
+            "type": "null"
+        },
+        "template_name": {
+            "type": "string"
+        },
+        "width": {
+            "type": "integer"
+        },
+        "height": {
+            "type": "integer"
+        },
+        "render_pdf": {
+            "type": "boolean"
+        },
+        "pdf_url": {
+            "type": "null"
+        },
+        "pdf_url_compressed": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "created_at",
+        "status",
+        "self",
+        "uid",
+        "image_url",
+        "image_url_png",
+        "image_url_jpg",
+        "template",
+        "template_version",
+        "modifications",
+        "webhook_url",
+        "webhook_response_code",
+        "transparent",
+        "metadata",
+        "template_name",
+        "width",
+        "height",
+        "render_pdf",
+        "pdf_url",
+        "pdf_url_compressed"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index e35e652c4f..c0f01aa3d8 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -30,6 +30,7 @@ export class Beeminder implements INodeType {
 		defaults: {
 			name: 'Beeminder',
 		},
+		usableAsTool: true,
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
 		icon: 'file:beeminder.png',
 		inputs: [NodeConnectionType.Main],
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 5b376e0b2f..b2636ec03f 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -24,6 +24,7 @@ export class Bitly implements INodeType {
 		defaults: {
 			name: 'Bitly',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Bitly/__schema__/v1.0.0/link/create.json b/packages/nodes-base/nodes/Bitly/__schema__/v1.0.0/link/create.json
new file mode 100644
index 0000000000..2a6c19207d
--- /dev/null
+++ b/packages/nodes-base/nodes/Bitly/__schema__/v1.0.0/link/create.json
@@ -0,0 +1,42 @@
+{
+    "type": "object",
+    "properties": {
+        "created_at": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "long_url": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "references": {
+            "type": "object",
+            "properties": {
+                "group": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "group"
+            ]
+        }
+    },
+    "required": [
+        "created_at",
+        "id",
+        "link",
+        "custom_bitlinks",
+        "long_url",
+        "archived",
+        "tags",
+        "deeplinks",
+        "references"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index c86ee2b58d..c2e319f4d5 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -42,6 +42,7 @@ export class Bitwarden implements INodeType {
 		defaults: {
 			name: 'Bitwarden',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/get.json b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/get.json
new file mode 100644
index 0000000000..5e04c65d6b
--- /dev/null
+++ b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/get.json
@@ -0,0 +1,219 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "file_version": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "sha1": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sha1"
+            ]
+        },
+        "sequence_id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "sha1": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "path_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "trashed_at": {
+            "type": "null"
+        },
+        "purged_at": {
+            "type": "null"
+        },
+        "content_created_at": {
+            "type": "string"
+        },
+        "content_modified_at": {
+            "type": "string"
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "modified_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "owned_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sequence_id",
+                "etag",
+                "name"
+            ]
+        },
+        "item_status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "type",
+        "id",
+        "file_version",
+        "sequence_id",
+        "etag",
+        "sha1",
+        "name",
+        "description",
+        "size",
+        "path_collection",
+        "created_at",
+        "modified_at",
+        "trashed_at",
+        "purged_at",
+        "content_created_at",
+        "content_modified_at",
+        "created_by",
+        "modified_by",
+        "owned_by",
+        "shared_link",
+        "parent",
+        "item_status"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/search.json b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/search.json
new file mode 100644
index 0000000000..53d0c9216f
--- /dev/null
+++ b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/search.json
@@ -0,0 +1,200 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "file_version": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "sha1": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sha1"
+            ]
+        },
+        "sequence_id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "sha1": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "path_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "trashed_at": {
+            "type": "null"
+        },
+        "purged_at": {
+            "type": "null"
+        },
+        "content_created_at": {
+            "type": "string"
+        },
+        "content_modified_at": {
+            "type": "string"
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "modified_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "owned_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sequence_id",
+                "etag",
+                "name"
+            ]
+        },
+        "item_status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "type",
+        "id",
+        "etag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/upload.json b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/upload.json
new file mode 100644
index 0000000000..eacdd9252d
--- /dev/null
+++ b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/file/upload.json
@@ -0,0 +1,198 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "file_version": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "sha1": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sha1"
+            ]
+        },
+        "sequence_id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "sha1": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "path_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "trashed_at": {
+            "type": "null"
+        },
+        "purged_at": {
+            "type": "null"
+        },
+        "content_created_at": {
+            "type": "string"
+        },
+        "content_modified_at": {
+            "type": "string"
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "modified_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "owned_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "shared_link": {
+            "type": "null"
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sequence_id",
+                "etag",
+                "name"
+            ]
+        },
+        "item_status": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/create.json b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/create.json
new file mode 100644
index 0000000000..bc7d242fce
--- /dev/null
+++ b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/create.json
@@ -0,0 +1,218 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "sequence_id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "path_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries"
+            ]
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "modified_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "trashed_at": {
+            "type": "null"
+        },
+        "purged_at": {
+            "type": "null"
+        },
+        "content_created_at": {
+            "type": "string"
+        },
+        "content_modified_at": {
+            "type": "string"
+        },
+        "owned_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "shared_link": {
+            "type": "null"
+        },
+        "folder_upload_email": {
+            "type": "null"
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sequence_id",
+                "etag",
+                "name"
+            ]
+        },
+        "item_status": {
+            "type": "string"
+        },
+        "item_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "offset": {
+                    "type": "integer"
+                },
+                "limit": {
+                    "type": "integer"
+                },
+                "order": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "by": {
+                                "type": "string"
+                            },
+                            "direction": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "by",
+                            "direction"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries",
+                "offset",
+                "limit",
+                "order"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/get.json b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/get.json
new file mode 100644
index 0000000000..cd686ebb1e
--- /dev/null
+++ b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/get.json
@@ -0,0 +1,288 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "sequence_id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "path_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries"
+            ]
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "modified_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "trashed_at": {
+            "type": "null"
+        },
+        "purged_at": {
+            "type": "null"
+        },
+        "content_created_at": {
+            "type": "string"
+        },
+        "content_modified_at": {
+            "type": "string"
+        },
+        "owned_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sequence_id",
+                "etag",
+                "name"
+            ]
+        },
+        "item_status": {
+            "type": "string"
+        },
+        "item_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "sequence_id": {
+                                "type": "string"
+                            },
+                            "etag": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "file_version": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "sha1": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id",
+                                    "sha1"
+                                ]
+                            },
+                            "sha1": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                },
+                "offset": {
+                    "type": "integer"
+                },
+                "limit": {
+                    "type": "integer"
+                },
+                "order": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "by": {
+                                "type": "string"
+                            },
+                            "direction": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "by",
+                            "direction"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries",
+                "offset",
+                "limit",
+                "order"
+            ]
+        }
+    },
+    "required": [
+        "type",
+        "id",
+        "sequence_id",
+        "etag",
+        "name",
+        "created_at",
+        "modified_at",
+        "description",
+        "size",
+        "path_collection",
+        "created_by",
+        "modified_by",
+        "trashed_at",
+        "purged_at",
+        "content_created_at",
+        "content_modified_at",
+        "owned_by",
+        "shared_link",
+        "folder_upload_email",
+        "parent",
+        "item_status",
+        "item_collection"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/search.json b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/search.json
new file mode 100644
index 0000000000..f8547dd714
--- /dev/null
+++ b/packages/nodes-base/nodes/Box/__schema__/v1.0.0/folder/search.json
@@ -0,0 +1,184 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "sequence_id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "modified_at": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "path_collection": {
+            "type": "object",
+            "properties": {
+                "total_count": {
+                    "type": "integer"
+                },
+                "entries": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "sequence_id",
+                            "etag",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "total_count",
+                "entries"
+            ]
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "modified_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "trashed_at": {
+            "type": "null"
+        },
+        "purged_at": {
+            "type": "null"
+        },
+        "content_created_at": {
+            "type": "string"
+        },
+        "content_modified_at": {
+            "type": "string"
+        },
+        "owned_by": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "login": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "name",
+                "login"
+            ]
+        },
+        "shared_link": {
+            "type": "null"
+        },
+        "folder_upload_email": {
+            "type": "null"
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "id",
+                "sequence_id",
+                "etag",
+                "name"
+            ]
+        },
+        "item_status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "type",
+        "id",
+        "etag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
index 237f39b9bf..88e235a508 100644
--- a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
+++ b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
@@ -23,6 +23,7 @@ export class Brandfetch implements INodeType {
 		defaults: {
 			name: 'Brandfetch',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Brevo/Brevo.node.ts b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
index d201d53529..460d1c9dc8 100644
--- a/packages/nodes-base/nodes/Brevo/Brevo.node.ts
+++ b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
@@ -20,6 +20,7 @@ export class Brevo implements INodeType {
 		defaults: {
 			name: 'Brevo',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/create.json b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/create.json
new file mode 100644
index 0000000000..e000fbc256
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/create.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/get.json b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/get.json
new file mode 100644
index 0000000000..70e59aca45
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/get.json
@@ -0,0 +1,37 @@
+{
+    "type": "object",
+    "properties": {
+        "email": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "emailBlacklisted": {
+            "type": "boolean"
+        },
+        "smsBlacklisted": {
+            "type": "boolean"
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "modifiedAt": {
+            "type": "string"
+        },
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "FIRSTNAME": {
+                    "type": "string"
+                }
+            }
+        },
+        "listIds": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..059838ac56
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "emailBlacklisted": {
+            "type": "boolean"
+        },
+        "smsBlacklisted": {
+            "type": "boolean"
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "modifiedAt": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "listIds": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "listUnsubscribed": {
+            "type": "null"
+        },
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "FIRSTNAME": {
+                    "type": "string"
+                },
+                "LASTNAME": {
+                    "type": "string"
+                },
+                "PHONE": {
+                    "type": "string"
+                }
+            }
+        }
+    },
+    "required": [
+        "id",
+        "emailBlacklisted",
+        "smsBlacklisted",
+        "createdAt",
+        "modifiedAt",
+        "listIds",
+        "listUnsubscribed",
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/upsert.json b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/upsert.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/contact/upsert.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/email/send.json b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/email/send.json
new file mode 100644
index 0000000000..1bb935e148
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/email/send.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "messageId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "messageId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/email/sendTemplate.json b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/email/sendTemplate.json
new file mode 100644
index 0000000000..efce3a11cc
--- /dev/null
+++ b/packages/nodes-base/nodes/Brevo/__schema__/v1.0.0/email/sendTemplate.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "messageId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index 70641ac106..426f2221bf 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -22,6 +22,7 @@ export class Bubble implements INodeType {
 		defaults: {
 			name: 'Bubble',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/create.json b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/create.json
new file mode 100644
index 0000000000..322865c111
--- /dev/null
+++ b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/create.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "status": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "status",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/delete.json b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/delete.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/delete.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/get.json b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/get.json
new file mode 100644
index 0000000000..716787c9d1
--- /dev/null
+++ b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/get.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified Date": {
+            "type": "string"
+        },
+        "Created Date": {
+            "type": "string"
+        },
+        "Created By": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Modified Date",
+        "Created Date",
+        "_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/getAll.json b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/getAll.json
new file mode 100644
index 0000000000..22de0260ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/getAll.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "Created Date": {
+            "type": "string"
+        },
+        "Created By": {
+            "type": "string"
+        },
+        "Modified Date": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Created Date",
+        "Modified Date",
+        "_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/update.json b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/update.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Bubble/__schema__/v1.0.0/object/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
index 01032fcbe8..6208b15f40 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
@@ -37,6 +37,7 @@ export class Chargebee implements INodeType {
 		defaults: {
 			name: 'Chargebee',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index 12ef42d73f..382cec23bf 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -23,6 +23,7 @@ export class CircleCi implements INodeType {
 		defaults: {
 			name: 'CircleCI',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index 39a6140837..3c40e394c5 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
@@ -33,6 +33,7 @@ export class CiscoWebex implements INodeType {
 		defaults: {
 			name: 'Webex by Cisco',
 		},
+		usableAsTool: true,
 		credentials: [
 			{
 				name: 'ciscoWebexOAuth2Api',
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index 685ac62fc2..d8beaf7462 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -23,6 +23,7 @@ export class Clearbit implements INodeType {
 		defaults: {
 			name: 'Clearbit',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Clearbit/__schema__/v1.0.0/person/enrich.json b/packages/nodes-base/nodes/Clearbit/__schema__/v1.0.0/person/enrich.json
new file mode 100644
index 0000000000..d5b3f50dc0
--- /dev/null
+++ b/packages/nodes-base/nodes/Clearbit/__schema__/v1.0.0/person/enrich.json
@@ -0,0 +1,187 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "object",
+            "properties": {
+                "fullName": {
+                    "type": "string"
+                },
+                "givenName": {
+                    "type": "string"
+                },
+                "familyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "fullName",
+                "givenName",
+                "familyName"
+            ]
+        },
+        "email": {
+            "type": "string"
+        },
+        "bio": {
+            "type": "null"
+        },
+        "site": {
+            "type": "null"
+        },
+        "employment": {
+            "type": "object",
+            "properties": {
+                "domain": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "domain",
+                "name",
+                "title",
+                "role",
+                "seniority"
+            ]
+        },
+        "facebook": {
+            "type": "object",
+            "properties": {
+                "handle": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "handle"
+            ]
+        },
+        "twitter": {
+            "type": "object",
+            "properties": {
+                "handle": {
+                    "type": "null"
+                },
+                "id": {
+                    "type": "null"
+                },
+                "bio": {
+                    "type": "null"
+                },
+                "followers": {
+                    "type": "null"
+                },
+                "following": {
+                    "type": "null"
+                },
+                "statuses": {
+                    "type": "null"
+                },
+                "favorites": {
+                    "type": "null"
+                },
+                "location": {
+                    "type": "null"
+                },
+                "site": {
+                    "type": "null"
+                },
+                "avatar": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "handle",
+                "id",
+                "bio",
+                "followers",
+                "following",
+                "statuses",
+                "favorites",
+                "location",
+                "site",
+                "avatar"
+            ]
+        },
+        "googleplus": {
+            "type": "object",
+            "properties": {
+                "handle": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "handle"
+            ]
+        },
+        "gravatar": {
+            "type": "object",
+            "properties": {
+                "avatars": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "url": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "url",
+                            "type"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "handle",
+                "urls",
+                "avatar",
+                "avatars"
+            ]
+        },
+        "fuzzy": {
+            "type": "boolean"
+        },
+        "emailProvider": {
+            "type": "boolean"
+        },
+        "indexedAt": {
+            "type": "string"
+        },
+        "inactiveAt": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "email",
+        "location",
+        "timeZone",
+        "utcOffset",
+        "geo",
+        "bio",
+        "site",
+        "avatar",
+        "employment",
+        "facebook",
+        "github",
+        "twitter",
+        "linkedin",
+        "googleplus",
+        "gravatar",
+        "fuzzy",
+        "emailProvider",
+        "indexedAt",
+        "phone"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 952bd4956f..dabb155930 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -40,6 +40,7 @@ export class ClickUp implements INodeType {
 		defaults: {
 			name: 'ClickUp',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/checklist/create.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/checklist/create.json
new file mode 100644
index 0000000000..ec2a667a38
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/checklist/create.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "task_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "resolved": {
+            "type": "integer"
+        },
+        "unresolved": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "task_id",
+        "name",
+        "orderindex",
+        "resolved",
+        "unresolved",
+        "items"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/checklistItem/create.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/checklistItem/create.json
new file mode 100644
index 0000000000..e4dff0938a
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/checklistItem/create.json
@@ -0,0 +1,95 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "task_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "creator": {
+            "type": "integer"
+        },
+        "resolved": {
+            "type": "integer"
+        },
+        "unresolved": {
+            "type": "integer"
+        },
+        "items": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "null"
+                    },
+                    "assignee": {
+                        "type": "null"
+                    },
+                    "group_assignee": {
+                        "type": "null"
+                    },
+                    "resolved": {
+                        "type": "boolean"
+                    },
+                    "parent": {
+                        "type": "null"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "start_date": {
+                        "type": "null"
+                    },
+                    "start_date_time": {
+                        "type": "boolean"
+                    },
+                    "due_date": {
+                        "type": "null"
+                    },
+                    "due_date_time": {
+                        "type": "boolean"
+                    },
+                    "sent_due_date_notif": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "orderindex",
+                    "assignee",
+                    "group_assignee",
+                    "resolved",
+                    "parent",
+                    "date_created",
+                    "children"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "task_id",
+        "name",
+        "date_created",
+        "orderindex",
+        "creator",
+        "resolved",
+        "unresolved",
+        "items"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/comment/create.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/comment/create.json
new file mode 100644
index 0000000000..6e293797e0
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/comment/create.json
@@ -0,0 +1,160 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "hist_id": {
+            "type": "string"
+        },
+        "date": {
+            "type": "integer"
+        },
+        "version": {
+            "type": "object",
+            "properties": {
+                "object_type": {
+                    "type": "string"
+                },
+                "object_id": {
+                    "type": "string"
+                },
+                "workspace_id": {
+                    "type": "integer"
+                },
+                "operation": {
+                    "type": "string"
+                },
+                "data": {
+                    "type": "object",
+                    "properties": {
+                        "context": {
+                            "type": "object",
+                            "properties": {
+                                "audit_context": {
+                                    "type": "object",
+                                    "properties": {
+                                        "userid": {
+                                            "type": "integer"
+                                        },
+                                        "current_time": {
+                                            "type": "integer"
+                                        },
+                                        "route": {
+                                            "type": "string"
+                                        },
+                                        "ip": {
+                                            "type": "string"
+                                        },
+                                        "user_agent": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "userid",
+                                        "current_time",
+                                        "route"
+                                    ]
+                                },
+                                "originating_service": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "audit_context",
+                                "originating_service"
+                            ]
+                        },
+                        "relationships": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "object_type": {
+                                        "type": "string"
+                                    },
+                                    "workspace_id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "object_type",
+                                    "object_id",
+                                    "workspace_id"
+                                ]
+                            }
+                        },
+                        "changes": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "field": {
+                                        "type": "string"
+                                    },
+                                    "after": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "field",
+                                    "after"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "context",
+                        "relationships",
+                        "changes"
+                    ]
+                },
+                "master_id": {
+                    "type": "integer"
+                },
+                "version": {
+                    "type": "integer"
+                },
+                "deleted": {
+                    "type": "boolean"
+                },
+                "traceparent": {
+                    "type": "string"
+                },
+                "date_created": {
+                    "type": "integer"
+                },
+                "date_updated": {
+                    "type": "integer"
+                },
+                "event_publish_time": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "object_type",
+                "object_id",
+                "workspace_id",
+                "operation",
+                "data",
+                "master_id",
+                "version",
+                "deleted",
+                "traceparent",
+                "date_created",
+                "date_updated",
+                "event_publish_time"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "hist_id",
+        "date",
+        "version"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/comment/getAll.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/comment/getAll.json
new file mode 100644
index 0000000000..67bfc002be
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/comment/getAll.json
@@ -0,0 +1,121 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "comment": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "text": {
+                        "type": "string"
+                    },
+                    "attributes": {
+                        "type": "object",
+                        "properties": {
+                            "block-id": {
+                                "type": "string"
+                            }
+                        }
+                    }
+                },
+                "required": [
+                    "text"
+                ]
+            }
+        },
+        "comment_text": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "initials": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "email",
+                "color",
+                "initials",
+                "profilePicture"
+            ]
+        },
+        "group_assignee": {
+            "type": "null"
+        },
+        "reactions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "reaction": {
+                        "type": "string"
+                    },
+                    "date": {
+                        "type": "string"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "username": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            },
+                            "initials": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "username",
+                            "email",
+                            "initials",
+                            "profilePicture"
+                        ]
+                    }
+                },
+                "required": [
+                    "reaction",
+                    "date",
+                    "user"
+                ]
+            }
+        },
+        "date": {
+            "type": "string"
+        },
+        "reply_count": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "comment",
+        "comment_text",
+        "user",
+        "assignee",
+        "group_assignee",
+        "reactions",
+        "date",
+        "reply_count"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/create.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/create.json
new file mode 100644
index 0000000000..c41ef10ded
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/create.json
@@ -0,0 +1,61 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "override_statuses": {
+            "type": "boolean"
+        },
+        "hidden": {
+            "type": "boolean"
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "task_count": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "permission_level": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "orderindex",
+        "override_statuses",
+        "hidden",
+        "space",
+        "task_count",
+        "archived",
+        "statuses",
+        "lists",
+        "permission_level"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/get.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/get.json
new file mode 100644
index 0000000000..e6089956d1
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/get.json
@@ -0,0 +1,172 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "override_statuses": {
+            "type": "boolean"
+        },
+        "hidden": {
+            "type": "boolean"
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "task_count": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "statuses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "status",
+                    "orderindex",
+                    "color",
+                    "type"
+                ]
+            }
+        },
+        "lists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "content": {
+                        "type": "string"
+                    },
+                    "priority": {
+                        "type": "null"
+                    },
+                    "task_count": {
+                        "type": "integer"
+                    },
+                    "archived": {
+                        "type": "boolean"
+                    },
+                    "statuses": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "status": {
+                                    "type": "string"
+                                },
+                                "orderindex": {
+                                    "type": "integer"
+                                },
+                                "color": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "type": "string"
+                                },
+                                "status_group": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "status",
+                                "orderindex",
+                                "color",
+                                "type",
+                                "status_group"
+                            ]
+                        }
+                    },
+                    "permission_level": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "orderindex",
+                    "status",
+                    "priority",
+                    "assignee",
+                    "task_count",
+                    "due_date",
+                    "start_date",
+                    "archived",
+                    "override_statuses",
+                    "statuses",
+                    "permission_level"
+                ]
+            }
+        },
+        "permission_level": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "orderindex",
+        "override_statuses",
+        "hidden",
+        "space",
+        "task_count",
+        "archived",
+        "statuses",
+        "lists",
+        "permission_level"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/getAll.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/getAll.json
new file mode 100644
index 0000000000..cecb366f4c
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/folder/getAll.json
@@ -0,0 +1,188 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "override_statuses": {
+            "type": "boolean"
+        },
+        "hidden": {
+            "type": "boolean"
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "task_count": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "statuses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "color": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "status",
+                    "type",
+                    "orderindex",
+                    "color"
+                ]
+            }
+        },
+        "lists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "content": {
+                        "type": "string"
+                    },
+                    "priority": {
+                        "type": "null"
+                    },
+                    "task_count": {
+                        "type": "integer"
+                    },
+                    "space": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "access": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "name",
+                            "access"
+                        ]
+                    },
+                    "archived": {
+                        "type": "boolean"
+                    },
+                    "statuses": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "status": {
+                                    "type": "string"
+                                },
+                                "orderindex": {
+                                    "type": "integer"
+                                },
+                                "color": {
+                                    "type": "string"
+                                },
+                                "type": {
+                                    "type": "string"
+                                },
+                                "status_group": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "status",
+                                "orderindex",
+                                "color",
+                                "type",
+                                "status_group"
+                            ]
+                        }
+                    },
+                    "permission_level": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "orderindex",
+                    "status",
+                    "priority",
+                    "assignee",
+                    "task_count",
+                    "due_date",
+                    "start_date",
+                    "space",
+                    "archived",
+                    "override_statuses",
+                    "statuses",
+                    "permission_level"
+                ]
+            }
+        },
+        "permission_level": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "orderindex",
+        "override_statuses",
+        "hidden",
+        "space",
+        "task_count",
+        "archived",
+        "statuses",
+        "lists",
+        "permission_level"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/create.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/create.json
new file mode 100644
index 0000000000..e61bd8e4a0
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/create.json
@@ -0,0 +1,130 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "assignee": {
+            "type": "null"
+        },
+        "start_date": {
+            "type": "null"
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "hidden": {
+                    "type": "boolean"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "inbound_address": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "override_statuses": {
+            "type": "boolean"
+        },
+        "statuses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "status_group": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "status",
+                    "orderindex",
+                    "color",
+                    "type",
+                    "status_group"
+                ]
+            }
+        },
+        "permission_level": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "deleted",
+        "orderindex",
+        "content",
+        "priority",
+        "assignee",
+        "due_date",
+        "start_date",
+        "folder",
+        "space",
+        "archived",
+        "override_statuses",
+        "permission_level"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/customFields.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/customFields.json
new file mode 100644
index 0000000000..f0286c3511
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/customFields.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "hide_from_guests": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "type",
+        "type_config",
+        "date_created",
+        "hide_from_guests",
+        "required"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/get.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/get.json
new file mode 100644
index 0000000000..a5fec1deea
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/get.json
@@ -0,0 +1,134 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "null"
+        },
+        "assignee": {
+            "type": "null"
+        },
+        "due_date": {
+            "type": "null"
+        },
+        "start_date": {
+            "type": "null"
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "hidden": {
+                    "type": "boolean"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "inbound_address": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "statuses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "status_group": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "status",
+                    "orderindex",
+                    "color",
+                    "type",
+                    "status_group"
+                ]
+            }
+        },
+        "permission_level": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "deleted",
+        "orderindex",
+        "priority",
+        "assignee",
+        "due_date",
+        "start_date",
+        "folder",
+        "space",
+        "inbound_address",
+        "archived",
+        "override_statuses",
+        "statuses",
+        "permission_level"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/getAll.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/getAll.json
new file mode 100644
index 0000000000..a5a08b775a
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/getAll.json
@@ -0,0 +1,84 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "orderindex": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "task_count": {
+            "type": "integer"
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "hidden": {
+                    "type": "boolean"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "permission_level": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "orderindex",
+        "status",
+        "priority",
+        "assignee",
+        "task_count",
+        "due_date",
+        "start_date",
+        "folder",
+        "space",
+        "archived",
+        "override_statuses",
+        "permission_level"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/member.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/member.json
new file mode 100644
index 0000000000..5937a25098
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/list/member.json
@@ -0,0 +1,54 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "username": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "initials": {
+            "type": "string"
+        },
+        "profileInfo": {
+            "type": "object",
+            "properties": {
+                "verified_ambassador": {
+                    "type": "null"
+                },
+                "verified_consultant": {
+                    "type": "null"
+                },
+                "viewed_verified_ambassador": {
+                    "type": "null"
+                },
+                "viewed_verified_consultant": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "display_profile",
+                "verified_ambassador",
+                "verified_consultant",
+                "top_tier_user",
+                "ai_expert",
+                "viewed_verified_ambassador",
+                "viewed_verified_consultant",
+                "viewed_top_tier_user",
+                "viewed_ai_expert"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "username",
+        "email",
+        "color",
+        "initials",
+        "profilePicture",
+        "profileInfo"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/create.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/create.json
new file mode 100644
index 0000000000..c4f541bfad
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/create.json
@@ -0,0 +1,388 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "custom_id": {
+            "type": "null"
+        },
+        "custom_item_id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "text_content": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "color": {
+                    "type": "string"
+                },
+                "orderindex": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "status",
+                "color",
+                "orderindex",
+                "type"
+            ]
+        },
+        "orderindex": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_updated": {
+            "type": "string"
+        },
+        "date_done": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "color",
+                "email",
+                "profilePicture"
+            ]
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "watchers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "tag_fg": {
+                        "type": "string"
+                    },
+                    "tag_bg": {
+                        "type": "string"
+                    },
+                    "creator": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "name",
+                    "tag_fg",
+                    "tag_bg",
+                    "creator"
+                ]
+            }
+        },
+        "points": {
+            "type": "null"
+        },
+        "time_spent": {
+            "type": "integer"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "type_config": {
+                        "type": "object",
+                        "properties": {
+                            "sorting": {
+                                "type": "string"
+                            },
+                            "options": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "id": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "orderindex": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "id",
+                                        "color"
+                                    ]
+                                }
+                            }
+                        }
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "hide_from_guests": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "type",
+                    "type_config",
+                    "date_created",
+                    "hide_from_guests",
+                    "required"
+                ]
+            }
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "sharing": {
+            "type": "object",
+            "properties": {
+                "public": {
+                    "type": "boolean"
+                },
+                "public_share_expires_on": {
+                    "type": "null"
+                },
+                "public_fields": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "token": {
+                    "type": "null"
+                },
+                "seo_optimized": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "public",
+                "public_share_expires_on",
+                "public_fields",
+                "token",
+                "seo_optimized"
+            ]
+        },
+        "permission_level": {
+            "type": "string"
+        },
+        "list": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "project": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "custom_id",
+        "custom_item_id",
+        "name",
+        "text_content",
+        "description",
+        "status",
+        "orderindex",
+        "date_created",
+        "date_updated",
+        "date_closed",
+        "date_done",
+        "archived",
+        "creator",
+        "assignees",
+        "group_assignees",
+        "watchers",
+        "checklists",
+        "tags",
+        "parent",
+        "top_level_parent",
+        "priority",
+        "due_date",
+        "start_date",
+        "points",
+        "time_estimate",
+        "time_spent",
+        "custom_fields",
+        "dependencies",
+        "linked_tasks",
+        "locations",
+        "team_id",
+        "url",
+        "sharing",
+        "permission_level",
+        "list",
+        "project",
+        "folder",
+        "space"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/get.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/get.json
new file mode 100644
index 0000000000..a7c817edd3
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/get.json
@@ -0,0 +1,762 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "custom_item_id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "text_content": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "color": {
+                    "type": "string"
+                },
+                "orderindex": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "status",
+                "color",
+                "orderindex",
+                "type"
+            ]
+        },
+        "orderindex": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_updated": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "color": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "color",
+                "email",
+                "profilePicture"
+            ]
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "watchers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "checklists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "creator": {
+                        "type": "integer"
+                    },
+                    "resolved": {
+                        "type": "integer"
+                    },
+                    "unresolved": {
+                        "type": "integer"
+                    },
+                    "items": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "group_assignee": {
+                                    "type": "null"
+                                },
+                                "resolved": {
+                                    "type": "boolean"
+                                },
+                                "parent": {
+                                    "type": "null"
+                                },
+                                "date_created": {
+                                    "type": "string"
+                                },
+                                "start_date": {
+                                    "type": "null"
+                                },
+                                "due_date": {
+                                    "type": "null"
+                                },
+                                "sent_due_date_notif": {
+                                    "type": "null"
+                                },
+                                "children": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "id": {
+                                                "type": "string"
+                                            },
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "orderindex": {
+                                                "type": "integer"
+                                            },
+                                            "assignee": {
+                                                "type": "null"
+                                            },
+                                            "group_assignee": {
+                                                "type": "null"
+                                            },
+                                            "resolved": {
+                                                "type": "boolean"
+                                            },
+                                            "parent": {
+                                                "type": "string"
+                                            },
+                                            "date_created": {
+                                                "type": "string"
+                                            },
+                                            "start_date": {
+                                                "type": "null"
+                                            },
+                                            "start_date_time": {
+                                                "type": "null"
+                                            },
+                                            "due_date": {
+                                                "type": "null"
+                                            },
+                                            "due_date_time": {
+                                                "type": "null"
+                                            },
+                                            "sent_due_date_notif": {
+                                                "type": "null"
+                                            },
+                                            "children": {
+                                                "type": "array",
+                                                "items": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "id": {
+                                                            "type": "string"
+                                                        },
+                                                        "name": {
+                                                            "type": "string"
+                                                        },
+                                                        "orderindex": {
+                                                            "type": "number"
+                                                        },
+                                                        "assignee": {
+                                                            "type": "null"
+                                                        },
+                                                        "group_assignee": {
+                                                            "type": "null"
+                                                        },
+                                                        "resolved": {
+                                                            "type": "boolean"
+                                                        },
+                                                        "parent": {
+                                                            "type": "string"
+                                                        },
+                                                        "date_created": {
+                                                            "type": "string"
+                                                        },
+                                                        "start_date": {
+                                                            "type": "null"
+                                                        },
+                                                        "start_date_time": {
+                                                            "type": "null"
+                                                        },
+                                                        "due_date": {
+                                                            "type": "null"
+                                                        },
+                                                        "due_date_time": {
+                                                            "type": "null"
+                                                        },
+                                                        "sent_due_date_notif": {
+                                                            "type": "null"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "id",
+                                                        "name",
+                                                        "orderindex",
+                                                        "assignee",
+                                                        "group_assignee",
+                                                        "resolved",
+                                                        "parent",
+                                                        "date_created",
+                                                        "start_date",
+                                                        "start_date_time",
+                                                        "due_date",
+                                                        "due_date_time",
+                                                        "sent_due_date_notif",
+                                                        "children"
+                                                    ]
+                                                }
+                                            }
+                                        },
+                                        "required": [
+                                            "id",
+                                            "name",
+                                            "orderindex",
+                                            "assignee",
+                                            "group_assignee",
+                                            "resolved",
+                                            "parent",
+                                            "date_created",
+                                            "start_date",
+                                            "start_date_time",
+                                            "due_date",
+                                            "due_date_time",
+                                            "sent_due_date_notif",
+                                            "children"
+                                        ]
+                                    }
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "name",
+                                "orderindex",
+                                "assignee",
+                                "group_assignee",
+                                "resolved",
+                                "parent",
+                                "date_created",
+                                "start_date",
+                                "start_date_time",
+                                "due_date",
+                                "due_date_time",
+                                "sent_due_date_notif",
+                                "children"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "task_id",
+                    "name",
+                    "date_created",
+                    "orderindex",
+                    "creator",
+                    "resolved",
+                    "unresolved",
+                    "items"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "tag_fg": {
+                        "type": "string"
+                    },
+                    "tag_bg": {
+                        "type": "string"
+                    },
+                    "creator": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "name",
+                    "tag_fg",
+                    "tag_bg",
+                    "creator"
+                ]
+            }
+        },
+        "time_spent": {
+            "type": "integer"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "type_config": {
+                        "type": "object",
+                        "properties": {
+                            "sorting": {
+                                "type": "string"
+                            },
+                            "options": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "id": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "orderindex": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "id",
+                                        "color"
+                                    ]
+                                }
+                            }
+                        }
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "hide_from_guests": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "type",
+                    "type_config",
+                    "date_created",
+                    "hide_from_guests",
+                    "required"
+                ]
+            }
+        },
+        "linked_tasks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "link_id": {
+                        "type": "string"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "userid": {
+                        "type": "string"
+                    },
+                    "workspace_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "task_id",
+                    "link_id",
+                    "date_created",
+                    "userid",
+                    "workspace_id"
+                ]
+            }
+        },
+        "locations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "sharing": {
+            "type": "object",
+            "properties": {
+                "public": {
+                    "type": "boolean"
+                },
+                "public_share_expires_on": {
+                    "type": "null"
+                },
+                "public_fields": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "seo_optimized": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "public",
+                "public_share_expires_on",
+                "public_fields",
+                "token",
+                "seo_optimized"
+            ]
+        },
+        "permission_level": {
+            "type": "string"
+        },
+        "list": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "project": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "date": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "integer"
+                    },
+                    "source": {
+                        "type": "integer"
+                    },
+                    "version": {
+                        "type": "integer"
+                    },
+                    "extension": {
+                        "type": "string"
+                    },
+                    "is_folder": {
+                        "type": "null"
+                    },
+                    "mimetype": {
+                        "type": "string"
+                    },
+                    "hidden": {
+                        "type": "boolean"
+                    },
+                    "parent_id": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "total_comments": {
+                        "type": "integer"
+                    },
+                    "resolved_comments": {
+                        "type": "integer"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "username": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            },
+                            "initials": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "username",
+                            "email",
+                            "initials",
+                            "color",
+                            "profilePicture"
+                        ]
+                    },
+                    "deleted": {
+                        "type": "boolean"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "workspace_id": {
+                        "type": "null"
+                    },
+                    "url_w_query": {
+                        "type": "string"
+                    },
+                    "url_w_host": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "date",
+                    "title",
+                    "type",
+                    "source",
+                    "version",
+                    "extension",
+                    "thumbnail_small",
+                    "thumbnail_medium",
+                    "thumbnail_large",
+                    "is_folder",
+                    "mimetype",
+                    "hidden",
+                    "parent_id",
+                    "size",
+                    "total_comments",
+                    "resolved_comments",
+                    "user",
+                    "deleted",
+                    "orientation",
+                    "url",
+                    "email_data",
+                    "workspace_id",
+                    "url_w_query",
+                    "url_w_host"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "custom_id",
+        "custom_item_id",
+        "name",
+        "text_content",
+        "description",
+        "status",
+        "orderindex",
+        "date_created",
+        "date_updated",
+        "date_closed",
+        "date_done",
+        "archived",
+        "creator",
+        "assignees",
+        "group_assignees",
+        "watchers",
+        "checklists",
+        "tags",
+        "parent",
+        "top_level_parent",
+        "priority",
+        "due_date",
+        "start_date",
+        "points",
+        "time_estimate",
+        "time_spent",
+        "custom_fields",
+        "dependencies",
+        "linked_tasks",
+        "locations",
+        "team_id",
+        "url",
+        "sharing",
+        "permission_level",
+        "list",
+        "project",
+        "folder",
+        "space",
+        "attachments"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/getAll.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/getAll.json
new file mode 100644
index 0000000000..f0e5071610
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/getAll.json
@@ -0,0 +1,517 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "custom_item_id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "status": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "color": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "orderindex": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "status",
+                "id",
+                "color",
+                "type",
+                "orderindex"
+            ]
+        },
+        "orderindex": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_updated": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "color",
+                "email",
+                "profilePicture"
+            ]
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "watchers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "checklists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "creator": {
+                        "type": "integer"
+                    },
+                    "resolved": {
+                        "type": "integer"
+                    },
+                    "unresolved": {
+                        "type": "integer"
+                    },
+                    "items": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "orderindex": {
+                                    "type": "integer"
+                                },
+                                "assignee": {
+                                    "type": "null"
+                                },
+                                "group_assignee": {
+                                    "type": "null"
+                                },
+                                "resolved": {
+                                    "type": "boolean"
+                                },
+                                "parent": {
+                                    "type": "null"
+                                },
+                                "date_created": {
+                                    "type": "string"
+                                },
+                                "start_date": {
+                                    "type": "null"
+                                },
+                                "start_date_time": {
+                                    "type": "boolean"
+                                },
+                                "due_date": {
+                                    "type": "null"
+                                },
+                                "due_date_time": {
+                                    "type": "boolean"
+                                },
+                                "sent_due_date_notif": {
+                                    "type": "null"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "name",
+                                "orderindex",
+                                "assignee",
+                                "group_assignee",
+                                "resolved",
+                                "parent",
+                                "date_created",
+                                "start_date",
+                                "start_date_time",
+                                "due_date",
+                                "due_date_time",
+                                "sent_due_date_notif",
+                                "children"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "task_id",
+                    "name",
+                    "date_created",
+                    "orderindex",
+                    "creator",
+                    "resolved",
+                    "unresolved",
+                    "items"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "tag_fg": {
+                        "type": "string"
+                    },
+                    "tag_bg": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name",
+                    "tag_fg",
+                    "tag_bg",
+                    "creator"
+                ]
+            }
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "type_config": {
+                        "type": "object",
+                        "properties": {
+                            "options": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "id": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "orderindex": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "id",
+                                        "color"
+                                    ]
+                                }
+                            }
+                        }
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "hide_from_guests": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "type",
+                    "type_config",
+                    "date_created",
+                    "hide_from_guests",
+                    "required"
+                ]
+            }
+        },
+        "linked_tasks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "link_id": {
+                        "type": "string"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "userid": {
+                        "type": "string"
+                    },
+                    "workspace_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "task_id",
+                    "link_id",
+                    "date_created",
+                    "userid",
+                    "workspace_id"
+                ]
+            }
+        },
+        "locations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "sharing": {
+            "type": "object",
+            "properties": {
+                "public": {
+                    "type": "boolean"
+                },
+                "public_share_expires_on": {
+                    "type": "null"
+                },
+                "public_fields": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "token": {
+                    "type": "null"
+                },
+                "seo_optimized": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "public",
+                "public_share_expires_on",
+                "public_fields",
+                "token",
+                "seo_optimized"
+            ]
+        },
+        "permission_level": {
+            "type": "string"
+        },
+        "list": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "project": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "hidden": {
+                    "type": "boolean"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "hidden": {
+                    "type": "boolean"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "custom_id",
+        "custom_item_id",
+        "name",
+        "text_content",
+        "description",
+        "status",
+        "orderindex",
+        "date_created",
+        "date_updated",
+        "date_closed",
+        "date_done",
+        "archived",
+        "creator",
+        "assignees",
+        "group_assignees",
+        "watchers",
+        "checklists",
+        "tags",
+        "parent",
+        "top_level_parent",
+        "priority",
+        "due_date",
+        "start_date",
+        "points",
+        "time_estimate",
+        "custom_fields",
+        "dependencies",
+        "linked_tasks",
+        "locations",
+        "team_id",
+        "url",
+        "sharing",
+        "permission_level",
+        "list",
+        "project",
+        "folder",
+        "space"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/update.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/update.json
new file mode 100644
index 0000000000..fd514b1b46
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/task/update.json
@@ -0,0 +1,673 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "custom_item_id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "color": {
+                    "type": "string"
+                },
+                "orderindex": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "status",
+                "color",
+                "orderindex",
+                "type"
+            ]
+        },
+        "orderindex": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_updated": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "color",
+                "email",
+                "profilePicture"
+            ]
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "watchers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "initials": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "color",
+                    "initials",
+                    "email",
+                    "profilePicture"
+                ]
+            }
+        },
+        "checklists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "orderindex": {
+                        "type": "integer"
+                    },
+                    "creator": {
+                        "type": "integer"
+                    },
+                    "resolved": {
+                        "type": "integer"
+                    },
+                    "unresolved": {
+                        "type": "integer"
+                    },
+                    "items": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "group_assignee": {
+                                    "type": "null"
+                                },
+                                "resolved": {
+                                    "type": "boolean"
+                                },
+                                "parent": {
+                                    "type": "null"
+                                },
+                                "date_created": {
+                                    "type": "string"
+                                },
+                                "start_date": {
+                                    "type": "null"
+                                },
+                                "due_date": {
+                                    "type": "null"
+                                },
+                                "sent_due_date_notif": {
+                                    "type": "null"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "name",
+                                "orderindex",
+                                "assignee",
+                                "group_assignee",
+                                "resolved",
+                                "parent",
+                                "date_created",
+                                "children"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "task_id",
+                    "name",
+                    "date_created",
+                    "orderindex",
+                    "creator",
+                    "resolved",
+                    "unresolved",
+                    "items"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "tag_fg": {
+                        "type": "string"
+                    },
+                    "tag_bg": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name",
+                    "tag_fg",
+                    "tag_bg",
+                    "creator"
+                ]
+            }
+        },
+        "points": {
+            "type": "null"
+        },
+        "time_spent": {
+            "type": "integer"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "type_config": {
+                        "type": "object",
+                        "properties": {
+                            "options": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "id": {
+                                            "type": "string"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "orderindex": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "id",
+                                        "color"
+                                    ]
+                                }
+                            },
+                            "sorting": {
+                                "type": "string"
+                            },
+                            "new_drop_down": {
+                                "type": "boolean"
+                            }
+                        }
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "hide_from_guests": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "type",
+                    "type_config",
+                    "date_created",
+                    "hide_from_guests",
+                    "required"
+                ]
+            }
+        },
+        "dependencies": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "depends_on": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "integer"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "userid": {
+                        "type": "string"
+                    },
+                    "workspace_id": {
+                        "type": "string"
+                    },
+                    "chain_id": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "task_id",
+                    "depends_on",
+                    "type",
+                    "date_created",
+                    "userid",
+                    "workspace_id",
+                    "chain_id"
+                ]
+            }
+        },
+        "linked_tasks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "link_id": {
+                        "type": "string"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "userid": {
+                        "type": "string"
+                    },
+                    "workspace_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "task_id",
+                    "link_id",
+                    "date_created",
+                    "userid",
+                    "workspace_id"
+                ]
+            }
+        },
+        "locations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "sharing": {
+            "type": "object",
+            "properties": {
+                "public": {
+                    "type": "boolean"
+                },
+                "public_share_expires_on": {
+                    "type": "null"
+                },
+                "public_fields": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "token": {
+                    "type": "null"
+                },
+                "seo_optimized": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "public",
+                "public_share_expires_on",
+                "public_fields",
+                "token",
+                "seo_optimized"
+            ]
+        },
+        "permission_level": {
+            "type": "string"
+        },
+        "list": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "access"
+            ]
+        },
+        "project": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "access": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "hidden",
+                "access"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "date": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "integer"
+                    },
+                    "source": {
+                        "type": "integer"
+                    },
+                    "version": {
+                        "type": "integer"
+                    },
+                    "extension": {
+                        "type": "string"
+                    },
+                    "thumbnail_small": {
+                        "type": "string"
+                    },
+                    "thumbnail_medium": {
+                        "type": "string"
+                    },
+                    "thumbnail_large": {
+                        "type": "string"
+                    },
+                    "is_folder": {
+                        "type": "null"
+                    },
+                    "mimetype": {
+                        "type": "string"
+                    },
+                    "hidden": {
+                        "type": "boolean"
+                    },
+                    "parent_id": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "total_comments": {
+                        "type": "integer"
+                    },
+                    "resolved_comments": {
+                        "type": "integer"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "username": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            },
+                            "initials": {
+                                "type": "string"
+                            },
+                            "color": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "username",
+                            "email",
+                            "initials",
+                            "color",
+                            "profilePicture"
+                        ]
+                    },
+                    "deleted": {
+                        "type": "boolean"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "email_data": {
+                        "type": "null"
+                    },
+                    "workspace_id": {
+                        "type": "null"
+                    },
+                    "url_w_query": {
+                        "type": "string"
+                    },
+                    "url_w_host": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "date",
+                    "title",
+                    "type",
+                    "source",
+                    "version",
+                    "extension",
+                    "thumbnail_small",
+                    "thumbnail_medium",
+                    "thumbnail_large",
+                    "is_folder",
+                    "mimetype",
+                    "hidden",
+                    "parent_id",
+                    "size",
+                    "total_comments",
+                    "resolved_comments",
+                    "user",
+                    "deleted",
+                    "orientation",
+                    "url",
+                    "email_data",
+                    "workspace_id",
+                    "url_w_query",
+                    "url_w_host"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "custom_id",
+        "custom_item_id",
+        "name",
+        "text_content",
+        "description",
+        "status",
+        "orderindex",
+        "date_created",
+        "date_updated",
+        "date_closed",
+        "date_done",
+        "archived",
+        "creator",
+        "assignees",
+        "group_assignees",
+        "watchers",
+        "checklists",
+        "tags",
+        "parent",
+        "priority",
+        "due_date",
+        "start_date",
+        "points",
+        "time_estimate",
+        "time_spent",
+        "custom_fields",
+        "dependencies",
+        "linked_tasks",
+        "locations",
+        "team_id",
+        "url",
+        "sharing",
+        "permission_level",
+        "list",
+        "project",
+        "folder",
+        "space"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/timeEntry/getAll.json b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/timeEntry/getAll.json
new file mode 100644
index 0000000000..c2c44cc4c1
--- /dev/null
+++ b/packages/nodes-base/nodes/ClickUp/__schema__/v1.0.0/timeEntry/getAll.json
@@ -0,0 +1,146 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"task": {
+			"type": "object",
+			"properties": {
+				"id": {
+					"type": "string"
+				},
+				"name": {
+					"type": "string"
+				},
+				"status": {
+					"type": "object",
+					"properties": {
+						"status": {
+							"type": "string"
+						},
+						"color": {
+							"type": "string"
+						},
+						"type": {
+							"type": "string"
+						},
+						"orderindex": {
+							"type": "integer"
+						}
+					},
+					"required": [
+						"status",
+						"color",
+						"type",
+						"orderindex"
+					]
+				}
+			},
+			"required": [
+				"id",
+				"name",
+				"status",
+				"custom_type"
+			]
+		},
+		"wid": {
+			"type": "string"
+		},
+		"user": {
+			"type": "object",
+			"properties": {
+				"id": {
+					"type": "integer"
+				},
+				"username": {
+					"type": "string"
+				},
+				"email": {
+					"type": "string"
+				},
+				"color": {
+					"type": "string"
+				},
+				"initials": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"id",
+				"username",
+				"email",
+				"color",
+				"initials",
+				"profilePicture"
+			]
+		},
+		"billable": {
+			"type": "boolean"
+		},
+		"start": {
+			"type": "string"
+		},
+		"end": {
+			"type": "string"
+		},
+		"duration": {
+			"type": "string"
+		},
+		"description": {
+			"type": "string"
+		},
+		"source": {
+			"type": "string"
+		},
+		"at": {
+			"type": "string"
+		},
+		"is_locked": {
+			"type": "boolean"
+		},
+		"approval_id": {
+			"type": "null"
+		},
+		"task_location": {
+			"type": "object",
+			"properties": {
+				"list_id": {
+					"type": "string"
+				},
+				"folder_id": {
+					"type": "string"
+				},
+				"space_id": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"list_id",
+				"folder_id",
+				"space_id"
+			]
+		},
+		"task_url": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"id",
+		"task",
+		"wid",
+		"user",
+		"billable",
+		"start",
+		"end",
+		"duration",
+		"description",
+		"tags",
+		"source",
+		"at",
+		"is_locked",
+		"approval_id",
+		"task_location",
+		"task_url"
+	]
+}
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 9723dfa025..84646df5a7 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -34,6 +34,7 @@ export class Clockify implements INodeType {
 		defaults: {
 			name: 'Clockify',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Clockify/__schema__/v1.0.0/project/getAll.json b/packages/nodes-base/nodes/Clockify/__schema__/v1.0.0/project/getAll.json
new file mode 100644
index 0000000000..5d884d819b
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/__schema__/v1.0.0/project/getAll.json
@@ -0,0 +1,156 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "hourlyRate": {
+            "type": "object",
+            "properties": {
+                "amount": {
+                    "type": "integer"
+                },
+                "currency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "amount",
+                "currency"
+            ]
+        },
+        "clientId": {
+            "type": "string"
+        },
+        "workspaceId": {
+            "type": "string"
+        },
+        "billable": {
+            "type": "boolean"
+        },
+        "memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "userId": {
+                        "type": "string"
+                    },
+                    "hourlyRate": {
+                        "type": "null"
+                    },
+                    "costRate": {
+                        "type": "null"
+                    },
+                    "targetId": {
+                        "type": "string"
+                    },
+                    "membershipType": {
+                        "type": "string"
+                    },
+                    "membershipStatus": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "userId",
+                    "hourlyRate",
+                    "costRate",
+                    "targetId",
+                    "membershipType",
+                    "membershipStatus"
+                ]
+            }
+        },
+        "color": {
+            "type": "string"
+        },
+        "estimate": {
+            "type": "object",
+            "properties": {
+                "estimate": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "estimate",
+                "type"
+            ]
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "duration": {
+            "type": "string"
+        },
+        "clientName": {
+            "type": "string"
+        },
+        "note": {
+            "type": "string"
+        },
+        "timeEstimate": {
+            "type": "object",
+            "properties": {
+                "estimate": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "resetOption": {
+                    "type": "null"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "includeNonBillable": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "estimate",
+                "type",
+                "resetOption",
+                "active",
+                "includeNonBillable"
+            ]
+        },
+        "estimateReset": {
+            "type": "null"
+        },
+        "template": {
+            "type": "boolean"
+        },
+        "public": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "hourlyRate",
+        "clientId",
+        "workspaceId",
+        "billable",
+        "memberships",
+        "color",
+        "estimate",
+        "archived",
+        "duration",
+        "clientName",
+        "note",
+        "costRate",
+        "timeEstimate",
+        "budgetEstimate",
+        "estimateReset",
+        "template",
+        "public"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Clockify/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Clockify/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..8cf92911e1
--- /dev/null
+++ b/packages/nodes-base/nodes/Clockify/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,164 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "activeWorkspace": {
+            "type": "string"
+        },
+        "defaultWorkspace": {
+            "type": "string"
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "weekStart": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "timeFormat": {
+                    "type": "string"
+                },
+                "dateFormat": {
+                    "type": "string"
+                },
+                "sendNewsletter": {
+                    "type": "boolean"
+                },
+                "weeklyUpdates": {
+                    "type": "boolean"
+                },
+                "longRunning": {
+                    "type": "boolean"
+                },
+                "scheduledReports": {
+                    "type": "boolean"
+                },
+                "approval": {
+                    "type": "boolean"
+                },
+                "pto": {
+                    "type": "boolean"
+                },
+                "alerts": {
+                    "type": "boolean"
+                },
+                "reminders": {
+                    "type": "boolean"
+                },
+                "timeTrackingManual": {
+                    "type": "boolean"
+                },
+                "summaryReportSettings": {
+                    "type": "object",
+                    "properties": {
+                        "group": {
+                            "type": "string"
+                        },
+                        "subgroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "group",
+                        "subgroup"
+                    ]
+                },
+                "isCompactViewOn": {
+                    "type": "boolean"
+                },
+                "dashboardSelection": {
+                    "type": "string"
+                },
+                "dashboardViewType": {
+                    "type": "string"
+                },
+                "dashboardPinToTop": {
+                    "type": "boolean"
+                },
+                "collapseAllProjectLists": {
+                    "type": "boolean"
+                },
+                "groupSimilarEntriesDisabled": {
+                    "type": "boolean"
+                },
+                "myStartOfDay": {
+                    "type": "string"
+                },
+                "projectPickerTaskFilter": {
+                    "type": "boolean"
+                },
+                "lang": {
+                    "type": "string"
+                },
+                "multiFactorEnabled": {
+                    "type": "boolean"
+                },
+                "theme": {
+                    "type": "string"
+                },
+                "scheduling": {
+                    "type": "boolean"
+                },
+                "onboarding": {
+                    "type": "boolean"
+                },
+                "showOnlyWorkingDays": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "weekStart",
+                "timeZone",
+                "timeFormat",
+                "dateFormat",
+                "sendNewsletter",
+                "weeklyUpdates",
+                "longRunning",
+                "scheduledReports",
+                "approval",
+                "pto",
+                "alerts",
+                "reminders",
+                "timeTrackingManual",
+                "summaryReportSettings",
+                "isCompactViewOn",
+                "dashboardSelection",
+                "dashboardViewType",
+                "dashboardPinToTop",
+                "projectListCollapse",
+                "collapseAllProjectLists",
+                "groupSimilarEntriesDisabled",
+                "myStartOfDay",
+                "projectPickerTaskFilter",
+                "lang",
+                "multiFactorEnabled",
+                "theme",
+                "scheduling",
+                "onboarding",
+                "showOnlyWorkingDays"
+            ]
+        },
+        "status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "email",
+        "name",
+        "memberships",
+        "profilePicture",
+        "activeWorkspace",
+        "defaultWorkspace",
+        "settings",
+        "status",
+        "customFields"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
index bd9050029c..5ba3ec822e 100644
--- a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
+++ b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
@@ -24,6 +24,7 @@ export class Cloudflare implements INodeType {
 		defaults: {
 			name: 'Cloudflare',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
index f279f1d099..7577e3233b 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
@@ -33,6 +33,7 @@ export class Cockpit implements INodeType {
 		defaults: {
 			name: 'Cockpit',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index 94ca3050c8..04fe3ee1e9 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -28,6 +28,7 @@ export class Coda implements INodeType {
 		defaults: {
 			name: 'Coda',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getAllColumns.json b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getAllColumns.json
new file mode 100644
index 0000000000..5ebc6b6ea4
--- /dev/null
+++ b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getAllColumns.json
@@ -0,0 +1,42 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"type": {
+			"type": "string"
+		},
+		"name": {
+			"type": "string"
+		},
+		"href": {
+			"type": "string"
+		},
+		"format": {
+			"type": "object",
+			"properties": {
+				"type": {
+					"type": "string"
+				},
+				"isArray": {
+					"type": "boolean"
+				}
+			},
+			"required": [
+				"type",
+				"isArray"
+			]
+		},
+		"display": {
+			"type": "boolean"
+		}
+	},
+	"required": [
+		"id",
+		"type",
+		"name",
+		"href",
+		"format"
+	]
+}
diff --git a/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getAllRows.json b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getAllRows.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getAllRows.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getRow.json b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getRow.json
new file mode 100644
index 0000000000..9d48cdeef7
--- /dev/null
+++ b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/getRow.json
@@ -0,0 +1,146 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "Niche Name": {
+            "type": "string"
+        },
+        "ONB_Response_Guildelines": {
+            "type": "string"
+        },
+        "ONB_Style": {
+            "type": "string"
+        },
+        "Onb_Identity": {
+            "type": "string"
+        },
+        "Onb_Task": {
+            "type": "string"
+        },
+        "Dbr_Identity": {
+            "type": "string"
+        },
+        "Dbr_Task": {
+            "type": "string"
+        },
+        "Onb_Steps": {
+            "type": "string"
+        },
+        "Onb_Notes": {
+            "type": "string"
+        },
+        "DBR_Steps": {
+            "type": "string"
+        },
+        "DBR_Notes": {
+            "type": "string"
+        },
+        "Appointments_Identity": {
+            "type": "string"
+        },
+        "Confirmation_Task": {
+            "type": "string"
+        },
+        "Confirmation_Steps": {
+            "type": "string"
+        },
+        "Reminders_Task": {
+            "type": "string"
+        },
+        "Reminders 1 Steps": {
+            "type": "string"
+        },
+        "Reminders 2 Steps": {
+            "type": "string"
+        },
+        "No Show identity": {
+            "type": "string"
+        },
+        "No Show Task": {
+            "type": "string"
+        },
+        "No Show Steps": {
+            "type": "string"
+        },
+        "Cold Call Identity": {
+            "type": "string"
+        },
+        "Cold Call Task": {
+            "type": "string"
+        },
+        "Cold Calling Steps": {
+            "type": "string"
+        },
+        "Cold Calling Notes": {
+            "type": "string"
+        },
+        "Cold Calling Response Guidelines": {
+            "type": "string"
+        },
+        "Inbound Identity": {
+            "type": "string"
+        },
+        "Inbound Task": {
+            "type": "string"
+        },
+        "Inbound Steps": {
+            "type": "string"
+        },
+        "Inbound Response Guidlines": {
+            "type": "string"
+        },
+        "Inbound Notes": {
+            "type": "string"
+        },
+        "ONB_Specifics": {
+            "type": "string"
+        },
+        "Context": {
+            "type": "string"
+        },
+        "Onb_Example": {
+            "type": "string"
+        },
+        "Call Later Task": {
+            "type": "string"
+        },
+        "Call Later Steps": {
+            "type": "string"
+        },
+        "Call Later Examples": {
+            "type": "string"
+        },
+        "Call Later DBR Steps": {
+            "type": "string"
+        },
+        "DBR_Example": {
+            "type": "string"
+        },
+        "Appointments Example": {
+            "type": "string"
+        },
+        "Appointments_Notes": {
+            "type": "string"
+        },
+        "Inbound Specifics New": {
+            "type": "string"
+        },
+        "Inbound Specifics Past": {
+            "type": "string"
+        },
+        "Inbound Examples": {
+            "type": "string"
+        },
+        "Inbound Context": {
+            "type": "string"
+        },
+        "Voice ID": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/pushButton.json b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/pushButton.json
new file mode 100644
index 0000000000..bf62e04793
--- /dev/null
+++ b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/table/pushButton.json
@@ -0,0 +1,19 @@
+{
+	"type": "object",
+	"properties": {
+		"rowId": {
+			"type": "string"
+		},
+		"columnId": {
+			"type": "string"
+		},
+		"requestId": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"rowId",
+		"columnId",
+		"requestId"
+	]
+}
diff --git a/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/view/getAllViewRows.json b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/view/getAllViewRows.json
new file mode 100644
index 0000000000..55f97b0a36
--- /dev/null
+++ b/packages/nodes-base/nodes/Coda/__schema__/v1.1.0/view/getAllViewRows.json
@@ -0,0 +1,65 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "Contract ID": {
+            "type": "string"
+        },
+        "Contract Link": {
+            "type": "string"
+        },
+        "Summary": {
+            "type": "string"
+        },
+        "over4MB?": {
+            "type": "boolean"
+        },
+        "fileSize": {
+            "type": "string"
+        },
+        "Summarize": {
+            "type": "string"
+        },
+        "contractTextOutput": {
+            "type": "string"
+        },
+        "extractText": {
+            "type": "string"
+        },
+        "lastUpdated": {
+            "type": "string"
+        },
+        "Status Date": {
+            "type": "string"
+        },
+        "Contract Signature Date": {
+            "type": "string"
+        },
+        "Processing Organization": {
+            "type": "string"
+        },
+        "Contract Notes": {
+            "type": "string"
+        },
+        "Full Deletion Required?": {
+            "type": "boolean"
+        },
+        "IT Addendum?": {
+            "type": "boolean"
+        },
+        "Do not use name/logo?": {
+            "type": "boolean"
+        },
+        "Created on": {
+            "type": "string"
+        },
+        "rowID": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Code/JsCodeValidator.ts b/packages/nodes-base/nodes/Code/JsCodeValidator.ts
index f56de67d85..422ef1d537 100644
--- a/packages/nodes-base/nodes/Code/JsCodeValidator.ts
+++ b/packages/nodes-base/nodes/Code/JsCodeValidator.ts
@@ -13,7 +13,13 @@ export function validateNoDisallowedMethodsInRunForEach(code: string, itemIndex:
 
 		const lineNumber =
 			code.split('\n').findIndex((line) => {
-				return line.includes(disallowedMethod) && !line.startsWith('//') && !line.startsWith('*');
+				line = line.trimStart();
+				return (
+					line.includes(disallowedMethod) &&
+					!line.startsWith('//') &&
+					!line.startsWith('/*') &&
+					!line.startsWith('*')
+				);
 			}) + 1;
 
 		const disallowedMethodFound = lineNumber !== 0;
diff --git a/packages/nodes-base/nodes/Code/test/JsCodeValidator.test.ts b/packages/nodes-base/nodes/Code/test/JsCodeValidator.test.ts
new file mode 100644
index 0000000000..f319fd9b9d
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/test/JsCodeValidator.test.ts
@@ -0,0 +1,51 @@
+import { validateNoDisallowedMethodsInRunForEach } from '../JsCodeValidator';
+
+describe('JsCodeValidator', () => {
+	describe('validateNoDisallowedMethodsInRunForEach', () => {
+		it('should not throw error if disallow method is used within single line comments', () => {
+			const code = [
+				"// Add a new field called 'myNewField' to the JSON of the item",
+				'$input.item.json.myNewField = 1;',
+				' // const xxx = $input.all()',
+				'return $input.item;',
+			].join('\n');
+
+			expect(() => validateNoDisallowedMethodsInRunForEach(code, 0)).not.toThrow();
+		});
+
+		it('should not throw error if disallow method is used in single multi line comments', () => {
+			const code = [
+				"// Add a new field called 'myNewField' to the JSON of the item",
+				'$input.item.json.myNewField = 1;',
+				'/** const xxx = $input.all()*/',
+				'return $input.item;',
+			].join('\n');
+
+			expect(() => validateNoDisallowedMethodsInRunForEach(code, 0)).not.toThrow();
+		});
+
+		it('should not throw error if disallow method is used within multi line comments', () => {
+			const code = [
+				"// Add a new field called 'myNewField' to the JSON of the item",
+				'$input.item.json.myNewField = 1;',
+				'/**',
+				'*const xxx = $input.all()',
+				'*/',
+				'return $input.item;',
+			].join('\n');
+
+			expect(() => validateNoDisallowedMethodsInRunForEach(code, 0)).not.toThrow();
+		});
+
+		it('should throw error if disallow method is used', () => {
+			const code = [
+				"// Add a new field called 'myNewField' to the JSON of the item",
+				'$input.item.json.myNewField = 1;',
+				'const xxx = $input.all()',
+				'return $input.item;',
+			].join('\n');
+
+			expect(() => validateNoDisallowedMethodsInRunForEach(code, 0)).toThrow();
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index eac35239d2..a0c7a3a7fb 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -26,6 +26,7 @@ export class CoinGecko implements INodeType {
 		defaults: {
 			name: 'CoinGecko',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/get.json b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/get.json
new file mode 100644
index 0000000000..aaa9016570
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/get.json
@@ -0,0 +1,180 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "symbol": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "web_slug": {
+            "type": "string"
+        },
+        "platforms": {
+            "type": "object",
+            "properties": {
+                "": {
+                    "type": "string"
+                }
+            }
+        },
+        "detail_platforms": {
+            "type": "object",
+            "properties": {
+                "": {
+                    "type": "object",
+                    "properties": {
+                        "decimal_place": {
+                            "type": "null"
+                        },
+                        "contract_address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "decimal_place",
+                        "contract_address"
+                    ]
+                }
+            }
+        },
+        "block_time_in_minutes": {
+            "type": "integer"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "preview_listing": {
+            "type": "boolean"
+        },
+        "additional_notices": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "description": {
+            "type": "object",
+            "properties": {
+                "en": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "en"
+            ]
+        },
+        "links": {
+            "type": "object",
+            "properties": {
+                "homepage": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "whitepaper": {
+                    "type": "string"
+                },
+                "official_forum_url": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "chat_url": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "twitter_screen_name": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "object",
+                    "properties": {
+                        "github": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "required": [
+                        "github",
+                        "bitbucket"
+                    ]
+                }
+            },
+            "required": [
+                "homepage",
+                "whitepaper",
+                "blockchain_site",
+                "official_forum_url",
+                "chat_url",
+                "announcement_url",
+                "twitter_screen_name",
+                "facebook_username",
+                "bitcointalk_thread_identifier",
+                "telegram_channel_identifier",
+                "subreddit_url",
+                "repos_url"
+            ]
+        },
+        "image": {
+            "type": "object",
+            "properties": {
+                "thumb": {
+                    "type": "string"
+                },
+                "small": {
+                    "type": "string"
+                },
+                "large": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "thumb",
+                "small",
+                "large"
+            ]
+        },
+        "watchlist_portfolio_users": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "symbol",
+        "name",
+        "web_slug",
+        "asset_platform_id",
+        "platforms",
+        "detail_platforms",
+        "block_time_in_minutes",
+        "hashing_algorithm",
+        "categories",
+        "preview_listing",
+        "public_notice",
+        "additional_notices",
+        "description",
+        "links",
+        "image",
+        "country_origin",
+        "genesis_date",
+        "sentiment_votes_up_percentage",
+        "sentiment_votes_down_percentage",
+        "watchlist_portfolio_users",
+        "market_cap_rank",
+        "status_updates",
+        "last_updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/getAll.json b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/getAll.json
new file mode 100644
index 0000000000..2b0957f8df
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/getAll.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "symbol": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "symbol",
+        "name"
+    ]
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/history.json b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/history.json
new file mode 100644
index 0000000000..780ec9bff5
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/history.json
@@ -0,0 +1,781 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "symbol": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "localization": {
+            "type": "object",
+            "properties": {
+                "en": {
+                    "type": "string"
+                },
+                "de": {
+                    "type": "string"
+                },
+                "es": {
+                    "type": "string"
+                },
+                "fr": {
+                    "type": "string"
+                },
+                "it": {
+                    "type": "string"
+                },
+                "pl": {
+                    "type": "string"
+                },
+                "ro": {
+                    "type": "string"
+                },
+                "hu": {
+                    "type": "string"
+                },
+                "nl": {
+                    "type": "string"
+                },
+                "pt": {
+                    "type": "string"
+                },
+                "sv": {
+                    "type": "string"
+                },
+                "vi": {
+                    "type": "string"
+                },
+                "tr": {
+                    "type": "string"
+                },
+                "ru": {
+                    "type": "string"
+                },
+                "ja": {
+                    "type": "string"
+                },
+                "zh": {
+                    "type": "string"
+                },
+                "zh-tw": {
+                    "type": "string"
+                },
+                "ko": {
+                    "type": "string"
+                },
+                "ar": {
+                    "type": "string"
+                },
+                "th": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "cs": {
+                    "type": "string"
+                },
+                "da": {
+                    "type": "string"
+                },
+                "el": {
+                    "type": "string"
+                },
+                "hi": {
+                    "type": "string"
+                },
+                "no": {
+                    "type": "string"
+                },
+                "sk": {
+                    "type": "string"
+                },
+                "uk": {
+                    "type": "string"
+                },
+                "he": {
+                    "type": "string"
+                },
+                "fi": {
+                    "type": "string"
+                },
+                "bg": {
+                    "type": "string"
+                },
+                "hr": {
+                    "type": "string"
+                },
+                "lt": {
+                    "type": "string"
+                },
+                "sl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "en",
+                "de",
+                "es",
+                "fr",
+                "it",
+                "pl",
+                "ro",
+                "hu",
+                "nl",
+                "pt",
+                "sv",
+                "vi",
+                "tr",
+                "ru",
+                "ja",
+                "zh",
+                "zh-tw",
+                "ko",
+                "ar",
+                "th",
+                "id",
+                "cs",
+                "da",
+                "el",
+                "hi",
+                "no",
+                "sk",
+                "uk",
+                "he",
+                "fi",
+                "bg",
+                "hr",
+                "lt",
+                "sl"
+            ]
+        },
+        "image": {
+            "type": "object",
+            "properties": {
+                "thumb": {
+                    "type": "string"
+                },
+                "small": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "thumb",
+                "small"
+            ]
+        },
+        "market_data": {
+            "type": "object",
+            "properties": {
+                "current_price": {
+                    "type": "object",
+                    "properties": {
+                        "aed": {
+                            "type": "number"
+                        },
+                        "ars": {
+                            "type": "number"
+                        },
+                        "aud": {
+                            "type": "number"
+                        },
+                        "bch": {
+                            "type": "number"
+                        },
+                        "bdt": {
+                            "type": "number"
+                        },
+                        "bhd": {
+                            "type": "number"
+                        },
+                        "bmd": {
+                            "type": "number"
+                        },
+                        "bnb": {
+                            "type": "number"
+                        },
+                        "brl": {
+                            "type": "number"
+                        },
+                        "cad": {
+                            "type": "number"
+                        },
+                        "chf": {
+                            "type": "number"
+                        },
+                        "clp": {
+                            "type": "number"
+                        },
+                        "cny": {
+                            "type": "number"
+                        },
+                        "czk": {
+                            "type": "number"
+                        },
+                        "dkk": {
+                            "type": "number"
+                        },
+                        "dot": {
+                            "type": "number"
+                        },
+                        "eos": {
+                            "type": "number"
+                        },
+                        "eth": {
+                            "type": "number"
+                        },
+                        "eur": {
+                            "type": "number"
+                        },
+                        "gbp": {
+                            "type": "number"
+                        },
+                        "gel": {
+                            "type": "number"
+                        },
+                        "hkd": {
+                            "type": "number"
+                        },
+                        "huf": {
+                            "type": "number"
+                        },
+                        "idr": {
+                            "type": "number"
+                        },
+                        "ils": {
+                            "type": "number"
+                        },
+                        "inr": {
+                            "type": "number"
+                        },
+                        "jpy": {
+                            "type": "number"
+                        },
+                        "krw": {
+                            "type": "number"
+                        },
+                        "kwd": {
+                            "type": "number"
+                        },
+                        "lkr": {
+                            "type": "number"
+                        },
+                        "ltc": {
+                            "type": "number"
+                        },
+                        "mmk": {
+                            "type": "number"
+                        },
+                        "mxn": {
+                            "type": "number"
+                        },
+                        "myr": {
+                            "type": "number"
+                        },
+                        "ngn": {
+                            "type": "number"
+                        },
+                        "nok": {
+                            "type": "number"
+                        },
+                        "nzd": {
+                            "type": "number"
+                        },
+                        "php": {
+                            "type": "number"
+                        },
+                        "pkr": {
+                            "type": "number"
+                        },
+                        "pln": {
+                            "type": "number"
+                        },
+                        "rub": {
+                            "type": "number"
+                        },
+                        "sar": {
+                            "type": "number"
+                        },
+                        "sek": {
+                            "type": "number"
+                        },
+                        "sgd": {
+                            "type": "number"
+                        },
+                        "thb": {
+                            "type": "number"
+                        },
+                        "try": {
+                            "type": "number"
+                        },
+                        "twd": {
+                            "type": "number"
+                        },
+                        "uah": {
+                            "type": "number"
+                        },
+                        "usd": {
+                            "type": "number"
+                        },
+                        "vef": {
+                            "type": "number"
+                        },
+                        "vnd": {
+                            "type": "number"
+                        },
+                        "xag": {
+                            "type": "number"
+                        },
+                        "xau": {
+                            "type": "number"
+                        },
+                        "xdr": {
+                            "type": "number"
+                        },
+                        "xlm": {
+                            "type": "number"
+                        },
+                        "xrp": {
+                            "type": "number"
+                        },
+                        "yfi": {
+                            "type": "number"
+                        },
+                        "zar": {
+                            "type": "number"
+                        },
+                        "bits": {
+                            "type": "number"
+                        },
+                        "link": {
+                            "type": "number"
+                        },
+                        "sats": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "aed",
+                        "ars",
+                        "aud",
+                        "bch",
+                        "bdt",
+                        "bhd",
+                        "bmd",
+                        "bnb",
+                        "brl",
+                        "btc",
+                        "cad",
+                        "chf",
+                        "clp",
+                        "cny",
+                        "czk",
+                        "dkk",
+                        "dot",
+                        "eos",
+                        "eth",
+                        "eur",
+                        "gbp",
+                        "gel",
+                        "hkd",
+                        "huf",
+                        "idr",
+                        "ils",
+                        "inr",
+                        "jpy",
+                        "krw",
+                        "kwd",
+                        "lkr",
+                        "ltc",
+                        "mmk",
+                        "mxn",
+                        "myr",
+                        "ngn",
+                        "nok",
+                        "nzd",
+                        "php",
+                        "pkr",
+                        "pln",
+                        "rub",
+                        "sar",
+                        "sek",
+                        "sgd",
+                        "thb",
+                        "try",
+                        "twd",
+                        "uah",
+                        "usd",
+                        "vef",
+                        "vnd",
+                        "xag",
+                        "xau",
+                        "xdr",
+                        "xlm",
+                        "xrp",
+                        "yfi",
+                        "zar",
+                        "bits",
+                        "link",
+                        "sats"
+                    ]
+                },
+                "total_volume": {
+                    "type": "object",
+                    "properties": {
+                        "aed": {
+                            "type": "number"
+                        },
+                        "aud": {
+                            "type": "number"
+                        },
+                        "bch": {
+                            "type": "number"
+                        },
+                        "bdt": {
+                            "type": "number"
+                        },
+                        "bhd": {
+                            "type": "number"
+                        },
+                        "bmd": {
+                            "type": "number"
+                        },
+                        "bnb": {
+                            "type": "number"
+                        },
+                        "brl": {
+                            "type": "number"
+                        },
+                        "btc": {
+                            "type": "number"
+                        },
+                        "cad": {
+                            "type": "number"
+                        },
+                        "chf": {
+                            "type": "number"
+                        },
+                        "clp": {
+                            "type": "number"
+                        },
+                        "cny": {
+                            "type": "number"
+                        },
+                        "czk": {
+                            "type": "number"
+                        },
+                        "dkk": {
+                            "type": "number"
+                        },
+                        "dot": {
+                            "type": "number"
+                        },
+                        "eos": {
+                            "type": "number"
+                        },
+                        "eth": {
+                            "type": "number"
+                        },
+                        "eur": {
+                            "type": "number"
+                        },
+                        "gbp": {
+                            "type": "number"
+                        },
+                        "gel": {
+                            "type": "number"
+                        },
+                        "hkd": {
+                            "type": "number"
+                        },
+                        "huf": {
+                            "type": "number"
+                        },
+                        "ils": {
+                            "type": "number"
+                        },
+                        "inr": {
+                            "type": "number"
+                        },
+                        "jpy": {
+                            "type": "number"
+                        },
+                        "krw": {
+                            "type": "number"
+                        },
+                        "kwd": {
+                            "type": "number"
+                        },
+                        "lkr": {
+                            "type": "number"
+                        },
+                        "ltc": {
+                            "type": "number"
+                        },
+                        "mmk": {
+                            "type": "number"
+                        },
+                        "mxn": {
+                            "type": "number"
+                        },
+                        "myr": {
+                            "type": "number"
+                        },
+                        "ngn": {
+                            "type": "number"
+                        },
+                        "nok": {
+                            "type": "number"
+                        },
+                        "nzd": {
+                            "type": "number"
+                        },
+                        "php": {
+                            "type": "number"
+                        },
+                        "pkr": {
+                            "type": "number"
+                        },
+                        "pln": {
+                            "type": "number"
+                        },
+                        "rub": {
+                            "type": "number"
+                        },
+                        "sar": {
+                            "type": "number"
+                        },
+                        "sek": {
+                            "type": "number"
+                        },
+                        "sgd": {
+                            "type": "number"
+                        },
+                        "thb": {
+                            "type": "number"
+                        },
+                        "try": {
+                            "type": "number"
+                        },
+                        "twd": {
+                            "type": "number"
+                        },
+                        "uah": {
+                            "type": "number"
+                        },
+                        "usd": {
+                            "type": "number"
+                        },
+                        "vef": {
+                            "type": "number"
+                        },
+                        "xag": {
+                            "type": "number"
+                        },
+                        "xau": {
+                            "type": "number"
+                        },
+                        "xdr": {
+                            "type": "number"
+                        },
+                        "xlm": {
+                            "type": "number"
+                        },
+                        "xrp": {
+                            "type": "number"
+                        },
+                        "yfi": {
+                            "type": "number"
+                        },
+                        "zar": {
+                            "type": "number"
+                        },
+                        "bits": {
+                            "type": "number"
+                        },
+                        "link": {
+                            "type": "number"
+                        },
+                        "sats": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "aed",
+                        "ars",
+                        "aud",
+                        "bch",
+                        "bdt",
+                        "bhd",
+                        "bmd",
+                        "bnb",
+                        "brl",
+                        "btc",
+                        "cad",
+                        "chf",
+                        "clp",
+                        "cny",
+                        "czk",
+                        "dkk",
+                        "dot",
+                        "eos",
+                        "eth",
+                        "eur",
+                        "gbp",
+                        "gel",
+                        "hkd",
+                        "huf",
+                        "idr",
+                        "ils",
+                        "inr",
+                        "jpy",
+                        "krw",
+                        "kwd",
+                        "lkr",
+                        "ltc",
+                        "mmk",
+                        "mxn",
+                        "myr",
+                        "ngn",
+                        "nok",
+                        "nzd",
+                        "php",
+                        "pkr",
+                        "pln",
+                        "rub",
+                        "sar",
+                        "sek",
+                        "sgd",
+                        "thb",
+                        "try",
+                        "twd",
+                        "uah",
+                        "usd",
+                        "vef",
+                        "vnd",
+                        "xag",
+                        "xau",
+                        "xdr",
+                        "xlm",
+                        "xrp",
+                        "yfi",
+                        "zar",
+                        "bits",
+                        "link",
+                        "sats"
+                    ]
+                }
+            },
+            "required": [
+                "current_price",
+                "market_cap",
+                "total_volume"
+            ]
+        },
+        "community_data": {
+            "type": "object",
+            "properties": {
+                "facebook_likes": {
+                    "type": "null"
+                },
+                "reddit_average_posts_48h": {
+                    "type": "integer"
+                },
+                "reddit_average_comments_48h": {
+                    "type": "integer"
+                },
+                "reddit_subscribers": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "facebook_likes",
+                "twitter_followers",
+                "reddit_average_posts_48h",
+                "reddit_average_comments_48h",
+                "reddit_subscribers",
+                "reddit_accounts_active_48h"
+            ]
+        },
+        "developer_data": {
+            "type": "object",
+            "properties": {
+                "forks": {
+                    "type": "null"
+                },
+                "stars": {
+                    "type": "null"
+                },
+                "subscribers": {
+                    "type": "null"
+                },
+                "total_issues": {
+                    "type": "null"
+                },
+                "closed_issues": {
+                    "type": "null"
+                },
+                "pull_requests_merged": {
+                    "type": "null"
+                },
+                "pull_request_contributors": {
+                    "type": "null"
+                },
+                "code_additions_deletions_4_weeks": {
+                    "type": "object",
+                    "properties": {
+                        "additions": {
+                            "type": "null"
+                        },
+                        "deletions": {
+                            "type": "null"
+                        }
+                    },
+                    "required": [
+                        "additions",
+                        "deletions"
+                    ]
+                },
+                "commit_count_4_weeks": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "forks",
+                "stars",
+                "subscribers",
+                "total_issues",
+                "closed_issues",
+                "pull_requests_merged",
+                "pull_request_contributors",
+                "code_additions_deletions_4_weeks",
+                "commit_count_4_weeks"
+            ]
+        },
+        "public_interest_stats": {
+            "type": "object",
+            "properties": {
+                "alexa_rank": {
+                    "type": "null"
+                },
+                "bing_matches": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "alexa_rank",
+                "bing_matches"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "symbol",
+        "name",
+        "image"
+    ]
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/market.json b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/market.json
new file mode 100644
index 0000000000..17a9208590
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/market.json
@@ -0,0 +1,78 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "symbol": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "image": {
+            "type": "string"
+        },
+        "market_cap": {
+            "type": "integer"
+        },
+        "market_cap_rank": {
+            "type": "integer"
+        },
+        "fully_diluted_valuation": {
+            "type": "integer"
+        },
+        "total_volume": {
+            "type": "integer"
+        },
+        "market_cap_change_percentage_24h": {
+            "type": "number"
+        },
+        "ath_change_percentage": {
+            "type": "number"
+        },
+        "ath_date": {
+            "type": "string"
+        },
+        "atl": {
+            "type": "number"
+        },
+        "atl_change_percentage": {
+            "type": "number"
+        },
+        "atl_date": {
+            "type": "string"
+        },
+        "last_updated": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "symbol",
+        "name",
+        "image",
+        "current_price",
+        "market_cap",
+        "market_cap_rank",
+        "fully_diluted_valuation",
+        "total_volume",
+        "high_24h",
+        "low_24h",
+        "price_change_24h",
+        "price_change_percentage_24h",
+        "market_cap_change_24h",
+        "market_cap_change_percentage_24h",
+        "circulating_supply",
+        "total_supply",
+        "max_supply",
+        "ath",
+        "ath_change_percentage",
+        "ath_date",
+        "atl",
+        "atl_change_percentage",
+        "atl_date",
+        "roi",
+        "last_updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/marketChart.json b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/marketChart.json
new file mode 100644
index 0000000000..d2b8a5a3e0
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/marketChart.json
@@ -0,0 +1,20 @@
+{
+    "type": "object",
+    "properties": {
+        "time": {
+            "type": "string"
+        },
+        "price": {
+            "type": "number"
+        },
+        "totalVolume": {
+            "type": "number"
+        }
+    },
+    "required": [
+        "time",
+        "price",
+        "marketCaps",
+        "totalVolume"
+    ]
+}
diff --git a/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/price.json b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/price.json
new file mode 100644
index 0000000000..b7c6b20fcb
--- /dev/null
+++ b/packages/nodes-base/nodes/CoinGecko/__schema__/v1.0.0/coin/price.json
@@ -0,0 +1,16 @@
+{
+    "type": "object",
+    "properties": {
+        "nacho-the-kat": {
+            "type": "object",
+            "properties": {
+                "usd": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "usd"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.ts b/packages/nodes-base/nodes/Compression/Compression.node.ts
index 1ecf7edb4e..3de5f430f7 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression/Compression.node.ts
@@ -56,6 +56,7 @@ export class Compression implements INodeType {
 			name: 'Compression',
 			color: '#408000',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index a70e96021d..c3e22e13c1 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -27,6 +27,7 @@ export class Contentful implements INodeType {
 		defaults: {
 			name: 'Contentful',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Contentful/__schema__/v1.0.0/entry/getAll.json b/packages/nodes-base/nodes/Contentful/__schema__/v1.0.0/entry/getAll.json
new file mode 100644
index 0000000000..5139002e20
--- /dev/null
+++ b/packages/nodes-base/nodes/Contentful/__schema__/v1.0.0/entry/getAll.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "code": {
+            "type": "string"
+        },
+        "inventoryStatus": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 7f335f9791..7a3b3cb7e3 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -28,6 +28,7 @@ export class ConvertKit implements INodeType {
 		defaults: {
 			name: 'ConvertKit',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.ts b/packages/nodes-base/nodes/Copper/Copper.node.ts
index ecabe2aa4a..9e302d1cfb 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.ts
+++ b/packages/nodes-base/nodes/Copper/Copper.node.ts
@@ -46,6 +46,7 @@ export class Copper implements INodeType {
 		defaults: {
 			name: 'Copper',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index 1aba92bf30..470c4fa9ea 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -28,6 +28,7 @@ export class CrateDb implements INodeType {
 		defaults: {
 			name: 'CrateDB',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts b/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts
index 0456b5ca58..8c02c89da5 100644
--- a/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts
+++ b/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts
@@ -33,10 +33,6 @@ describe('Cron Node', () => {
 		},
 	});
 
-	afterAll(() => {
-		jest.resetAllMocks();
-	});
-
 	it('should return a function to trigger', async () => {
 		expect(await node.trigger.call(triggerFunctions)).toEqual({
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
index bcea2f2b7e..ac2241bc19 100644
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
@@ -16,6 +16,7 @@ export class CrowdDev implements INodeType {
 		defaults: {
 			name: 'crowd.dev',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.ts b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
index b0b2b21b12..7fd064f6d2 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -39,6 +39,7 @@ export class Crypto implements INodeType {
 			name: 'Crypto',
 			color: '#408000',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index 98b4658230..415ff8182a 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -25,6 +25,7 @@ export class CustomerIo implements INodeType {
 		defaults: {
 			name: 'Customer.io',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/CustomerIo/__schema__/v1.0.0/customer/upsert.json b/packages/nodes-base/nodes/CustomerIo/__schema__/v1.0.0/customer/upsert.json
new file mode 100644
index 0000000000..f349353d5f
--- /dev/null
+++ b/packages/nodes-base/nodes/CustomerIo/__schema__/v1.0.0/customer/upsert.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "email": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/CustomerIo/__schema__/v1.0.0/event/track.json b/packages/nodes-base/nodes/CustomerIo/__schema__/v1.0.0/event/track.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/CustomerIo/__schema__/v1.0.0/event/track.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
index fda31d9e24..c981bdcb07 100644
--- a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
@@ -61,7 +61,7 @@ const versionDescription: INodeTypeDescription = {
 	properties: [
 		{
 			displayName:
-				"More powerful date functionality is available in <a href='https://docs.n8n.io/code/expressions/luxon/' target='_blank'>expressions</a>,</br> e.g. <code>{{ $now.plus(1, 'week') }}</code>",
+				"More powerful date functionality is available in <a href='https://docs.n8n.io/code/cookbook/luxon/' target='_blank'>expressions</a>,</br> e.g. <code>{{ $now.plus(1, 'week') }}</code>",
 			name: 'noticeDateTime',
 			type: 'notice',
 			default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
index b3b4cb590f..cd606507b1 100644
--- a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
@@ -5,7 +5,7 @@ import { includeInputFields } from './common.descriptions';
 export const AddToDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{your_date.plus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{your_date.plus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
index 4d8f997bc8..8d5836d186 100644
--- a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
@@ -5,7 +5,7 @@ import { includeInputFields } from './common.descriptions';
 export const CurrentDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			'You can also refer to the current date in n8n expressions by using <code>{{$now}}</code> or <code>{{$today}}</code>. <a target="_blank" href="https://docs.n8n.io/code/expressions/luxon/">More info</a>',
+			'You can also refer to the current date in n8n expressions by using <code>{{$now}}</code> or <code>{{$today}}</code>. <a target="_blank" href="https://docs.n8n.io/code/cookbook/luxon/">More info</a>',
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
index 9f148a55db..0d62cf629a 100644
--- a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
@@ -29,6 +29,7 @@ export class DateTimeV2 implements INodeType {
 				name: 'Date & Time',
 				color: '#408000',
 			},
+			usableAsTool: true,
 			inputs: [NodeConnectionType.Main],
 			outputs: [NodeConnectionType.Main],
 			description: 'Manipulate date and time values',
diff --git a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
index 1c1ef6d9c8..b9f490e699 100644
--- a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
@@ -5,7 +5,7 @@ import { includeInputFields } from './common.descriptions';
 export const ExtractDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			'You can also do this using an expression, e.g. <code>{{ your_date.extract("month") }}}</code>. <a target="_blank" href="https://docs.n8n.io/code/expressions/luxon/">More info</a>',
+			'You can also do this using an expression, e.g. <code>{{ your_date.extract("month") }}}</code>. <a target="_blank" href="https://docs.n8n.io/code/cookbook/luxon/">More info</a>',
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
index 830551775c..76acf83cbf 100644
--- a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
@@ -5,7 +5,7 @@ import { includeInputFields } from './common.descriptions';
 export const FormatDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{your_date.format('yyyy-MM-dd')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{your_date.format('yyyy-MM-dd')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
index b6cacd2e18..d727d23751 100644
--- a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
@@ -5,7 +5,7 @@ import { includeInputFields } from './common.descriptions';
 export const RoundDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{ your_date.beginningOf('month') }}</code> or <code>{{ your_date.endOfMonth() }}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{ your_date.beginningOf('month') }}</code> or <code>{{ your_date.endOfMonth() }}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
index 43f223b452..3bfe1b93d7 100644
--- a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
@@ -5,7 +5,7 @@ import { includeInputFields } from './common.descriptions';
 export const SubtractFromDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{your_date.minus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{your_date.minus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DeepL/DeepL.node.ts b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
index f85f091ebe..db9584c34b 100644
--- a/packages/nodes-base/nodes/DeepL/DeepL.node.ts
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
@@ -24,6 +24,7 @@ export class DeepL implements INodeType {
 		defaults: {
 			name: 'DeepL',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/DeepL/__schema__/v1.0.0/language/translate.json b/packages/nodes-base/nodes/DeepL/__schema__/v1.0.0/language/translate.json
new file mode 100644
index 0000000000..e333b01241
--- /dev/null
+++ b/packages/nodes-base/nodes/DeepL/__schema__/v1.0.0/language/translate.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "detected_source_language": {
+            "type": "string"
+        },
+        "text": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "detected_source_language",
+        "text"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Demio/Demio.node.ts b/packages/nodes-base/nodes/Demio/Demio.node.ts
index e93c32683c..743ff410db 100644
--- a/packages/nodes-base/nodes/Demio/Demio.node.ts
+++ b/packages/nodes-base/nodes/Demio/Demio.node.ts
@@ -25,6 +25,7 @@ export class Demio implements INodeType {
 		defaults: {
 			name: 'Demio',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Dhl/Dhl.node.ts b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
index 21a72642a5..c9175bebec 100644
--- a/packages/nodes-base/nodes/Dhl/Dhl.node.ts
+++ b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
@@ -25,6 +25,7 @@ export class Dhl implements INodeType {
 		defaults: {
 			name: 'DHL',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Dhl/__schema__/v1.0.0/shipment/get.json b/packages/nodes-base/nodes/Dhl/__schema__/v1.0.0/shipment/get.json
new file mode 100644
index 0000000000..52efc38b9c
--- /dev/null
+++ b/packages/nodes-base/nodes/Dhl/__schema__/v1.0.0/shipment/get.json
@@ -0,0 +1,208 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "service": {
+            "type": "string"
+        },
+        "origin": {
+            "type": "object",
+            "properties": {
+                "address": {
+                    "type": "object",
+                    "properties": {
+                        "countryCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "countryCode"
+                    ]
+                }
+            },
+            "required": [
+                "address"
+            ]
+        },
+        "destination": {
+            "type": "object",
+            "properties": {
+                "address": {
+                    "type": "object",
+                    "properties": {
+                        "countryCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "countryCode"
+                    ]
+                }
+            },
+            "required": [
+                "address"
+            ]
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "timestamp": {
+                    "type": "string"
+                },
+                "statusCode": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "statusDetailed": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "remark": {
+                    "type": "string"
+                },
+                "location": {
+                    "type": "object",
+                    "properties": {
+                        "address": {
+                            "type": "object",
+                            "properties": {
+                                "addressLocality": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "addressLocality"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "timestamp",
+                "statusCode",
+                "status",
+                "description"
+            ]
+        },
+        "serviceUrl": {
+            "type": "string"
+        },
+        "returnFlag": {
+            "type": "boolean"
+        },
+        "details": {
+            "type": "object",
+            "properties": {
+                "product": {
+                    "type": "object",
+                    "properties": {
+                        "productName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "productName"
+                    ]
+                },
+                "proofOfDeliverySignedAvailable": {
+                    "type": "boolean"
+                },
+                "totalNumberOfPieces": {
+                    "type": "integer"
+                },
+                "pieceIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "weight": {
+                    "type": "object",
+                    "properties": {
+                        "unitText": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                }
+            },
+            "required": [
+                "product",
+                "proofOfDeliverySignedAvailable",
+                "totalNumberOfPieces",
+                "weight"
+            ]
+        },
+        "events": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "timestamp": {
+                        "type": "string"
+                    },
+                    "statusCode": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "statusDetailed": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "remark": {
+                        "type": "string"
+                    },
+                    "location": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "object",
+                                "properties": {
+                                    "addressLocality": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "addressLocality"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "timestamp",
+                    "statusCode",
+                    "status",
+                    "description"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "service",
+        "origin",
+        "destination",
+        "status",
+        "details",
+        "events"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.json b/packages/nodes-base/nodes/Discord/Discord.node.json
index 08ee4ac000..aee457f714 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.json
+++ b/packages/nodes-base/nodes/Discord/Discord.node.json
@@ -2,7 +2,10 @@
 	"node": "n8n-nodes-base.discord",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,5 +17,6 @@
 				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.discord/"
 			}
 		]
-	}
+	},
+	"alias": ["human", "form", "wait", "hitl", "approval"]
 }
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/create.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/create.json
new file mode 100644
index 0000000000..adadfdda1b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/create.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "last_message_id": {
+            "type": "null"
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "guild_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "rate_limit_per_user": {
+            "type": "integer"
+        },
+        "position": {
+            "type": "integer"
+        },
+        "nsfw": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/get.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/get.json
new file mode 100644
index 0000000000..a0bd76293b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/get.json
@@ -0,0 +1,55 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "guild_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "rate_limit_per_user": {
+            "type": "integer"
+        },
+        "position": {
+            "type": "integer"
+        },
+        "permission_overwrites": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "integer"
+                    },
+                    "allow": {
+                        "type": "string"
+                    },
+                    "deny": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "type",
+                    "allow",
+                    "deny"
+                ]
+            }
+        },
+        "nsfw": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/getAll.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/getAll.json
new file mode 100644
index 0000000000..b3fb5df33c
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/channel/getAll.json
@@ -0,0 +1,83 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "guild_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "position": {
+            "type": "integer"
+        },
+        "permission_overwrites": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "integer"
+                    },
+                    "allow": {
+                        "type": "string"
+                    },
+                    "deny": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "type",
+                    "allow",
+                    "deny"
+                ]
+            }
+        },
+        "rate_limit_per_user": {
+            "type": "integer"
+        },
+        "nsfw": {
+            "type": "boolean"
+        },
+        "icon_emoji": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "null"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "theme_color": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "type",
+        "flags",
+        "guild_id",
+        "name",
+        "parent_id",
+        "position",
+        "permission_overwrites"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/member/getAll.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/member/getAll.json
new file mode 100644
index 0000000000..2888f96611
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/member/getAll.json
@@ -0,0 +1,79 @@
+{
+    "type": "object",
+    "properties": {
+        "communication_disabled_until": {
+            "type": "null"
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "joined_at": {
+            "type": "string"
+        },
+        "pending": {
+            "type": "boolean"
+        },
+        "roles": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "discriminator": {
+                    "type": "string"
+                },
+                "public_flags": {
+                    "type": "integer"
+                },
+                "flags": {
+                    "type": "integer"
+                },
+                "banner": {
+                    "type": "null"
+                },
+                "accent_color": {
+                    "type": "null"
+                },
+                "banner_color": {
+                    "type": "null"
+                },
+                "clan": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "avatar",
+                "discriminator",
+                "public_flags",
+                "flags",
+                "banner",
+                "accent_color",
+                "global_name",
+                "avatar_decoration_data",
+                "banner_color",
+                "clan"
+            ]
+        },
+        "mute": {
+            "type": "boolean"
+        },
+        "deaf": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "roles",
+        "user"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/member/roleAdd.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/member/roleAdd.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/member/roleAdd.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/deleteMessage.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/deleteMessage.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/deleteMessage.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/get.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/get.json
new file mode 100644
index 0000000000..8bb2c3d4ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/get.json
@@ -0,0 +1,212 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "channel_id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "discriminator": {
+                    "type": "string"
+                },
+                "public_flags": {
+                    "type": "integer"
+                },
+                "flags": {
+                    "type": "integer"
+                },
+                "banner": {
+                    "type": "null"
+                },
+                "accent_color": {
+                    "type": "null"
+                },
+                "banner_color": {
+                    "type": "null"
+                },
+                "clan": {
+                    "type": "null"
+                },
+                "primary_guild": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "avatar",
+                "discriminator",
+                "public_flags",
+                "flags",
+                "global_name",
+                "clan"
+            ]
+        },
+        "content": {
+            "type": "string"
+        },
+        "timestamp": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "mentions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "discriminator": {
+                        "type": "string"
+                    },
+                    "public_flags": {
+                        "type": "integer"
+                    },
+                    "flags": {
+                        "type": "integer"
+                    },
+                    "bot": {
+                        "type": "boolean"
+                    },
+                    "banner": {
+                        "type": "null"
+                    },
+                    "accent_color": {
+                        "type": "null"
+                    },
+                    "banner_color": {
+                        "type": "null"
+                    },
+                    "clan": {
+                        "type": "null"
+                    },
+                    "primary_guild": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "avatar",
+                    "discriminator",
+                    "public_flags",
+                    "flags",
+                    "banner",
+                    "accent_color",
+                    "global_name",
+                    "avatar_decoration_data",
+                    "banner_color",
+                    "clan"
+                ]
+            }
+        },
+        "mention_roles": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "filename": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "proxy_url": {
+                        "type": "string"
+                    },
+                    "content_type": {
+                        "type": "string"
+                    },
+                    "width": {
+                        "type": "integer"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "placeholder": {
+                        "type": "string"
+                    },
+                    "placeholder_version": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "filename",
+                    "size",
+                    "url",
+                    "proxy_url"
+                ]
+            }
+        },
+        "embeds": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "integer"
+                    },
+                    "timestamp": {
+                        "type": "string"
+                    },
+                    "content_scan_version": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "type"
+                ]
+            }
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "mention_everyone": {
+            "type": "boolean"
+        },
+        "tts": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/getAll.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/getAll.json
new file mode 100644
index 0000000000..8f6ecf49b1
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/getAll.json
@@ -0,0 +1,242 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "mentions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "discriminator": {
+                        "type": "string"
+                    },
+                    "public_flags": {
+                        "type": "integer"
+                    },
+                    "flags": {
+                        "type": "integer"
+                    },
+                    "bot": {
+                        "type": "boolean"
+                    },
+                    "banner": {
+                        "type": "null"
+                    },
+                    "accent_color": {
+                        "type": "null"
+                    },
+                    "avatar_decoration_data": {
+                        "type": "null"
+                    },
+                    "banner_color": {
+                        "type": "null"
+                    },
+                    "clan": {
+                        "type": "null"
+                    },
+                    "primary_guild": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "avatar",
+                    "discriminator",
+                    "public_flags",
+                    "flags",
+                    "banner",
+                    "accent_color",
+                    "global_name",
+                    "avatar_decoration_data",
+                    "banner_color",
+                    "clan",
+                    "primary_guild"
+                ]
+            }
+        },
+        "mention_roles": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "filename": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "proxy_url": {
+                        "type": "string"
+                    },
+                    "content_type": {
+                        "type": "string"
+                    },
+                    "content_scan_version": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "filename",
+                    "size",
+                    "url",
+                    "proxy_url",
+                    "content_type",
+                    "content_scan_version"
+                ]
+            }
+        },
+        "embeds": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "author": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ]
+                    },
+                    "image": {
+                        "type": "object",
+                        "properties": {
+                            "url": {
+                                "type": "string"
+                            },
+                            "proxy_url": {
+                                "type": "string"
+                            },
+                            "width": {
+                                "type": "integer"
+                            },
+                            "height": {
+                                "type": "integer"
+                            },
+                            "flags": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "url",
+                            "proxy_url",
+                            "width",
+                            "height",
+                            "flags"
+                        ]
+                    },
+                    "timestamp": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "type"
+                ]
+            }
+        },
+        "timestamp": {
+            "type": "string"
+        },
+        "edited_timestamp": {
+            "type": "null"
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "id": {
+            "type": "string"
+        },
+        "channel_id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "discriminator": {
+                    "type": "string"
+                },
+                "public_flags": {
+                    "type": "integer"
+                },
+                "flags": {
+                    "type": "integer"
+                },
+                "banner": {
+                    "type": "null"
+                },
+                "accent_color": {
+                    "type": "null"
+                },
+                "banner_color": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "avatar",
+                "discriminator",
+                "public_flags",
+                "flags",
+                "global_name",
+                "clan",
+                "primary_guild"
+            ]
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "mention_everyone": {
+            "type": "boolean"
+        },
+        "tts": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/react.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/react.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/react.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/send.json b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/send.json
new file mode 100644
index 0000000000..ae7295c2d2
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/__schema__/v2.0.0/message/send.json
@@ -0,0 +1,250 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "mentions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "discriminator": {
+                        "type": "string"
+                    },
+                    "public_flags": {
+                        "type": "integer"
+                    },
+                    "flags": {
+                        "type": "integer"
+                    },
+                    "banner": {
+                        "type": "null"
+                    },
+                    "avatar_decoration_data": {
+                        "type": "null"
+                    },
+                    "clan": {
+                        "type": "null"
+                    },
+                    "primary_guild": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "avatar",
+                    "discriminator",
+                    "public_flags",
+                    "flags",
+                    "banner",
+                    "accent_color",
+                    "global_name",
+                    "avatar_decoration_data",
+                    "banner_color",
+                    "clan",
+                    "primary_guild"
+                ]
+            }
+        },
+        "mention_roles": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "filename": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "proxy_url": {
+                        "type": "string"
+                    },
+                    "content_type": {
+                        "type": "string"
+                    },
+                    "content_scan_version": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "filename",
+                    "size",
+                    "url",
+                    "proxy_url",
+                    "content_type",
+                    "title"
+                ]
+            }
+        },
+        "embeds": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "string"
+                    },
+                    "author": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ]
+                    },
+                    "image": {
+                        "type": "object",
+                        "properties": {
+                            "url": {
+                                "type": "string"
+                            },
+                            "proxy_url": {
+                                "type": "string"
+                            },
+                            "width": {
+                                "type": "integer"
+                            },
+                            "height": {
+                                "type": "integer"
+                            },
+                            "flags": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "url",
+                            "proxy_url",
+                            "width",
+                            "height",
+                            "flags"
+                        ]
+                    }
+                },
+                "required": [
+                    "type"
+                ]
+            }
+        },
+        "timestamp": {
+            "type": "string"
+        },
+        "edited_timestamp": {
+            "type": "null"
+        },
+        "flags": {
+            "type": "integer"
+        },
+        "id": {
+            "type": "string"
+        },
+        "channel_id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "discriminator": {
+                    "type": "string"
+                },
+                "public_flags": {
+                    "type": "integer"
+                },
+                "flags": {
+                    "type": "integer"
+                },
+                "bot": {
+                    "type": "boolean"
+                },
+                "accent_color": {
+                    "type": "null"
+                },
+                "global_name": {
+                    "type": "null"
+                },
+                "avatar_decoration_data": {
+                    "type": "null"
+                },
+                "banner_color": {
+                    "type": "null"
+                },
+                "clan": {
+                    "type": "null"
+                },
+                "primary_guild": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "avatar",
+                "discriminator",
+                "public_flags",
+                "flags",
+                "bot",
+                "banner",
+                "accent_color",
+                "global_name",
+                "avatar_decoration_data",
+                "banner_color",
+                "clan",
+                "primary_guild"
+            ]
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "mention_everyone": {
+            "type": "boolean"
+        },
+        "tts": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
index 5f7e38ed1d..39fbf2f528 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -31,16 +30,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, channel => create', () => {
 	const workflows = ['nodes/Discord/test/v2/node/channel/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
index 01f523d4c3..9655bd13ab 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -31,16 +30,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, channel => deleteChannel', () => {
 	const workflows = ['nodes/Discord/test/v2/node/channel/deleteChannel.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
index ceb952395c..d59488deda 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes, IRequestOptions } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -46,16 +45,6 @@ requestApiSpy.mockImplementation(
 describe('Test DiscordV2, channel => get', () => {
 	const workflows = ['nodes/Discord/test/v2/node/channel/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
index 1616cde2b0..8cfb777b56 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -107,16 +106,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, channel => getAll', () => {
 	const workflows = ['nodes/Discord/test/v2/node/channel/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
index e6139f59df..4c01a1bb99 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -31,16 +30,6 @@ discordApiRequestSpy.mockImplementation(async (method: string, _) => {
 describe('Test DiscordV2, channel => update', () => {
 	const workflows = ['nodes/Discord/test/v2/node/channel/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
index 7de96bc6ee..9b92bc3d5a 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -54,16 +53,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, member => getAll', () => {
 	const workflows = ['nodes/Discord/test/v2/node/member/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
index febf091233..2b06ebed3e 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, member => roleAdd', () => {
 	const workflows = ['nodes/Discord/test/v2/node/member/roleAdd.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
index 159c3e71f0..d338a064b3 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, member => roleRemove', () => {
 	const workflows = ['nodes/Discord/test/v2/node/member/roleRemove.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
index 6ee8d16e41..746738fbd0 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, message => deleteMessage', () => {
 	const workflows = ['nodes/Discord/test/v2/node/message/deleteMessage.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
index 78ec0f22b1..67122f1aa1 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -39,16 +38,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, message => get', () => {
 	const workflows = ['nodes/Discord/test/v2/node/message/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
index 5bb7d7ba2f..c679a296c7 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -62,16 +61,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, message => getAll', () => {
 	const workflows = ['nodes/Discord/test/v2/node/message/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
index 13c4924f4e..56ec34e42b 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -20,16 +19,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, message => react', () => {
 	const workflows = ['nodes/Discord/test/v2/node/message/react.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
index 95c2ca54cc..484be92f3b 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -61,16 +60,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, message => send', () => {
 	const workflows = ['nodes/Discord/test/v2/node/message/send.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/sendAndWait.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/sendAndWait.test.ts
new file mode 100644
index 0000000000..1a2ef8d857
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/sendAndWait.test.ts
@@ -0,0 +1,93 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { SEND_AND_WAIT_OPERATION, type IExecuteFunctions } from 'n8n-workflow';
+
+import { versionDescription } from '../../../../v2/actions/versionDescription';
+import { DiscordV2 } from '../../../../v2/DiscordV2.node';
+import * as transport from '../../../../v2/transport/discord.api';
+
+jest.mock('../../../../v2/transport/discord.api', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport/discord.api');
+	return {
+		...originalModule,
+		discordApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('Test DiscordV2, message => sendAndWait', () => {
+	let discord: DiscordV2;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		discord = new DiscordV2(versionDescription);
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+		mockExecuteFunctions.helpers = {
+			constructExecutionMetaData: jest.fn(() => []),
+			returnJsonArray: jest.fn(() => []),
+		} as any;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
+			if (key === 'operation') return SEND_AND_WAIT_OPERATION;
+			if (key === 'resource') return 'message';
+			if (key === 'authentication') return 'botToken';
+			if (key === 'message') return 'my message';
+			if (key === 'subject') return '';
+			if (key === 'approvalOptions.values') return {};
+			if (key === 'responseType') return 'approval';
+			if (key === 'sendTo') return 'channel';
+			if (key === 'channelId') return 'channelID';
+			if (key === 'options.limitWaitTime.values') return {};
+		});
+
+		mockExecuteFunctions.putExecutionToWait.mockImplementation();
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+
+		const result = await discord.execute.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+		expect(transport.discordApiRequest).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(transport.discordApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/channels/channelID/messages',
+			{
+				components: [
+					{
+						components: [
+							{
+								label: 'Approve',
+								style: 5,
+								type: 2,
+								url: 'http://localhost/waiting-webhook/nodeID?approved=true',
+							},
+						],
+						type: 1,
+					},
+				],
+				embeds: [
+					{
+						color: 5814783,
+						description:
+							'my message\n\n_This message was sent automatically with _[n8n](https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.discord_instanceId)',
+					},
+				],
+			},
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
index fa5487400e..44a7113259 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -55,16 +54,6 @@ discordApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test DiscordV2, webhook => sendLegacy', () => {
 	const workflows = ['nodes/Discord/test/v2/node/webhook/sendLegacy.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
index ff79027568..bca9f9198f 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
@@ -125,10 +125,6 @@ describe('Test Discord > setupChannelGetter & checkAccessToChannel', () => {
 		}
 	});
 
-	afterAll(() => {
-		jest.restoreAllMocks();
-	});
-
 	it('should setup channel getter and get channel id', async () => {
 		const fakeExecuteFunction = (auth: string) => {
 			return {
diff --git a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
index 20b4cec13f..60bf9c499e 100644
--- a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
+++ b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
@@ -9,6 +9,7 @@ import type {
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { listSearch, loadOptions } from './methods';
+import { sendAndWaitWebhook } from '../../../utils/sendAndWait/utils';
 
 export class DiscordV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -17,6 +18,7 @@ export class DiscordV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
@@ -25,6 +27,8 @@ export class DiscordV2 implements INodeType {
 		loadOptions,
 	};
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		return await router.call(this);
 	}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
index 7acccea904..d052e993e3 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
@@ -463,3 +463,40 @@ export const filesFixedCollection: INodeProperties = {
 		},
 	],
 };
+
+export const sendToProperties: INodeProperties[] = [
+	{
+		displayName: 'Send To',
+		name: 'sendTo',
+		type: 'options',
+		options: [
+			{
+				name: 'User',
+				value: 'user',
+			},
+			{
+				name: 'Channel',
+				value: 'channel',
+			},
+		],
+		default: 'channel',
+		description: 'Send message to a channel or DM to a user',
+	},
+
+	{
+		...userRLC,
+		displayOptions: {
+			show: {
+				sendTo: ['user'],
+			},
+		},
+	},
+	{
+		...textChannelRLC,
+		displayOptions: {
+			show: {
+				sendTo: ['channel'],
+			},
+		},
+	},
+];
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
index c040cb94e7..6d2eaa5c9b 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
@@ -1,13 +1,14 @@
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 
 import * as deleteMessage from './deleteMessage.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
 import * as react from './react.operation';
 import * as send from './send.operation';
+import * as sendAndWait from './sendAndWait.operation';
 import { guildRLC } from '../common.description';
 
-export { getAll, react, send, deleteMessage, get };
+export { getAll, react, send, deleteMessage, get, sendAndWait };
 
 export const description: INodeProperties[] = [
 	{
@@ -52,6 +53,12 @@ export const description: INodeProperties[] = [
 				description: 'Send a message to a channel, thread, or member',
 				action: 'Send a message',
 			},
+			{
+				name: 'Send and Wait for Response',
+				value: SEND_AND_WAIT_OPERATION,
+				description: 'Send a message and wait for response',
+				action: 'Send message and wait for response',
+			},
 		],
 		default: 'send',
 	},
@@ -69,4 +76,5 @@ export const description: INodeProperties[] = [
 	...send.description,
 	...deleteMessage.description,
 	...get.description,
+	...sendAndWait.description,
 ];
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
index bcd49d7a8f..3c72cb9330 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
@@ -4,60 +4,23 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
-	checkAccessToChannel,
 	parseDiscordError,
 	prepareEmbeds,
 	prepareErrorData,
-	prepareMultiPartForm,
 	prepareOptions,
+	sendDiscordMessage,
 } from '../../helpers/utils';
-import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
 import {
 	embedsFixedCollection,
 	filesFixedCollection,
-	textChannelRLC,
-	userRLC,
+	sendToProperties,
 } from '../common.description';
 
 const properties: INodeProperties[] = [
-	{
-		displayName: 'Send To',
-		name: 'sendTo',
-		type: 'options',
-		options: [
-			{
-				name: 'User',
-				value: 'user',
-			},
-			{
-				name: 'Channel',
-				value: 'channel',
-			},
-		],
-		default: 'channel',
-		description: 'Send message to a channel or DM to a user',
-	},
-
-	{
-		...userRLC,
-		displayOptions: {
-			show: {
-				sendTo: ['user'],
-			},
-		},
-	},
-	{
-		...textChannelRLC,
-		displayOptions: {
-			show: {
-				sendTo: ['channel'],
-			},
-		},
-	},
+	...sendToProperties,
 	{
 		displayName: 'Message',
 		name: 'content',
@@ -157,90 +120,17 @@ export async function execute(
 		}
 
 		try {
-			const sendTo = this.getNodeParameter('sendTo', i) as string;
-
-			let channelId = '';
-
-			if (sendTo === 'user') {
-				const userId = this.getNodeParameter('userId', i, undefined, {
-					extractValue: true,
-				}) as string;
-
-				if (isOAuth2) {
-					try {
-						await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/members/${userId}`);
-					} catch (error) {
-						if (error instanceof NodeApiError && error.httpCode === '404') {
-							throw new NodeOperationError(
-								this.getNode(),
-								`User with the id ${userId} is not a member of the selected guild`,
-								{
-									itemIndex: i,
-								},
-							);
-						}
-
-						throw new NodeOperationError(this.getNode(), error, {
-							itemIndex: i,
-						});
-					}
-				}
-
-				channelId = (
-					(await discordApiRequest.call(this, 'POST', '/users/@me/channels', {
-						recipient_id: userId,
-					})) as IDataObject
-				).id as string;
-
-				if (!channelId) {
-					throw new NodeOperationError(
-						this.getNode(),
-						'Could not create a channel to send direct message to',
-						{ itemIndex: i },
-					);
-				}
-			}
-
-			if (sendTo === 'channel') {
-				channelId = this.getNodeParameter('channelId', i, undefined, {
-					extractValue: true,
-				}) as string;
-			}
-
-			if (isOAuth2 && sendTo !== 'user') {
-				await checkAccessToChannel.call(this, channelId, userGuilds, i);
-			}
-
-			if (!channelId) {
-				throw new NodeOperationError(this.getNode(), 'Channel ID is required', { itemIndex: i });
-			}
-
-			let response: IDataObject[] = [];
-
-			if (files?.length) {
-				const multiPartBody = await prepareMultiPartForm.call(this, items, files, body, i);
-
-				response = await discordApiMultiPartRequest.call(
-					this,
-					'POST',
-					`/channels/${channelId}/messages`,
-					multiPartBody,
-				);
-			} else {
-				response = await discordApiRequest.call(
-					this,
-					'POST',
-					`/channels/${channelId}/messages`,
+			returnData.push(
+				...(await sendDiscordMessage.call(this, {
+					guildId,
+					userGuilds,
+					isOAuth2,
 					body,
-				);
-			}
-
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(response),
-				{ itemData: { item: i } },
+					items,
+					files,
+					itemIndex: i,
+				})),
 			);
-
-			returnData.push(...executionData);
 		} catch (error) {
 			const err = parseDiscordError.call(this, error, i);
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/sendAndWait.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/sendAndWait.operation.ts
new file mode 100644
index 0000000000..0c6114e44f
--- /dev/null
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/sendAndWait.operation.ts
@@ -0,0 +1,56 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { getSendAndWaitProperties } from '../../../../../utils/sendAndWait/utils';
+import {
+	createSendAndWaitMessageBody,
+	parseDiscordError,
+	prepareErrorData,
+	sendDiscordMessage,
+} from '../../helpers/utils';
+import { sendToProperties } from '../common.description';
+
+export const description: INodeProperties[] = getSendAndWaitProperties(
+	sendToProperties,
+	'message',
+	undefined,
+	{
+		noButtonStyle: true,
+		defaultApproveLabel: '✓ Approve',
+		defaultDisapproveLabel: '✗ Decline',
+	},
+).filter((p) => p.name !== 'subject');
+
+export async function execute(
+	this: IExecuteFunctions,
+	guildId: string,
+	userGuilds: IDataObject[],
+): Promise<INodeExecutionData[]> {
+	const items = this.getInputData();
+
+	const isOAuth2 = this.getNodeParameter('authentication', 0) === 'oAuth2';
+
+	try {
+		await sendDiscordMessage.call(this, {
+			guildId,
+			userGuilds,
+			isOAuth2,
+			body: createSendAndWaitMessageBody(this),
+			items,
+		});
+	} catch (error) {
+		const err = parseDiscordError.call(this, error, 0);
+
+		if (this.continueOnFail()) {
+			return prepareErrorData.call(this, err, 0);
+		}
+
+		throw err;
+	}
+
+	return items;
+}
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts b/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts
index c415fe663d..0b05d7f693 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/node.type.ts
@@ -2,7 +2,7 @@ import type { AllEntities } from 'n8n-workflow';
 
 type NodeMap = {
 	channel: 'get' | 'getAll' | 'create' | 'update' | 'deleteChannel';
-	message: 'deleteMessage' | 'getAll' | 'get' | 'react' | 'send';
+	message: 'deleteMessage' | 'getAll' | 'get' | 'react' | 'send' | 'sendAndWait';
 	member: 'getAll' | 'roleAdd' | 'roleRemove';
 	webhook: 'sendLegacy';
 };
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/router.ts b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
index a43534e141..1e163be0e9 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
@@ -1,11 +1,12 @@
 import type { IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { NodeOperationError, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
 import * as channel from './channel';
 import * as member from './member';
 import * as message from './message';
 import type { Discord } from './node.type';
 import * as webhook from './webhook';
+import { configureWaitTillDate } from '../../../../utils/sendAndWait/utils';
 import { checkAccessToGuild } from '../helpers/utils';
 import { discordApiRequest } from '../transport';
 
@@ -46,6 +47,15 @@ export async function router(this: IExecuteFunctions) {
 		operation,
 	} as Discord;
 
+	if (discord.resource === 'message' && discord.operation === SEND_AND_WAIT_OPERATION) {
+		returnData = await message[discord.operation].execute.call(this, guildId, userGuilds);
+
+		const waitTill = configureWaitTillDate(this);
+
+		await this.putExecutionToWait(waitTill);
+		return [returnData];
+	}
+
 	switch (discord.resource) {
 		case 'channel':
 			returnData = await channel[discord.operation].execute.call(this, guildId, userGuilds);
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
index 8d79650890..8fae978756 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
@@ -5,6 +5,7 @@ import * as channel from './channel';
 import * as member from './member';
 import * as message from './message';
 import * as webhook from './webhook';
+import { sendAndWaitWebhooksDescription } from '../../../../utils/sendAndWait/descriptions';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Discord',
@@ -19,6 +20,7 @@ export const versionDescription: INodeTypeDescription = {
 	},
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
+	webhooks: sendAndWaitWebhooksDescription,
 	credentials: [
 		{
 			name: 'discordBotApi',
diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
index 7f1922adb4..f3f51cb778 100644
--- a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
@@ -8,10 +8,11 @@ import type {
 	INode,
 	INodeExecutionData,
 } from 'n8n-workflow';
-import { jsonParse, NodeOperationError } from 'n8n-workflow';
+import { jsonParse, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { capitalize } from '../../../../utils/utilities';
-import { discordApiRequest } from '../transport';
+import { getSendAndWaitConfig } from '../../../../utils/sendAndWait/utils';
+import { capitalize, createUtmCampaignLink } from '../../../../utils/utilities';
+import { discordApiMultiPartRequest, discordApiRequest } from '../transport';
 
 export const createSimplifyFunction =
 	(includedFields: string[]) =>
@@ -285,3 +286,139 @@ export async function setupChannelGetter(this: IExecuteFunctions, userGuilds: ID
 		return channelId;
 	};
 }
+
+export async function sendDiscordMessage(
+	this: IExecuteFunctions,
+	{
+		guildId,
+		userGuilds,
+		isOAuth2,
+		body,
+		items,
+		files = [],
+		itemIndex = 0,
+	}: {
+		guildId: string;
+		userGuilds: IDataObject[];
+		isOAuth2: boolean;
+		body: IDataObject;
+		items: INodeExecutionData[];
+		files?: IDataObject[];
+		itemIndex?: number;
+	},
+) {
+	const sendTo = this.getNodeParameter('sendTo', itemIndex) as string;
+
+	let channelId = '';
+
+	if (sendTo === 'user') {
+		const userId = this.getNodeParameter('userId', itemIndex, undefined, {
+			extractValue: true,
+		}) as string;
+
+		if (isOAuth2) {
+			try {
+				await discordApiRequest.call(this, 'GET', `/guilds/${guildId}/members/${userId}`);
+			} catch (error) {
+				if (error instanceof NodeApiError && error.httpCode === '404') {
+					throw new NodeOperationError(
+						this.getNode(),
+						`User with the id ${userId} is not a member of the selected guild`,
+						{
+							itemIndex,
+						},
+					);
+				}
+
+				throw new NodeOperationError(this.getNode(), error, {
+					itemIndex,
+				});
+			}
+		}
+
+		channelId = (
+			(await discordApiRequest.call(this, 'POST', '/users/@me/channels', {
+				recipient_id: userId,
+			})) as IDataObject
+		).id as string;
+
+		if (!channelId) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'Could not create a channel to send direct message to',
+				{ itemIndex },
+			);
+		}
+	}
+
+	if (sendTo === 'channel') {
+		channelId = this.getNodeParameter('channelId', itemIndex, undefined, {
+			extractValue: true,
+		}) as string;
+	}
+
+	if (isOAuth2 && sendTo !== 'user') {
+		await checkAccessToChannel.call(this, channelId, userGuilds, itemIndex);
+	}
+
+	if (!channelId) {
+		throw new NodeOperationError(this.getNode(), 'Channel ID is required', {
+			itemIndex,
+		});
+	}
+
+	let response: IDataObject[] = [];
+
+	if (files?.length) {
+		const multiPartBody = await prepareMultiPartForm.call(this, items, files, body, itemIndex);
+
+		response = await discordApiMultiPartRequest.call(
+			this,
+			'POST',
+			`/channels/${channelId}/messages`,
+			multiPartBody,
+		);
+	} else {
+		response = await discordApiRequest.call(this, 'POST', `/channels/${channelId}/messages`, body);
+	}
+
+	const executionData = this.helpers.constructExecutionMetaData(
+		this.helpers.returnJsonArray(response),
+		{ itemData: { item: itemIndex } },
+	);
+
+	return executionData;
+}
+
+export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
+	const config = getSendAndWaitConfig(context);
+
+	const instanceId = context.getInstanceId();
+	const attributionText = 'This message was sent automatically with ';
+	const link = createUtmCampaignLink('n8n-nodes-base.discord', instanceId);
+	const description = `${config.message}\n\n_${attributionText}_[n8n](${link})`;
+
+	const body = {
+		embeds: [
+			{
+				description,
+				color: 5814783,
+			},
+		],
+		components: [
+			{
+				type: 1,
+				components: config.options.map((option) => {
+					return {
+						type: 2,
+						style: 5,
+						label: option.label,
+						url: `${config.url}?approved=${option.value}`,
+					};
+				}),
+			},
+		],
+	};
+
+	return body;
+}
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 92e329ca97..98849297e7 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -28,6 +28,7 @@ export class Discourse implements INodeType {
 		defaults: {
 			name: 'Discourse',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index 27dc878560..664383dc74 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -601,16 +601,12 @@ export class Disqus implements INodeType {
 
 						Object.assign(qs, additionalFields);
 
-						try {
-							const responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData.response as IDataObject[]),
-								{ itemData: { item: i } },
-							);
-							returnData.push(...executionData);
-						} catch (error) {
-							throw error;
-						}
+						const responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.response as IDataObject[]),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} else if (operation === 'getPosts') {
 						// ----------------------------------
 						//         getPosts
@@ -629,28 +625,24 @@ export class Disqus implements INodeType {
 						qs.forum = id;
 						qs.limit = 100;
 
-						try {
-							let responseData: IDataObject = {};
-							if (returnAll) {
-								responseData.response = await disqusApiRequestAllItems.call(
-									this,
-									requestMethod,
-									qs,
-									endpoint,
-								);
-							} else {
-								const limit = this.getNodeParameter('limit', i);
-								qs.limit = limit;
-								responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
-							}
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData.response as IDataObject),
-								{ itemData: { item: i } },
+						let responseData: IDataObject = {};
+						if (returnAll) {
+							responseData.response = await disqusApiRequestAllItems.call(
+								this,
+								requestMethod,
+								qs,
+								endpoint,
 							);
-							returnData.push(...executionData);
-						} catch (error) {
-							throw error;
+						} else {
+							const limit = this.getNodeParameter('limit', i);
+							qs.limit = limit;
+							responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
 						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.response as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} else if (operation === 'getCategories') {
 						// ----------------------------------
 						//         getCategories
@@ -668,34 +660,30 @@ export class Disqus implements INodeType {
 						qs.forum = id;
 						qs.limit = 100;
 
-						try {
-							let responseData: IDataObject = {};
+						let responseData: IDataObject = {};
 
-							if (returnAll) {
-								responseData.response = await disqusApiRequestAllItems.call(
-									this,
-									requestMethod,
-									qs,
-									endpoint,
-								);
-							} else {
-								const limit = this.getNodeParameter('limit', i);
-								qs.limit = limit;
-								responseData = (await disqusApiRequest.call(
-									this,
-									requestMethod,
-									qs,
-									endpoint,
-								)) as IDataObject;
-							}
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData.response as IDataObject),
-								{ itemData: { item: i } },
+						if (returnAll) {
+							responseData.response = await disqusApiRequestAllItems.call(
+								this,
+								requestMethod,
+								qs,
+								endpoint,
 							);
-							returnData.push(...executionData);
-						} catch (error) {
-							throw error;
+						} else {
+							const limit = this.getNodeParameter('limit', i);
+							qs.limit = limit;
+							responseData = (await disqusApiRequest.call(
+								this,
+								requestMethod,
+								qs,
+								endpoint,
+							)) as IDataObject;
 						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.response as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} else if (operation === 'getThreads') {
 						// ----------------------------------
 						//         getThreads
@@ -715,28 +703,24 @@ export class Disqus implements INodeType {
 
 						Object.assign(qs, additionalFields);
 
-						try {
-							let responseData: IDataObject = {};
-							if (returnAll) {
-								responseData.response = await disqusApiRequestAllItems.call(
-									this,
-									requestMethod,
-									qs,
-									endpoint,
-								);
-							} else {
-								const limit = this.getNodeParameter('limit', i);
-								qs.limit = limit;
-								responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
-							}
-							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData.response as IDataObject),
-								{ itemData: { item: i } },
+						let responseData: IDataObject = {};
+						if (returnAll) {
+							responseData.response = await disqusApiRequestAllItems.call(
+								this,
+								requestMethod,
+								qs,
+								endpoint,
 							);
-							returnData.push(...executionData);
-						} catch (error) {
-							throw error;
+						} else {
+							const limit = this.getNodeParameter('limit', i);
+							qs.limit = limit;
+							responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
 						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.response as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} else {
 						throw new NodeOperationError(
 							this.getNode(),
diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
index d9c541144f..85141db3c1 100644
--- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
@@ -66,14 +66,10 @@ export async function disqusApiRequestAllItems(
 
 	let responseData;
 
-	try {
-		do {
-			responseData = await disqusApiRequest.call(this, method, qs, uri, body, option);
-			qs.cursor = responseData.cursor.id;
-			returnData.push.apply(returnData, responseData.response as IDataObject[]);
-		} while (responseData.cursor.more === true && responseData.cursor.hasNext === true);
-		return returnData;
-	} catch (error) {
-		throw error;
-	}
+	do {
+		responseData = await disqusApiRequest.call(this, method, qs, uri, body, option);
+		qs.cursor = responseData.cursor.id;
+		returnData.push.apply(returnData, responseData.response as IDataObject[]);
+	} while (responseData.cursor.more === true && responseData.cursor.hasNext === true);
+	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Drift/Drift.node.ts b/packages/nodes-base/nodes/Drift/Drift.node.ts
index 19a29ec873..10df1c23af 100644
--- a/packages/nodes-base/nodes/Drift/Drift.node.ts
+++ b/packages/nodes-base/nodes/Drift/Drift.node.ts
@@ -24,6 +24,7 @@ export class Drift implements INodeType {
 		defaults: {
 			name: 'Drift',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index aee39d3973..35e669a31c 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -28,6 +28,7 @@ export class Dropbox implements INodeType {
 		defaults: {
 			name: 'Dropbox',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/delete.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/delete.json
new file mode 100644
index 0000000000..a9ed960fe9
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/delete.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "metadata": {
+            "type": "object",
+            "properties": {
+                ".tag": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path_lower": {
+                    "type": "string"
+                },
+                "path_display": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "client_modified": {
+                    "type": "string"
+                },
+                "server_modified": {
+                    "type": "string"
+                },
+                "rev": {
+                    "type": "string"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "is_downloadable": {
+                    "type": "boolean"
+                },
+                "content_hash": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                ".tag",
+                "name",
+                "path_lower",
+                "path_display",
+                "id",
+                "client_modified",
+                "server_modified",
+                "rev",
+                "size",
+                "is_downloadable",
+                "content_hash"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/download.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/download.json
new file mode 100644
index 0000000000..3d343c7062
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/download.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "rev": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/move.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/move.json
new file mode 100644
index 0000000000..a9ed960fe9
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/move.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "metadata": {
+            "type": "object",
+            "properties": {
+                ".tag": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path_lower": {
+                    "type": "string"
+                },
+                "path_display": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "client_modified": {
+                    "type": "string"
+                },
+                "server_modified": {
+                    "type": "string"
+                },
+                "rev": {
+                    "type": "string"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "is_downloadable": {
+                    "type": "boolean"
+                },
+                "content_hash": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                ".tag",
+                "name",
+                "path_lower",
+                "path_display",
+                "id",
+                "client_modified",
+                "server_modified",
+                "rev",
+                "size",
+                "is_downloadable",
+                "content_hash"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/upload.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/upload.json
new file mode 100644
index 0000000000..0eb2cf017f
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/file/upload.json
@@ -0,0 +1,35 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "path_lower": {
+            "type": "string"
+        },
+        "path_display": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "client_modified": {
+            "type": "string"
+        },
+        "server_modified": {
+            "type": "string"
+        },
+        "rev": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "is_downloadable": {
+            "type": "boolean"
+        },
+        "content_hash": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/create.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/create.json
new file mode 100644
index 0000000000..3648ff1be4
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/create.json
@@ -0,0 +1,54 @@
+{
+    "type": "object",
+    "properties": {
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "path_lower": {
+                    "type": "string"
+                },
+                "path_display": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "parent_shared_folder_id": {
+                    "type": "string"
+                },
+                "sharing_info": {
+                    "type": "object",
+                    "properties": {
+                        "read_only": {
+                            "type": "boolean"
+                        },
+                        "parent_shared_folder_id": {
+                            "type": "string"
+                        },
+                        "traverse_only": {
+                            "type": "boolean"
+                        },
+                        "no_access": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "read_only",
+                        "parent_shared_folder_id",
+                        "traverse_only",
+                        "no_access"
+                    ]
+                }
+            },
+            "required": [
+                "name",
+                "path_lower",
+                "path_display",
+                "id"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/list.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/list.json
new file mode 100644
index 0000000000..438744f0dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/list.json
@@ -0,0 +1,38 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "lastModifiedClient": {
+            "type": "string"
+        },
+        "lastModifiedServer": {
+            "type": "string"
+        },
+        "rev": {
+            "type": "string"
+        },
+        "contentSize": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "contentHash": {
+            "type": "string"
+        },
+        "pathLower": {
+            "type": "string"
+        },
+        "pathDisplay": {
+            "type": "string"
+        },
+        "isDownloadable": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/move.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/move.json
new file mode 100644
index 0000000000..236ea801c0
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/folder/move.json
@@ -0,0 +1,61 @@
+{
+    "type": "object",
+    "properties": {
+        "metadata": {
+            "type": "object",
+            "properties": {
+                ".tag": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path_lower": {
+                    "type": "string"
+                },
+                "path_display": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "parent_shared_folder_id": {
+                    "type": "string"
+                },
+                "sharing_info": {
+                    "type": "object",
+                    "properties": {
+                        "read_only": {
+                            "type": "boolean"
+                        },
+                        "parent_shared_folder_id": {
+                            "type": "string"
+                        },
+                        "traverse_only": {
+                            "type": "boolean"
+                        },
+                        "no_access": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "read_only",
+                        "parent_shared_folder_id",
+                        "traverse_only",
+                        "no_access"
+                    ]
+                }
+            },
+            "required": [
+                ".tag",
+                "name",
+                "path_lower",
+                "path_display",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "metadata"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/search/query.json b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/search/query.json
new file mode 100644
index 0000000000..632b617d16
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropbox/__schema__/v1.0.0/search/query.json
@@ -0,0 +1,41 @@
+{
+    "type": "object",
+    "properties": {
+        ".tag": {
+            "type": "string"
+        },
+        "client_modified": {
+            "type": "string"
+        },
+        "file_owner_team_encrypted_id": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "is_downloadable": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "rev": {
+            "type": "string"
+        },
+        "server_modified": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "content_hash": {
+            "type": "string"
+        },
+        "path_display": {
+            "type": "string"
+        },
+        "path_lower": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
index 2a4a5be0d6..0a0db2ec98 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
@@ -21,6 +21,7 @@ export class Dropcontact implements INodeType {
 		defaults: {
 			name: 'Dropcontact',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Dropcontact/__schema__/v1.0.0/contact/enrich.json b/packages/nodes-base/nodes/Dropcontact/__schema__/v1.0.0/contact/enrich.json
new file mode 100644
index 0000000000..a3a703ecaa
--- /dev/null
+++ b/packages/nodes-base/nodes/Dropcontact/__schema__/v1.0.0/contact/enrich.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "first_name": {
+            "type": "string"
+        },
+        "last_name": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "civility": {
+            "type": "string"
+        },
+        "linkedin": {
+            "type": "string"
+        },
+        "email": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "email": {
+                        "type": "string"
+                    },
+                    "qualification": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "email",
+                    "qualification"
+                ]
+            }
+        },
+        "company": {
+            "type": "string"
+        },
+        "website": {
+            "type": "string"
+        },
+        "country": {
+            "type": "string"
+        },
+        "company_linkedin": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "nb_employees": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
index cf247919a2..772b37923c 100644
--- a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
+++ b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
@@ -24,6 +24,7 @@ export class E2eTest implements INodeType {
 		defaults: {
 			name: 'E2E Test',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index 0d00b57032..932b8f1b64 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -27,6 +27,7 @@ export class ERPNext implements INodeType {
 		defaults: {
 			name: 'ERPNext',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/create.json b/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/create.json
new file mode 100644
index 0000000000..2104275117
--- /dev/null
+++ b/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/create.json
@@ -0,0 +1,45 @@
+{
+    "type": "object",
+    "properties": {
+        "owner": {
+            "type": "string"
+        },
+        "creation": {
+            "type": "string"
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_by": {
+            "type": "string"
+        },
+        "docstatus": {
+            "type": "integer"
+        },
+        "idx": {
+            "type": "integer"
+        },
+        "naming_series": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        },
+        "disabled": {
+            "type": "integer"
+        },
+        "doctype": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "name",
+        "owner",
+        "creation",
+        "modified",
+        "modified_by",
+        "docstatus",
+        "idx",
+        "doctype"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/get.json b/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/get.json
new file mode 100644
index 0000000000..8853361e2a
--- /dev/null
+++ b/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/get.json
@@ -0,0 +1,38 @@
+{
+    "type": "object",
+    "properties": {
+        "owner": {
+            "type": "string"
+        },
+        "creation": {
+            "type": "string"
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_by": {
+            "type": "string"
+        },
+        "docstatus": {
+            "type": "integer"
+        },
+        "idx": {
+            "type": "integer"
+        },
+        "doctype": {
+            "type": "string"
+        },
+        "naming_series": {
+            "type": "string"
+        },
+        "customer_name": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "name"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/getAll.json b/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/getAll.json
new file mode 100644
index 0000000000..a309c45115
--- /dev/null
+++ b/packages/nodes-base/nodes/ERPNext/__schema__/v1.0.0/document/getAll.json
@@ -0,0 +1,8 @@
+{
+	"type": "object",
+	"properties": {
+		"name": {
+			"type": "string"
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index 31056e97b2..9e3f787737 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -26,6 +26,7 @@ export class Egoi implements INodeType {
 		defaults: {
 			name: 'E-goi',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index f30a6f3e2a..c09f3cc36c 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -40,6 +40,7 @@ export class ElasticSecurity implements INodeType {
 		defaults: {
 			name: 'Elastic Security',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/__schema__/v1.0.0/case/getAll.json b/packages/nodes-base/nodes/Elastic/ElasticSecurity/__schema__/v1.0.0/case/getAll.json
new file mode 100644
index 0000000000..78c36925a5
--- /dev/null
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/__schema__/v1.0.0/case/getAll.json
@@ -0,0 +1,138 @@
+{
+    "type": "object",
+    "properties": {
+        "title": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "description": {
+            "type": "string"
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "syncAlerts": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "syncAlerts"
+            ]
+        },
+        "owner": {
+            "type": "string"
+        },
+        "category": {
+            "type": "null"
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "uid": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "uid"
+                ]
+            }
+        },
+        "connector": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "fields": {
+                    "type": "null"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "type",
+                "fields",
+                "name"
+            ]
+        },
+        "severity": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "created_by": {
+            "type": "object",
+            "properties": {
+                "username": {
+                    "type": "string"
+                },
+                "profile_uid": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "username",
+                "full_name",
+                "email",
+                "profile_uid"
+            ]
+        },
+        "external_service": {
+            "type": "null"
+        },
+        "id": {
+            "type": "string"
+        },
+        "version": {
+            "type": "string"
+        },
+        "totalComment": {
+            "type": "integer"
+        },
+        "totalAlerts": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "title",
+        "tags",
+        "description",
+        "settings",
+        "owner",
+        "category",
+        "assignees",
+        "customFields",
+        "connector",
+        "severity",
+        "status",
+        "duration",
+        "closed_at",
+        "closed_by",
+        "created_at",
+        "created_by",
+        "updated_at",
+        "updated_by",
+        "external_service",
+        "id",
+        "version",
+        "totalComment",
+        "totalAlerts",
+        "comments"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index 5fab762b88..4cf24f0a59 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -29,6 +29,7 @@ export class Elasticsearch implements INodeType {
 		defaults: {
 			name: 'Elasticsearch',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/document/create.json b/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/document/create.json
new file mode 100644
index 0000000000..5bf621427b
--- /dev/null
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/document/create.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "_index": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        },
+        "_version": {
+            "type": "integer"
+        },
+        "result": {
+            "type": "string"
+        },
+        "_shards": {
+            "type": "object",
+            "properties": {
+                "total": {
+                    "type": "integer"
+                },
+                "successful": {
+                    "type": "integer"
+                },
+                "failed": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "total",
+                "successful",
+                "failed"
+            ]
+        },
+        "_seq_no": {
+            "type": "integer"
+        },
+        "_primary_term": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "_index",
+        "_id",
+        "_version",
+        "result",
+        "_shards",
+        "_seq_no",
+        "_primary_term"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/document/getAll.json b/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/document/getAll.json
new file mode 100644
index 0000000000..bb1a89cf80
--- /dev/null
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/document/getAll.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/index/get.json b/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/index/get.json
new file mode 100644
index 0000000000..0717fdce23
--- /dev/null
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/__schema__/v1.0.0/index/get.json
@@ -0,0 +1,191 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "mappings": {
+            "type": "object",
+            "properties": {
+                "properties": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "fields": {
+                                    "type": "object",
+                                    "properties": {
+                                        "keyword": {
+                                            "type": "object",
+                                            "properties": {
+                                                "type": {
+                                                    "type": "string"
+                                                },
+                                                "ignore_above": {
+                                                    "type": "integer"
+                                                }
+                                            },
+                                            "required": [
+                                                "type",
+                                                "ignore_above"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "keyword"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "fields"
+                            ]
+                        },
+                        "author": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "fields": {
+                                    "type": "object",
+                                    "properties": {
+                                        "keyword": {
+                                            "type": "object",
+                                            "properties": {
+                                                "type": {
+                                                    "type": "string"
+                                                },
+                                                "ignore_above": {
+                                                    "type": "integer"
+                                                }
+                                            },
+                                            "required": [
+                                                "type",
+                                                "ignore_above"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "keyword"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "fields"
+                            ]
+                        },
+                        "page_count": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ]
+                        },
+                        "release_date": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ]
+                        }
+                    }
+                }
+            },
+            "required": [
+                "properties"
+            ]
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "index": {
+                    "type": "object",
+                    "properties": {
+                        "routing": {
+                            "type": "object",
+                            "properties": {
+                                "allocation": {
+                                    "type": "object",
+                                    "properties": {
+                                        "include": {
+                                            "type": "object",
+                                            "properties": {
+                                                "_tier_preference": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "_tier_preference"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "include"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "allocation"
+                            ]
+                        },
+                        "number_of_shards": {
+                            "type": "string"
+                        },
+                        "provided_name": {
+                            "type": "string"
+                        },
+                        "creation_date": {
+                            "type": "string"
+                        },
+                        "number_of_replicas": {
+                            "type": "string"
+                        },
+                        "uuid": {
+                            "type": "string"
+                        },
+                        "version": {
+                            "type": "object",
+                            "properties": {
+                                "created": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "created"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "routing",
+                        "number_of_shards",
+                        "provided_name",
+                        "creation_date",
+                        "number_of_replicas",
+                        "uuid",
+                        "version"
+                    ]
+                }
+            },
+            "required": [
+                "index"
+            ]
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 48ce9b3766..ee1ba9f3fd 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -85,7 +85,7 @@ const versionDescription: INodeTypeDescription = {
 		activationHint:
 			"Once you’ve finished building your workflow, <a data-key='activate'>activate</a> it to have it also listen continuously (you just won’t see those executions here).",
 	},
-
+	usableAsTool: true,
 	inputs: [],
 	outputs: [NodeConnectionType.Main],
 	credentials: [
diff --git a/packages/nodes-base/nodes/EmailSend/EmailSend.node.json b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
index 3f5a2d5a13..d5297c6694 100644
--- a/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
+++ b/packages/nodes-base/nodes/EmailSend/EmailSend.node.json
@@ -2,7 +2,10 @@
 	"node": "n8n-nodes-base.emailSend",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication", "Core Nodes"],
+	"categories": ["Communication", "HITL", "Core Nodes"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -27,5 +30,5 @@
 			}
 		]
 	},
-	"alias": ["SMTP"]
+	"alias": ["SMTP", "email", "human", "form", "wait", "hitl", "approval"]
 }
diff --git a/packages/nodes-base/nodes/EmailSend/__schema__/v2.1.0/email/send.json b/packages/nodes-base/nodes/EmailSend/__schema__/v2.1.0/email/send.json
new file mode 100644
index 0000000000..30f7c88001
--- /dev/null
+++ b/packages/nodes-base/nodes/EmailSend/__schema__/v2.1.0/email/send.json
@@ -0,0 +1,50 @@
+{
+    "type": "object",
+    "properties": {
+        "accepted": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "ehlo": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "envelopeTime": {
+            "type": "integer"
+        },
+        "messageTime": {
+            "type": "integer"
+        },
+        "messageSize": {
+            "type": "integer"
+        },
+        "response": {
+            "type": "string"
+        },
+        "envelope": {
+            "type": "object",
+            "properties": {
+                "from": {
+                    "type": "string"
+                },
+                "to": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "from",
+                "to"
+            ]
+        },
+        "messageId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/EmailSend/test/v2/sendAndWait.operation.test.ts b/packages/nodes-base/nodes/EmailSend/test/v2/sendAndWait.operation.test.ts
new file mode 100644
index 0000000000..f0dfea2042
--- /dev/null
+++ b/packages/nodes-base/nodes/EmailSend/test/v2/sendAndWait.operation.test.ts
@@ -0,0 +1,68 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { SEND_AND_WAIT_OPERATION, type IExecuteFunctions } from 'n8n-workflow';
+
+import { EmailSendV2, versionDescription } from '../../v2/EmailSendV2.node';
+import * as utils from '../../v2/utils';
+
+const transporter = { sendMail: jest.fn() };
+
+jest.mock('../../v2/utils', () => {
+	const originalModule = jest.requireActual('../../v2/utils');
+	return {
+		...originalModule,
+		configureTransport: jest.fn(() => transporter),
+	};
+});
+
+describe('Test EmailSendV2, email => sendAndWait', () => {
+	let emailSendV2: EmailSendV2;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		emailSendV2 = new EmailSendV2(versionDescription);
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		//node
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(SEND_AND_WAIT_OPERATION);
+
+		//operation
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('from@mail.com');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('to@mail.com');
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+		mockExecuteFunctions.getCredentials.mockResolvedValue({});
+		mockExecuteFunctions.putExecutionToWait.mockImplementation();
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+
+		//getSendAndWaitConfig
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my subject');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({});
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('approval');
+
+		// configureWaitTillDate
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({}); //options.limitWaitTime.values
+
+		const result = await emailSendV2.execute.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+		expect(utils.configureTransport).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(transporter.sendMail).toHaveBeenCalledWith({
+			from: 'from@mail.com',
+			html: expect.stringContaining('href="http://localhost/waiting-webhook/nodeID?approved=true"'),
+			subject: 'my subject',
+			to: 'to@mail.com',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
index 13caad5b5d..2b6b879487 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
@@ -5,11 +5,15 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
 import * as send from './send.operation';
+import * as sendAndWait from './sendAndWait.operation';
+import { smtpConnectionTest } from './utils';
+import { sendAndWaitWebhooksDescription } from '../../../utils/sendAndWait/descriptions';
+import { sendAndWaitWebhook } from '../../../utils/sendAndWait/utils';
 
-const versionDescription: INodeTypeDescription = {
+export const versionDescription: INodeTypeDescription = {
 	displayName: 'Send Email',
 	name: 'emailSend',
 	icon: 'fa:envelope',
@@ -30,6 +34,7 @@ const versionDescription: INodeTypeDescription = {
 			testedBy: 'smtpConnectionTest',
 		},
 	],
+	webhooks: sendAndWaitWebhooksDescription,
 	properties: [
 		{
 			displayName: 'Resource',
@@ -47,7 +52,7 @@ const versionDescription: INodeTypeDescription = {
 		{
 			displayName: 'Operation',
 			name: 'operation',
-			type: 'hidden',
+			type: 'options',
 			noDataExpression: true,
 			default: 'send',
 			options: [
@@ -56,9 +61,15 @@ const versionDescription: INodeTypeDescription = {
 					value: 'send',
 					action: 'Send an Email',
 				},
+				{
+					name: 'Send and Wait for Response',
+					value: SEND_AND_WAIT_OPERATION,
+					action: 'Send message and wait for response',
+				},
 			],
 		},
 		...send.description,
+		...sendAndWait.description,
 	],
 };
 
@@ -73,13 +84,22 @@ export class EmailSendV2 implements INodeType {
 	}
 
 	methods = {
-		credentialTest: { smtpConnectionTest: send.smtpConnectionTest },
+		credentialTest: { smtpConnectionTest },
 	};
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		let returnData: INodeExecutionData[][] = [];
+		const operation = this.getNodeParameter('operation', 0);
 
-		returnData = await send.execute.call(this);
+		if (operation === SEND_AND_WAIT_OPERATION) {
+			returnData = await sendAndWait.execute.call(this);
+		}
+
+		if (operation === 'send') {
+			returnData = await send.execute.call(this);
+		}
 
 		return returnData;
 	}
diff --git a/packages/nodes-base/nodes/EmailSend/v2/descriptions.ts b/packages/nodes-base/nodes/EmailSend/v2/descriptions.ts
new file mode 100644
index 0000000000..0416813ae3
--- /dev/null
+++ b/packages/nodes-base/nodes/EmailSend/v2/descriptions.ts
@@ -0,0 +1,23 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const fromEmailProperty: INodeProperties = {
+	displayName: 'From Email',
+	name: 'fromEmail',
+	type: 'string',
+	default: '',
+	required: true,
+	placeholder: 'admin@example.com',
+	description:
+		'Email address of the sender. You can also specify a name: Nathan Doe &lt;nate@n8n.io&gt;.',
+};
+
+export const toEmailProperty: INodeProperties = {
+	displayName: 'To Email',
+	name: 'toEmail',
+	type: 'string',
+	default: '',
+	required: true,
+	placeholder: 'info@example.com',
+	description:
+		'Email address of the recipient. You can also specify a name: Nathan Doe &lt;nate@n8n.io&gt;.',
+};
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index b8f065a8b7..ba94d270ef 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -1,43 +1,22 @@
 import type {
-	ICredentialsDecrypted,
-	ICredentialTestFunctions,
 	IDataObject,
 	IExecuteFunctions,
-	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeProperties,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import { createTransport } from 'nodemailer';
-import type SMTPTransport from 'nodemailer/lib/smtp-transport';
 
-import { updateDisplayOptions } from '@utils/utilities';
+import { createUtmCampaignLink, updateDisplayOptions } from '@utils/utilities';
 
+import { fromEmailProperty, toEmailProperty } from './descriptions';
+import { configureTransport, type EmailSendOptions } from './utils';
 import { appendAttributionOption } from '../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	// TODO: Add choice for text as text or html  (maybe also from name)
-	{
-		displayName: 'From Email',
-		name: 'fromEmail',
-		type: 'string',
-		default: '',
-		required: true,
-		placeholder: 'admin@example.com',
-		description:
-			'Email address of the sender. You can also specify a name: Nathan Doe &lt;nate@n8n.io&gt;.',
-	},
-	{
-		displayName: 'To Email',
-		name: 'toEmail',
-		type: 'string',
-		default: '',
-		required: true,
-		placeholder: 'info@example.com',
-		description:
-			'Email address of the recipient. You can also specify a name: Nathan Doe &lt;nate@n8n.io&gt;.',
-	},
+	fromEmailProperty,
+	toEmailProperty,
 
 	{
 		displayName: 'Subject',
@@ -194,72 +173,11 @@ const displayOptions = {
 
 export const description = updateDisplayOptions(displayOptions, properties);
 
-type EmailSendOptions = {
-	appendAttribution?: boolean;
-	allowUnauthorizedCerts?: boolean;
-	attachments?: string;
-	ccEmail?: string;
-	bccEmail?: string;
-	replyTo?: string;
-};
-
-function configureTransport(credentials: IDataObject, options: EmailSendOptions) {
-	const connectionOptions: SMTPTransport.Options = {
-		host: credentials.host as string,
-		port: credentials.port as number,
-		secure: credentials.secure as boolean,
-	};
-
-	if (credentials.secure === false) {
-		connectionOptions.ignoreTLS = credentials.disableStartTls as boolean;
-	}
-
-	if (typeof credentials.hostName === 'string' && credentials.hostName) {
-		connectionOptions.name = credentials.hostName;
-	}
-
-	if (credentials.user || credentials.password) {
-		connectionOptions.auth = {
-			user: credentials.user as string,
-			pass: credentials.password as string,
-		};
-	}
-
-	if (options.allowUnauthorizedCerts === true) {
-		connectionOptions.tls = {
-			rejectUnauthorized: false,
-		};
-	}
-
-	return createTransport(connectionOptions);
-}
-
-export async function smtpConnectionTest(
-	this: ICredentialTestFunctions,
-	credential: ICredentialsDecrypted,
-): Promise<INodeCredentialTestResult> {
-	const credentials = credential.data!;
-	const transporter = configureTransport(credentials, {});
-	try {
-		await transporter.verify();
-		return {
-			status: 'OK',
-			message: 'Connection successful!',
-		};
-	} catch (error) {
-		return {
-			status: 'Error',
-			message: error.message,
-		};
-	} finally {
-		transporter.close();
-	}
-}
-
 export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
 	const nodeVersion = this.getNode().typeVersion;
 	const instanceId = this.getInstanceId();
+	const credentials = await this.getCredentials('smtp');
 
 	const returnData: INodeExecutionData[] = [];
 	let item: INodeExecutionData;
@@ -274,8 +192,6 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 			const emailFormat = this.getNodeParameter('emailFormat', itemIndex) as string;
 			const options = this.getNodeParameter('options', itemIndex, {}) as EmailSendOptions;
 
-			const credentials = await this.getCredentials('smtp');
-
 			const transporter = configureTransport(credentials, options);
 
 			const mailOptions: IDataObject = {
@@ -302,9 +218,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 
 			if (appendAttribution) {
 				const attributionText = 'This email was sent automatically with ';
-				const link = `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
-					'n8n-nodes-base.emailSend',
-				)}${instanceId ? '_' + instanceId : ''}`;
+				const link = createUtmCampaignLink('n8n-nodes-base.emailSend', instanceId);
 				if (emailFormat === 'html' || (emailFormat === 'both' && mailOptions.html)) {
 					mailOptions.html = `
 					${mailOptions.html}
diff --git a/packages/nodes-base/nodes/EmailSend/v2/sendAndWait.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/sendAndWait.operation.ts
new file mode 100644
index 0000000000..5962ec564d
--- /dev/null
+++ b/packages/nodes-base/nodes/EmailSend/v2/sendAndWait.operation.ts
@@ -0,0 +1,53 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { fromEmailProperty, toEmailProperty } from './descriptions';
+import { configureTransport } from './utils';
+import { createEmailBody } from '../../../utils/sendAndWait/email-templates';
+import {
+	configureWaitTillDate,
+	createButton,
+	getSendAndWaitConfig,
+	getSendAndWaitProperties,
+} from '../../../utils/sendAndWait/utils';
+
+export const description: INodeProperties[] = getSendAndWaitProperties(
+	[fromEmailProperty, toEmailProperty],
+	'email',
+);
+
+export async function execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+	const fromEmail = this.getNodeParameter('fromEmail', 0) as string;
+	const toEmail = this.getNodeParameter('toEmail', 0) as string;
+
+	const config = getSendAndWaitConfig(this);
+	const buttons: string[] = [];
+	for (const option of config.options) {
+		buttons.push(createButton(config.url, option.label, option.value, option.style));
+	}
+
+	const instanceId = this.getInstanceId();
+
+	const htmlBody = createEmailBody(config.message, buttons.join('\n'), instanceId);
+
+	const mailOptions: IDataObject = {
+		from: fromEmail,
+		to: toEmail,
+		subject: config.title,
+		html: htmlBody,
+	};
+
+	const credentials = await this.getCredentials('smtp');
+	const transporter = configureTransport(credentials, {});
+
+	await transporter.sendMail(mailOptions);
+
+	const waitTill = configureWaitTillDate(this);
+
+	await this.putExecutionToWait(waitTill);
+	return [this.getInputData()];
+}
diff --git a/packages/nodes-base/nodes/EmailSend/v2/utils.ts b/packages/nodes-base/nodes/EmailSend/v2/utils.ts
new file mode 100644
index 0000000000..ce680ab1ab
--- /dev/null
+++ b/packages/nodes-base/nodes/EmailSend/v2/utils.ts
@@ -0,0 +1,70 @@
+import type {
+	IDataObject,
+	ICredentialsDecrypted,
+	ICredentialTestFunctions,
+	INodeCredentialTestResult,
+} from 'n8n-workflow';
+import { createTransport } from 'nodemailer';
+import type SMTPTransport from 'nodemailer/lib/smtp-transport';
+
+export type EmailSendOptions = {
+	appendAttribution?: boolean;
+	allowUnauthorizedCerts?: boolean;
+	attachments?: string;
+	ccEmail?: string;
+	bccEmail?: string;
+	replyTo?: string;
+};
+
+export function configureTransport(credentials: IDataObject, options: EmailSendOptions) {
+	const connectionOptions: SMTPTransport.Options = {
+		host: credentials.host as string,
+		port: credentials.port as number,
+		secure: credentials.secure as boolean,
+	};
+
+	if (credentials.secure === false) {
+		connectionOptions.ignoreTLS = credentials.disableStartTls as boolean;
+	}
+
+	if (typeof credentials.hostName === 'string' && credentials.hostName) {
+		connectionOptions.name = credentials.hostName;
+	}
+
+	if (credentials.user || credentials.password) {
+		connectionOptions.auth = {
+			user: credentials.user as string,
+			pass: credentials.password as string,
+		};
+	}
+
+	if (options.allowUnauthorizedCerts === true) {
+		connectionOptions.tls = {
+			rejectUnauthorized: false,
+		};
+	}
+
+	return createTransport(connectionOptions);
+}
+
+export async function smtpConnectionTest(
+	this: ICredentialTestFunctions,
+	credential: ICredentialsDecrypted,
+): Promise<INodeCredentialTestResult> {
+	const credentials = credential.data!;
+	const transporter = configureTransport(credentials, {});
+	try {
+		await transporter.verify();
+		return {
+			status: 'OK',
+			message: 'Connection successful!',
+		};
+	} catch (error) {
+		return {
+			status: 'Error',
+			message: error.message,
+		};
+	} finally {
+		transporter.close();
+	}
+}
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index 8c4b710211..96d3cb6e3c 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -25,6 +25,7 @@ export class Emelia implements INodeType {
 		defaults: {
 			name: 'Emelia',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
index 657cd8ffa8..eab1fd6cbd 100644
--- a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
@@ -55,6 +55,7 @@ export class ExecuteCommand implements INodeType {
 			name: 'Execute Command',
 			color: '#886644',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
index 9fc5229703..9212ce8a62 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
@@ -11,7 +11,7 @@
 			}
 		]
 	},
-	"alias": ["n8n"],
+	"alias": ["n8n", "call", "sub", "workflow", "sub-workflow", "subworkflow"],
 	"subcategories": {
 		"Core Nodes": ["Helpers", "Flow"]
 	}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
index a04ef4375c..45f407dffe 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -8,14 +8,11 @@ import type {
 } from 'n8n-workflow';
 
 import { getWorkflowInfo } from './GenericFunctions';
-import { generatePairedItemData } from '../../../utils/utilities';
-import {
-	getCurrentWorkflowInputData,
-	loadWorkflowInputMappings,
-} from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
+import { localResourceMapping } from './methods';
+import { getCurrentWorkflowInputData } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Execute Workflow',
+		displayName: 'Execute Sub-workflow',
 		name: 'executeWorkflow',
 		icon: 'fa:sign-in-alt',
 		iconColor: 'orange-red',
@@ -38,7 +35,7 @@ export class ExecuteWorkflow implements INodeType {
 				default: 'call_workflow',
 				options: [
 					{
-						name: 'Call Another Workflow',
+						name: 'Execute a Sub-Workflow',
 						value: 'call_workflow',
 					},
 				],
@@ -132,7 +129,6 @@ export class ExecuteWorkflow implements INodeType {
 				},
 				default: '',
 				required: true,
-				hint: "Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
 			},
 			// ----------------------------------
 			//         source:localFile
@@ -210,7 +206,7 @@ export class ExecuteWorkflow implements INodeType {
 				typeOptions: {
 					loadOptionsDependsOn: ['workflowId.value'],
 					resourceMapper: {
-						localResourceMapperMethod: 'loadWorkflowInputMappings',
+						localResourceMapperMethod: 'loadSubWorkflowInputs',
 						valuesLabel: 'Workflow Inputs',
 						mode: 'map',
 						fieldWords: {
@@ -272,12 +268,21 @@ export class ExecuteWorkflow implements INodeType {
 				],
 			},
 		],
+		hints: [
+			{
+				type: 'info',
+				message:
+					"Note on using an expression for workflow ID: Since this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+				displayCondition:
+					'={{ $rawParameter.workflowId.startsWith("=") && $parameter.mode === "once" && $nodeVersion >= 1.2 }}',
+				whenToDisplay: 'always',
+				location: 'outputPane',
+			},
+		],
 	};
 
 	methods = {
-		localResourceMapping: {
-			loadWorkflowInputMappings,
-		},
+		localResourceMapping,
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
@@ -416,8 +421,6 @@ export class ExecuteWorkflow implements INodeType {
 
 				const workflowResult = executionResult.data as INodeExecutionData[][];
 
-				const fallbackPairedItemData = generatePairedItemData(items.length);
-
 				for (const output of workflowResult) {
 					const sameLength = output.length === items.length;
 
@@ -426,17 +429,14 @@ export class ExecuteWorkflow implements INodeType {
 
 						if (sameLength) {
 							item.pairedItem = { item: itemIndex };
-						} else {
-							item.pairedItem = fallbackPairedItemData;
 						}
 					}
 				}
 
 				return workflowResult;
 			} catch (error) {
-				const pairedItem = generatePairedItemData(items.length);
 				if (this.continueOnFail()) {
-					return [[{ json: { error: error.message }, pairedItem }]];
+					return [[{ json: { error: error.message } }]];
 				}
 				throw error;
 			}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts
new file mode 100644
index 0000000000..f43c9557ea
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/index.ts
@@ -0,0 +1 @@
+export * as localResourceMapping from './localResourceMapping';
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts
new file mode 100644
index 0000000000..e6770dde6f
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/methods/localResourceMapping.ts
@@ -0,0 +1,25 @@
+import type { ILocalLoadOptionsFunctions, ResourceMapperFields } from 'n8n-workflow';
+
+import { loadWorkflowInputMappings } from '@utils/workflowInputsResourceMapping/GenericFunctions';
+
+export async function loadSubWorkflowInputs(
+	this: ILocalLoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const { fields, dataMode, subworkflowInfo } = await loadWorkflowInputMappings.bind(this)();
+	let emptyFieldsNotice: string | undefined;
+	if (fields.length === 0) {
+		const subworkflowLink = subworkflowInfo?.id
+			? `<a href="/workflow/${subworkflowInfo?.id}" target="_blank">sub-workflow’s trigger</a>`
+			: 'sub-workflow’s trigger';
+
+		switch (dataMode) {
+			case 'passthrough':
+				emptyFieldsNotice = `This sub-workflow will consume all input data passed to it. You can define specific expected input in the ${subworkflowLink}.`;
+				break;
+			default:
+				emptyFieldsNotice = `The sub-workflow isn't set up to accept any inputs. Change this in the ${subworkflowLink}.`;
+				break;
+		}
+	}
+	return { fields, emptyFieldsNotice };
+}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
index b479538c3a..ecc763b418 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
@@ -32,11 +32,16 @@ describe('ExecuteWorkflowTrigger', () => {
 
 	it('should filter out parent input in `Using Fields below` mode', async () => {
 		executeFns.getNodeParameter.mockReturnValueOnce(WORKFLOW_INPUTS);
-		const mockNewParams = [
-			{ name: 'value1', type: 'string' },
-			{ name: 'value2', type: 'number' },
-			{ name: 'foo', type: 'string' },
-		] as FieldValueOption[];
+		const mockNewParams: {
+			fields: FieldValueOption[];
+			noFieldsMessage?: string;
+		} = {
+			fields: [
+				{ name: 'value1', type: 'string' },
+				{ name: 'value2', type: 'number' },
+				{ name: 'foo', type: 'string' },
+			],
+		};
 		const getFieldEntriesMock = (getFieldEntries as jest.Mock).mockReturnValue(mockNewParams);
 
 		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index a15780a80e..99d8c60ad6 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -30,14 +30,15 @@ export class ExecuteWorkflowTrigger implements INodeType {
 		eventTriggerDescription: '',
 		maxNodes: 1,
 		defaults: {
-			name: 'Workflow Input Trigger',
+			name: 'When Executed by Another Workflow',
 			color: '#ff6d5a',
 		},
 		inputs: [],
 		outputs: [NodeConnectionType.Main],
 		hints: [
 			{
-				message: 'Please make sure to define your input fields.',
+				message:
+					"This workflow isn't set to accept any input data. Fill out the workflow input schema or change the workflow to accept any data passed to it.",
 				// This condition checks if we have no input fields, which gets a bit awkward:
 				// For WORKFLOW_INPUTS: keys() only contains `VALUES` if at least one value is provided
 				// For JSON_EXAMPLE: We remove all whitespace and check if we're left with an empty object. Note that we already error if the example is not valid JSON
@@ -58,8 +59,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 					{
 						name: 'Workflow Call',
 						value: 'worklfow_call',
-						description: 'When called by another workflow using Execute Workflow Trigger',
-						action: 'When Called by Another Workflow',
+						description: 'When executed by another workflow using Execute Workflow Trigger',
+						action: 'When executed by Another Workflow',
 					},
 				],
 				default: 'worklfow_call',
@@ -142,7 +143,7 @@ export class ExecuteWorkflowTrigger implements INodeType {
 				},
 			},
 			{
-				displayName: 'Workflow Inputs',
+				displayName: 'Workflow Input Schema',
 				name: WORKFLOW_INPUTS,
 				placeholder: 'Add field',
 				type: 'fixedCollection',
@@ -168,7 +169,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 								type: 'string',
 								default: '',
 								placeholder: 'e.g. fieldName',
-								description: 'Name of the field',
+								description:
+									'A unique name for this workflow input, used to reference it from another workflows',
 								required: true,
 								noDataExpression: true,
 							},
@@ -176,7 +178,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 								displayName: 'Type',
 								name: 'type',
 								type: 'options',
-								description: 'The field value type',
+								description:
+									"Expected data type for this input value. Determines how this field's values are stored, validated, and displayed.",
 								options: TYPE_OPTIONS,
 								required: true,
 								default: 'string',
@@ -208,10 +211,10 @@ export class ExecuteWorkflowTrigger implements INodeType {
 			return [inputData];
 		} else {
 			const newParams = getFieldEntries(this);
-			const newKeys = new Set(newParams.map((x) => x.name));
+			const newKeys = new Set(newParams.fields.map((x) => x.name));
 			const itemsInSchema: INodeExecutionData[] = inputData.map((row, index) => ({
 				json: {
-					...Object.fromEntries(newParams.map((x) => [x.name, FALLBACK_DEFAULT_VALUE])),
+					...Object.fromEntries(newParams.fields.map((x) => [x.name, FALLBACK_DEFAULT_VALUE])),
 					// Need to trim to the expected schema to support legacy Execute Workflow callers passing through all their data
 					// which we do not want to expose past this node.
 					..._.pickBy(row.json, (_value, key) => newKeys.has(key)),
diff --git a/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts b/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts
index f2d113948a..c450bff6dd 100644
--- a/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts
+++ b/packages/nodes-base/nodes/ExecutionData/ExecutionData.node.ts
@@ -83,6 +83,22 @@ export class ExecutionData implements INodeType {
 				],
 			},
 		],
+		hints: [
+			{
+				type: 'warning',
+				message: 'Some keys are longer than 50 characters. They will be truncated.',
+				displayCondition: '={{ $parameter.dataToSave.values.some((x) => x.key.length > 50) }}',
+				whenToDisplay: 'beforeExecution',
+				location: 'outputPane',
+			},
+			{
+				type: 'warning',
+				message: 'Some values are longer than 512 characters. They will be truncated.',
+				displayCondition: '={{ $parameter.dataToSave.values.some((x) => x.value.length > 512) }}',
+				whenToDisplay: 'beforeExecution',
+				location: 'outputPane',
+			},
+		],
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index f4d9d28539..3e09f0f20b 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -21,6 +21,7 @@ export class FacebookGraphApi implements INodeType {
 		defaults: {
 			name: 'Facebook Graph API',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -80,6 +81,10 @@ export class FacebookGraphApi implements INodeType {
 						name: 'Default',
 						value: '',
 					},
+					{
+						name: 'v22.0',
+						value: 'v22.0',
+					},
 					{
 						name: 'v21.0',
 						value: 'v21.0',
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 8bb9e981f4..2631d93791 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -37,6 +37,7 @@ export class FileMaker implements INodeType {
 		defaults: {
 			name: 'FileMaker',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index 3c3100fa62..21b9e2b0a3 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -154,13 +154,8 @@ export async function getFields(this: ILoadOptionsFunctions): Promise<any> {
 		json: true,
 	};
 
-	try {
-		const responseData = await this.helpers.request(options);
-		return responseData.response.fieldMetaData;
-	} catch (error) {
-		// If that data does not exist for some reason return the actual error
-		throw error;
-	}
+	const responseData = await this.helpers.request(options);
+	return responseData.response.fieldMetaData;
 }
 
 /**
@@ -185,13 +180,8 @@ export async function getPortals(this: ILoadOptionsFunctions): Promise<any> {
 		json: true,
 	};
 
-	try {
-		const responseData = await this.helpers.request(options);
-		return responseData.response.portalMetaData;
-	} catch (error) {
-		// If that data does not exist for some reason return the actual error
-		throw error;
-	}
+	const responseData = await this.helpers.request(options);
+	return responseData.response.portalMetaData;
 }
 
 function parseScriptsList(scripts: ScriptObject[]): INodePropertyOptions[] {
@@ -230,15 +220,10 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> {
 		json: true,
 	};
 
-	try {
-		const responseData = await this.helpers.request(options);
-		const items = parseScriptsList(responseData.response.scripts as ScriptObject[]);
-		items.sort((a, b) => (a.name > b.name ? 0 : 1));
-		return items;
-	} catch (error) {
-		// If that data does not exist for some reason return the actual error
-		throw error;
-	}
+	const responseData = await this.helpers.request(options);
+	const items = parseScriptsList(responseData.response.scripts as ScriptObject[]);
+	items.sort((a, b) => (a.name > b.name ? 0 : 1));
+	return items;
 }
 
 export async function logout(
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
index 96f87bddc6..7921ac55d9 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
@@ -7,7 +7,7 @@ import {
 
 import type { JsonToSpreadsheetBinaryOptions, JsonToSpreadsheetBinaryFormat } from '@utils/binary';
 import { convertJsonToSpreadsheetBinary } from '@utils/binary';
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const operations = ['csv', 'html', 'rtf', 'ods', 'xls', 'xlsx'];
 
@@ -98,7 +98,6 @@ export async function execute(
 ) {
 	let returnData: INodeExecutionData[] = [];
 
-	const pairedItem = generatePairedItemData(items.length);
 	try {
 		const options = this.getNodeParameter('options', 0, {}) as JsonToSpreadsheetBinaryOptions;
 		const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data');
@@ -116,7 +115,6 @@ export async function execute(
 			binary: {
 				[binaryPropertyName]: binaryData,
 			},
-			pairedItem,
 		};
 
 		returnData = [newItem];
@@ -126,7 +124,6 @@ export async function execute(
 				json: {
 					error: error.message,
 				},
-				pairedItem,
 			});
 		} else {
 			throw new NodeOperationError(this.getNode(), error);
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
index cabcfa8da1..283b9b59a5 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
@@ -3,7 +3,7 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import { createBinaryFromJson } from '@utils/binary';
 import { encodeDecodeOptions } from '@utils/descriptions';
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
@@ -92,7 +92,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 
 	const mode = this.getNodeParameter('mode', 0, 'once') as string;
 	if (mode === 'once') {
-		const pairedItem = generatePairedItemData(items.length);
 		try {
 			const options = this.getNodeParameter('options', 0, {});
 			const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0, 'data');
@@ -114,7 +113,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 				binary: {
 					[binaryPropertyName]: binaryData,
 				},
-				pairedItem,
 			};
 
 			returnData = [newItem];
@@ -124,7 +122,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 					json: {
 						error: error.message,
 					},
-					pairedItem,
 				});
 			}
 			throw new NodeOperationError(this.getNode(), error);
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
index fc19041f18..ceab6b14bc 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
@@ -107,12 +107,8 @@ export class FlowTrigger implements INodeType {
 				}
 				qs.organization_id = credentials.organizationId as number;
 				const endpoint = '/integration_webhooks';
-				try {
-					webhooks = await flowApiRequest.call(this, 'GET', endpoint, {}, qs);
-					webhooks = webhooks.integration_webhooks;
-				} catch (error) {
-					throw error;
-				}
+				webhooks = await flowApiRequest.call(this, 'GET', endpoint, {}, qs);
+				webhooks = webhooks.integration_webhooks;
 				for (const webhook of webhooks) {
 					// @ts-ignore
 					if (webhookData.webhookIds.includes(webhook.id)) {
diff --git a/packages/nodes-base/nodes/Form/Form.node.ts b/packages/nodes-base/nodes/Form/Form.node.ts
index 735cbc4065..b9e1340f13 100644
--- a/packages/nodes-base/nodes/Form/Form.node.ts
+++ b/packages/nodes-base/nodes/Form/Form.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeProperties,
 	INodeTypeDescription,
 	IWebhookFunctions,
+	IWebhookResponseData,
 	NodeTypeAndVersion,
 } from 'n8n-workflow';
 import {
@@ -15,12 +16,13 @@ import {
 	FORM_TRIGGER_NODE_TYPE,
 	tryToParseJsonToFormFields,
 	NodeConnectionType,
-	WAIT_NODE_TYPE,
 	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 
+import { renderFormCompletion } from './formCompletionUtils';
+import { renderFormNode } from './formNodeUtils';
 import { formDescription, formFields, formTitle } from '../Form/common.descriptions';
-import { prepareFormReturnItem, renderForm, resolveRawData } from '../Form/utils';
+import { prepareFormReturnItem, resolveRawData } from '../Form/utils';
 
 export const formFieldsProperties: INodeProperties[] = [
 	{
@@ -113,6 +115,11 @@ const completionProperties = updateDisplayOptions(
 					value: 'redirect',
 					description: 'Redirect the user to a URL',
 				},
+				{
+					name: 'Show Text',
+					value: 'showText',
+					description: 'Display simple text or HTML',
+				},
 			],
 		},
 		{
@@ -154,6 +161,22 @@ const completionProperties = updateDisplayOptions(
 				},
 			},
 		},
+		{
+			displayName: 'Text',
+			name: 'responseText',
+			type: 'string',
+			displayOptions: {
+				show: {
+					respondWith: ['showText'],
+				},
+			},
+			typeOptions: {
+				rows: 2,
+			},
+			default: '',
+			placeholder: 'e.g. Thanks for filling the form',
+			description: 'The text to display on the page. Use HTML to show a customized web page.',
+		},
 		{
 			displayName: 'Options',
 			name: 'options',
@@ -235,7 +258,7 @@ export class Form extends Node {
 		],
 	};
 
-	async webhook(context: IWebhookFunctions) {
+	async webhook(context: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const res = context.getResponseObject();
 
 		const operation = context.getNodeParameter('operation', '') as string;
@@ -266,42 +289,21 @@ export class Form extends Node {
 				});
 			}
 		} else {
-			fields = context.getNodeParameter('formFields.values', []) as FormFieldsParameter;
+			fields = (context.getNodeParameter('formFields.values', []) as FormFieldsParameter).map(
+				(field) => {
+					if (field.fieldType === 'hiddenField') {
+						field.fieldLabel = field.fieldName as string;
+					}
+
+					return field;
+				},
+			);
 		}
 
 		const method = context.getRequestObject().method;
 
 		if (operation === 'completion' && method === 'GET') {
-			const completionTitle = context.getNodeParameter('completionTitle', '') as string;
-			const completionMessage = context.getNodeParameter('completionMessage', '') as string;
-			const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
-			const options = context.getNodeParameter('options', {}) as { formTitle: string };
-
-			if (redirectUrl) {
-				res.send(
-					`<html><head><meta http-equiv="refresh" content="0; url=${redirectUrl}"></head></html>`,
-				);
-				return { noWebhookResponse: true };
-			}
-
-			let title = options.formTitle;
-			if (!title) {
-				title = context.evaluateExpression(
-					`{{ $('${trigger?.name}').params.formTitle }}`,
-				) as string;
-			}
-			const appendAttribution = context.evaluateExpression(
-				`{{ $('${trigger?.name}').params.options?.appendAttribution === false ? false : true }}`,
-			) as boolean;
-
-			res.render('form-trigger-completion', {
-				title: completionTitle,
-				message: completionMessage,
-				formTitle: title,
-				appendAttribution,
-			});
-
-			return { noWebhookResponse: true };
+			return await renderFormCompletion(context, res, trigger);
 		}
 
 		if (operation === 'completion' && method === 'POST') {
@@ -311,68 +313,7 @@ export class Form extends Node {
 		}
 
 		if (method === 'GET') {
-			const options = context.getNodeParameter('options', {}) as {
-				formTitle: string;
-				formDescription: string;
-				buttonLabel: string;
-			};
-
-			let title = options.formTitle;
-			if (!title) {
-				title = context.evaluateExpression(
-					`{{ $('${trigger?.name}').params.formTitle }}`,
-				) as string;
-			}
-
-			let description = options.formDescription;
-			if (!description) {
-				description = context.evaluateExpression(
-					`{{ $('${trigger?.name}').params.formDescription }}`,
-				) as string;
-			}
-
-			let buttonLabel = options.buttonLabel;
-			if (!buttonLabel) {
-				buttonLabel =
-					(context.evaluateExpression(
-						`{{ $('${trigger?.name}').params.options?.buttonLabel }}`,
-					) as string) || 'Submit';
-			}
-
-			const responseMode = 'onReceived';
-
-			let redirectUrl;
-
-			const connectedNodes = context.getChildNodes(context.getNode().name);
-
-			const hasNextPage = connectedNodes.some(
-				(node) => !node.disabled && (node.type === FORM_NODE_TYPE || node.type === WAIT_NODE_TYPE),
-			);
-
-			if (hasNextPage) {
-				redirectUrl = context.evaluateExpression('{{ $execution.resumeFormUrl }}') as string;
-			}
-
-			const appendAttribution = context.evaluateExpression(
-				`{{ $('${trigger?.name}').params.options?.appendAttribution === false ? false : true }}`,
-			) as boolean;
-
-			renderForm({
-				context,
-				res,
-				formTitle: title,
-				formDescription: description,
-				formFields: fields,
-				responseMode,
-				mode,
-				redirectUrl,
-				appendAttribution,
-				buttonLabel,
-			});
-
-			return {
-				noWebhookResponse: true,
-			};
+			return await renderFormNode(context, res, trigger, fields, mode);
 		}
 
 		let useWorkflowTimezone = context.evaluateExpression(
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index ad66330c27..3177dbe6cb 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -2,6 +2,12 @@ import type { INodeProperties } from 'n8n-workflow';
 
 import { appendAttributionOption } from '../../utils/descriptions';
 
+export const placeholder: string = `
+<!-- Your custom HTML here --->
+
+
+`.trimStart();
+
 export const webhookPath: INodeProperties = {
 	displayName: 'Form Path',
 	name: 'path',
@@ -29,16 +35,16 @@ export const formDescription: INodeProperties = {
 	default: '',
 	placeholder: "e.g. We'll get back to you soon",
 	description:
-		'Shown underneath the Form Title. Can be used to prompt the user on how to complete the form.',
+		'Shown underneath the Form Title. Can be used to prompt the user on how to complete the form. Accepts HTML.',
 	typeOptions: {
 		rows: 2,
 	},
 };
 
 export const formFields: INodeProperties = {
-	displayName: 'Form Fields',
+	displayName: 'Form Elements',
 	name: 'formFields',
-	placeholder: 'Add Form Field',
+	placeholder: 'Add Form Element',
 	type: 'fixedCollection',
 	default: { values: [{ label: '', fieldType: 'text' }] },
 	typeOptions: {
@@ -51,21 +57,30 @@ export const formFields: INodeProperties = {
 			name: 'values',
 			values: [
 				{
-					displayName: 'Field Label',
+					displayName: 'Field Name',
 					name: 'fieldLabel',
 					type: 'string',
 					default: '',
 					placeholder: 'e.g. What is your name?',
 					description: 'Label that appears above the input field',
 					required: true,
+					displayOptions: {
+						hide: {
+							fieldType: ['hiddenField', 'html'],
+						},
+					},
 				},
 				{
-					displayName: 'Field Type',
+					displayName: 'Element Type',
 					name: 'fieldType',
 					type: 'options',
 					default: 'text',
 					description: 'The type of field to add to the form',
 					options: [
+						{
+							name: 'Custom HTML',
+							value: 'html',
+						},
 						{
 							name: 'Date',
 							value: 'date',
@@ -82,6 +97,10 @@ export const formFields: INodeProperties = {
 							name: 'File',
 							value: 'file',
 						},
+						{
+							name: 'Hidden Field',
+							value: 'hiddenField',
+						},
 						{
 							name: 'Number',
 							value: 'number',
@@ -101,6 +120,19 @@ export const formFields: INodeProperties = {
 					],
 					required: true,
 				},
+				{
+					displayName: 'Element Name',
+					name: 'elementName',
+					type: 'string',
+					default: '',
+					placeholder: 'e.g. content-section',
+					description: 'Optional field. It can be used to include the html in the output.',
+					displayOptions: {
+						show: {
+							fieldType: ['html'],
+						},
+					},
+				},
 				{
 					displayName: 'Placeholder',
 					name: 'placeholder',
@@ -109,7 +141,33 @@ export const formFields: INodeProperties = {
 					default: '',
 					displayOptions: {
 						hide: {
-							fieldType: ['dropdown', 'date', 'file'],
+							fieldType: ['dropdown', 'date', 'file', 'html', 'hiddenField'],
+						},
+					},
+				},
+				{
+					displayName: 'Field Name',
+					name: 'fieldName',
+					description:
+						'The name of the field, used in input attributes and referenced by the workflow',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							fieldType: ['hiddenField'],
+						},
+					},
+				},
+				{
+					displayName: 'Field Value',
+					name: 'fieldValue',
+					description:
+						'Input value can be set here or will be passed as a query parameter via Field Name if no value is set',
+					type: 'string',
+					default: '',
+					displayOptions: {
+						show: {
+							fieldType: ['hiddenField'],
 						},
 					},
 				},
@@ -158,6 +216,23 @@ export const formFields: INodeProperties = {
 						},
 					},
 				},
+				{
+					displayName: 'HTML',
+					name: 'html',
+					typeOptions: {
+						editor: 'htmlEditor',
+					},
+					type: 'string',
+					noDataExpression: true,
+					default: placeholder,
+					description: 'HTML elements to display on the form page',
+					hint: 'Does not accept <code>&lt;script&gt;</code>, <code>&lt;style&gt;</code> or <code>&lt;input&gt;</code> tags',
+					displayOptions: {
+						show: {
+							fieldType: ['html'],
+						},
+					},
+				},
 				{
 					displayName: 'Multiple Files',
 					name: 'multipleFiles',
@@ -186,14 +261,10 @@ export const formFields: INodeProperties = {
 					},
 				},
 				{
-					displayName: 'Format Date As',
+					displayName: "The displayed date is formatted based on the locale of the user's browser",
 					name: 'formatDate',
-					type: 'string',
+					type: 'notice',
 					default: '',
-					description:
-						'How to format the date in the output data. For a table of tokens and their interpretations, see <a href="https://moment.github.io/luxon/#/formatting?ID=table-of-tokens" target="_blank">here</a>.',
-					placeholder: 'e.g. dd/mm/yyyy',
-					hint: 'Leave empty to use the default format',
 					displayOptions: {
 						show: {
 							fieldType: ['date'],
@@ -207,6 +278,11 @@ export const formFields: INodeProperties = {
 					default: false,
 					description:
 						'Whether to require the user to enter a value for this field before submitting the form',
+					displayOptions: {
+						hide: {
+							fieldType: ['html', 'hiddenField'],
+						},
+					},
 				},
 			],
 		},
diff --git a/packages/nodes-base/nodes/Form/formCompletionUtils.ts b/packages/nodes-base/nodes/Form/formCompletionUtils.ts
new file mode 100644
index 0000000000..e952380495
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/formCompletionUtils.ts
@@ -0,0 +1,45 @@
+import { type Response } from 'express';
+import {
+	type NodeTypeAndVersion,
+	type IWebhookFunctions,
+	type IWebhookResponseData,
+} from 'n8n-workflow';
+
+import { sanitizeHtml } from './utils';
+
+export const renderFormCompletion = async (
+	context: IWebhookFunctions,
+	res: Response,
+	trigger: NodeTypeAndVersion,
+): Promise<IWebhookResponseData> => {
+	const completionTitle = context.getNodeParameter('completionTitle', '') as string;
+	const completionMessage = context.getNodeParameter('completionMessage', '') as string;
+	const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
+	const options = context.getNodeParameter('options', {}) as { formTitle: string };
+	const responseText = context.getNodeParameter('responseText', '') as string;
+
+	if (redirectUrl) {
+		res.send(
+			`<html><head><meta http-equiv="refresh" content="0; url=${redirectUrl}"></head></html>`,
+		);
+		return { noWebhookResponse: true };
+	}
+
+	let title = options.formTitle;
+	if (!title) {
+		title = context.evaluateExpression(`{{ $('${trigger?.name}').params.formTitle }}`) as string;
+	}
+	const appendAttribution = context.evaluateExpression(
+		`{{ $('${trigger?.name}').params.options?.appendAttribution === false ? false : true }}`,
+	) as boolean;
+
+	res.render('form-trigger-completion', {
+		title: completionTitle,
+		message: completionMessage,
+		formTitle: title,
+		appendAttribution,
+		responseText: sanitizeHtml(responseText),
+	});
+
+	return { noWebhookResponse: true };
+};
diff --git a/packages/nodes-base/nodes/Form/formNodeUtils.ts b/packages/nodes-base/nodes/Form/formNodeUtils.ts
new file mode 100644
index 0000000000..ff8a01a6dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Form/formNodeUtils.ts
@@ -0,0 +1,80 @@
+import { type Response } from 'express';
+import {
+	type NodeTypeAndVersion,
+	type IWebhookFunctions,
+	FORM_NODE_TYPE,
+	WAIT_NODE_TYPE,
+	type FormFieldsParameter,
+	type IWebhookResponseData,
+} from 'n8n-workflow';
+
+import { renderForm } from './utils';
+
+export const renderFormNode = async (
+	context: IWebhookFunctions,
+	res: Response,
+	trigger: NodeTypeAndVersion,
+	fields: FormFieldsParameter,
+	mode: 'test' | 'production',
+): Promise<IWebhookResponseData> => {
+	const options = context.getNodeParameter('options', {}) as {
+		formTitle: string;
+		formDescription: string;
+		buttonLabel: string;
+	};
+
+	let title = options.formTitle;
+	if (!title) {
+		title = context.evaluateExpression(`{{ $('${trigger?.name}').params.formTitle }}`) as string;
+	}
+
+	let description = options.formDescription;
+	if (!description) {
+		description = context.evaluateExpression(
+			`{{ $('${trigger?.name}').params.formDescription }}`,
+		) as string;
+	}
+
+	let buttonLabel = options.buttonLabel;
+	if (!buttonLabel) {
+		buttonLabel =
+			(context.evaluateExpression(
+				`{{ $('${trigger?.name}').params.options?.buttonLabel }}`,
+			) as string) || 'Submit';
+	}
+
+	const responseMode = 'onReceived';
+
+	let redirectUrl;
+
+	const connectedNodes = context.getChildNodes(context.getNode().name);
+
+	const hasNextPage = connectedNodes.some(
+		(node) => !node.disabled && (node.type === FORM_NODE_TYPE || node.type === WAIT_NODE_TYPE),
+	);
+
+	if (hasNextPage) {
+		redirectUrl = context.evaluateExpression('{{ $execution.resumeFormUrl }}') as string;
+	}
+
+	const appendAttribution = context.evaluateExpression(
+		`{{ $('${trigger?.name}').params.options?.appendAttribution === false ? false : true }}`,
+	) as boolean;
+
+	renderForm({
+		context,
+		res,
+		formTitle: title,
+		formDescription: description,
+		formFields: fields,
+		responseMode,
+		mode,
+		redirectUrl,
+		appendAttribution,
+		buttonLabel,
+	});
+
+	return {
+		noWebhookResponse: true,
+	};
+};
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
index 1cf5f64c92..b04d30d1d3 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -22,6 +22,7 @@ export type FormTriggerData = {
 	validForm: boolean;
 	formTitle: string;
 	formDescription?: string;
+	formDescriptionMetadata?: string;
 	formSubmittedHeader?: string;
 	formSubmittedText?: string;
 	redirectUrl?: string;
diff --git a/packages/nodes-base/nodes/Form/test/Form.node.test.ts b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
index 9dd0e4bbf2..5065df20c9 100644
--- a/packages/nodes-base/nodes/Form/test/Form.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
@@ -106,7 +106,16 @@ describe('Form Node', () => {
 			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName: string) => {
 				if (paramName === 'operation') return 'page';
 				if (paramName === 'useJson') return false;
-				if (paramName === 'formFields.values') return [{ fieldLabel: 'test' }];
+				if (paramName === 'formFields.values')
+					return [
+						{ fieldLabel: 'test' },
+						{
+							fieldName: 'Powerpuff Girl',
+							fieldValue: 'Blossom',
+							fieldType: 'hiddenField',
+							fieldLabel: '',
+						},
+					];
 				if (paramName === 'options') {
 					return {
 						formTitle: 'Form Title',
@@ -121,7 +130,42 @@ describe('Form Node', () => {
 
 			await form.webhook(mockWebhookFunctions);
 
-			expect(mockResponseObject.render).toHaveBeenCalledWith('form-trigger', expect.any(Object));
+			expect(mockResponseObject.render).toHaveBeenCalledWith('form-trigger', {
+				appendAttribution: 'test',
+				buttonLabel: 'Form Button',
+				formDescription: 'Form Description',
+				formDescriptionMetadata: 'Form Description',
+				formFields: [
+					{
+						id: 'field-0',
+						errorId: 'error-field-0',
+						label: 'test',
+						inputRequired: '',
+						defaultValue: '',
+						isInput: true,
+						placeholder: undefined,
+						type: undefined,
+					},
+					{
+						id: 'field-1',
+						errorId: 'error-field-1',
+						label: 'Powerpuff Girl',
+						inputRequired: '',
+						defaultValue: '',
+						placeholder: undefined,
+						hiddenName: 'Powerpuff Girl',
+						hiddenValue: 'Blossom',
+						isHidden: true,
+					},
+				],
+				formSubmittedText: 'Your response has been recorded',
+				formTitle: 'Form Title',
+				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
+				testRun: true,
+				useResponseData: false,
+				validForm: true,
+				formSubmittedHeader: undefined,
+			});
 		});
 
 		it('should return form data for POST request', async () => {
@@ -173,46 +217,86 @@ describe('Form Node', () => {
 		});
 
 		it('should handle completion operation and render completion page', async () => {
-			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
-			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName) => {
-				if (paramName === 'operation') return 'completion';
-				if (paramName === 'useJson') return false;
-				if (paramName === 'jsonOutput') return '[]';
-				if (paramName === 'respondWith') return 'text';
-				if (paramName === 'completionTitle') return 'Test Title';
-				if (paramName === 'completionMessage') return 'Test Message';
-				if (paramName === 'redirectUrl') return '';
-				return {};
-			});
-			mockWebhookFunctions.getParentNodes.mockReturnValue([
+			const formExpected = [
 				{
-					type: 'n8n-nodes-base.formTrigger',
-					name: 'Form Trigger',
-					typeVersion: 2.1,
-					disabled: false,
+					formParam: {
+						responseText: '',
+					},
+					expected: {
+						appendAttribution: 'test',
+						formTitle: 'test',
+						message: 'Test Message',
+						title: 'Test Title',
+						responseText: '',
+					},
 				},
-			]);
-			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
+				{
+					formParam: {
+						responseText: '<div>hey</div><script>alert("hi")</script>',
+					},
+					expected: {
+						appendAttribution: 'test',
+						formTitle: 'test',
+						message: 'Test Message',
+						title: 'Test Title',
+						responseText: '<div>hey</div>',
+					},
+				},
+				{
+					formParam: {
+						responseText: 'my text over here',
+					},
+					expected: {
+						appendAttribution: 'test',
+						formTitle: 'test',
+						message: 'Test Message',
+						title: 'Test Title',
+						responseText: 'my text over here',
+					},
+				},
+			];
 
-			const mockResponseObject = {
-				render: jest.fn(),
-				redirect: jest.fn(),
-			};
-			mockWebhookFunctions.getResponseObject.mockReturnValue(
-				mockResponseObject as unknown as Response,
-			);
-			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>({ name: formCompletionNodeName }));
-			mockWebhookFunctions.getExecutionId.mockReturnValue(testExecutionId);
+			for (const { formParam, expected } of formExpected) {
+				mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
+				mockWebhookFunctions.getNodeParameter.mockImplementation((paramName) => {
+					if (paramName === 'operation') return 'completion';
+					if (paramName === 'useJson') return false;
+					if (paramName === 'jsonOutput') return '[]';
+					if (paramName === 'respondWith') return 'text';
+					if (paramName === 'completionTitle') return 'Test Title';
+					if (paramName === 'completionMessage') return 'Test Message';
+					if (paramName === 'redirectUrl') return '';
+					if (paramName === 'formFields.values') return [];
+					if (paramName === 'responseText') return formParam.responseText;
+					return {};
+				});
+				mockWebhookFunctions.getParentNodes.mockReturnValue([
+					{
+						type: 'n8n-nodes-base.formTrigger',
+						name: 'Form Trigger',
+						typeVersion: 2.1,
+						disabled: false,
+					},
+				]);
+				mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 
-			const result = await form.webhook(mockWebhookFunctions);
+				const mockResponseObject = {
+					render: jest.fn(),
+					redirect: jest.fn(),
+				};
+				mockWebhookFunctions.getResponseObject.mockReturnValue(
+					mockResponseObject as unknown as Response,
+				);
+				mockWebhookFunctions.getNode.mockReturnValue(mock<INode>({ name: formCompletionNodeName }));
+				mockWebhookFunctions.getExecutionId.mockReturnValue(testExecutionId);
 
-			expect(result).toEqual({ noWebhookResponse: true });
-			expect(mockResponseObject.render).toHaveBeenCalledWith('form-trigger-completion', {
-				appendAttribution: 'test',
-				formTitle: 'test',
-				message: 'Test Message',
-				title: 'Test Title',
-			});
+				const result = await form.webhook(mockWebhookFunctions);
+
+				expect(result).toEqual({ noWebhookResponse: true });
+				expect(mockResponseObject.render).toHaveBeenCalledWith('form-trigger-completion', {
+					...expected,
+				});
+			}
 		});
 
 		it('should handle completion operation and redirect', async () => {
@@ -225,6 +309,8 @@ describe('Form Node', () => {
 				if (paramName === 'completionTitle') return 'Test Title';
 				if (paramName === 'completionMessage') return 'Test Message';
 				if (paramName === 'redirectUrl') return 'https://n8n.io';
+				if (paramName === 'formFields.values') return [];
+
 				return {};
 			});
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
diff --git a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
index 63dbfd4986..9c69179066 100644
--- a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
@@ -50,6 +50,7 @@ describe('FormTrigger', () => {
 			appendAttribution: false,
 			buttonLabel: 'Submit',
 			formDescription: 'Test Description',
+			formDescriptionMetadata: 'Test Description',
 			formFields: [
 				{
 					defaultValue: '',
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index 455e288ec7..8fe48b57d6 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -5,17 +5,87 @@ import type {
 	INode,
 	IWebhookFunctions,
 	MultiPartFormData,
+	NodeTypeAndVersion,
 } from 'n8n-workflow';
 
-import { formWebhook, prepareFormData, prepareFormReturnItem, resolveRawData } from '../utils';
+import {
+	formWebhook,
+	createDescriptionMetadata,
+	prepareFormData,
+	prepareFormReturnItem,
+	resolveRawData,
+	isFormConnected,
+	sanitizeHtml,
+} from '../utils';
+
+describe('FormTrigger, parseFormDescription', () => {
+	it('should remove HTML tags and truncate to 150 characters', () => {
+		const descriptions = [
+			{ description: '<p>This is a test description</p>', expected: 'This is a test description' },
+			{ description: 'Test description', expected: 'Test description' },
+			{
+				description:
+					'Beneath the golden hues of a setting sun, waves crashed against the rugged shore, carrying whispers of ancient tales etched in natures timeless and soothing song.',
+				expected:
+					'Beneath the golden hues of a setting sun, waves crashed against the rugged shore, carrying whispers of ancient tales etched in natures timeless and so',
+			},
+			{
+				description:
+					'<p>Beneath the golden hues of a setting sun, waves crashed against the rugged shore, carrying whispers of ancient tales etched in natures timeless and soothing song.</p>',
+				expected:
+					'Beneath the golden hues of a setting sun, waves crashed against the rugged shore, carrying whispers of ancient tales etched in natures timeless and so',
+			},
+		];
+
+		descriptions.forEach(({ description, expected }) => {
+			expect(createDescriptionMetadata(description)).toBe(expected);
+		});
+	});
+});
+
+describe('FormTrigger, sanitizeHtml', () => {
+	it('should remove forbidden HTML tags', () => {
+		const givenHtml = [
+			{
+				html: '<script>alert("hello world")</script>',
+				expected: '',
+			},
+			{
+				html: '<style>body { color: red; }</style>',
+				expected: '',
+			},
+			{
+				html: '<input type="text" value="test">',
+				expected: '',
+			},
+		];
+
+		givenHtml.forEach(({ html, expected }) => {
+			expect(sanitizeHtml(html)).toBe(expected);
+		});
+	});
+});
 
 describe('FormTrigger, formWebhook', () => {
+	const executeFunctions = mock<IWebhookFunctions>();
+	executeFunctions.getNode.mockReturnValue({ typeVersion: 2.1 } as any);
+	executeFunctions.getNodeParameter.calledWith('options').mockReturnValue({});
+	executeFunctions.getNodeParameter.calledWith('formTitle').mockReturnValue('Test Form');
+	executeFunctions.getNodeParameter
+		.calledWith('formDescription')
+		.mockReturnValue('Test Description');
+	executeFunctions.getNodeParameter.calledWith('responseMode').mockReturnValue('onReceived');
+	executeFunctions.getRequestObject.mockReturnValue({ method: 'GET', query: {} } as any);
+	executeFunctions.getMode.mockReturnValue('manual');
+	executeFunctions.getInstanceId.mockReturnValue('instanceId');
+	executeFunctions.getBodyData.mockReturnValue({ data: {}, files: {} });
+	executeFunctions.getChildNodes.mockReturnValue([]);
+
 	beforeEach(() => {
 		jest.clearAllMocks();
 	});
 
 	it('should call response render', async () => {
-		const executeFunctions = mock<IWebhookFunctions>();
 		const mockRender = jest.fn();
 
 		const formFields: FormFieldsParameter = [
@@ -34,22 +104,22 @@ describe('FormTrigger, formWebhook', () => {
 				acceptFileTypes: '.pdf,.doc',
 				multipleFiles: false,
 			},
+			{
+				fieldLabel: 'Custom HTML',
+				fieldType: 'html',
+				html: '<div>Test HTML</div>',
+				requiredField: false,
+			},
+			{
+				fieldName: 'Powerpuff Girl',
+				fieldValue: 'Blossom',
+				fieldType: 'hiddenField',
+				fieldLabel: '',
+			},
 		];
 
-		executeFunctions.getNode.mockReturnValue({ typeVersion: 2.1 } as any);
-		executeFunctions.getNodeParameter.calledWith('options').mockReturnValue({});
-		executeFunctions.getNodeParameter.calledWith('formTitle').mockReturnValue('Test Form');
-		executeFunctions.getNodeParameter
-			.calledWith('formDescription')
-			.mockReturnValue('Test Description');
-		executeFunctions.getNodeParameter.calledWith('responseMode').mockReturnValue('onReceived');
 		executeFunctions.getNodeParameter.calledWith('formFields.values').mockReturnValue(formFields);
 		executeFunctions.getResponseObject.mockReturnValue({ render: mockRender } as any);
-		executeFunctions.getRequestObject.mockReturnValue({ method: 'GET', query: {} } as any);
-		executeFunctions.getMode.mockReturnValue('manual');
-		executeFunctions.getInstanceId.mockReturnValue('instanceId');
-		executeFunctions.getBodyData.mockReturnValue({ data: {}, files: {} });
-		executeFunctions.getChildNodes.mockReturnValue([]);
 
 		await formWebhook(executeFunctions);
 
@@ -57,6 +127,7 @@ describe('FormTrigger, formWebhook', () => {
 			appendAttribution: true,
 			buttonLabel: 'Submit',
 			formDescription: 'Test Description',
+			formDescriptionMetadata: 'Test Description',
 			formFields: [
 				{
 					defaultValue: '',
@@ -99,6 +170,27 @@ describe('FormTrigger, formWebhook', () => {
 					multipleFiles: '',
 					placeholder: undefined,
 				},
+				{
+					id: 'field-4',
+					errorId: 'error-field-4',
+					label: 'Custom HTML',
+					inputRequired: '',
+					defaultValue: '',
+					placeholder: undefined,
+					html: '<div>Test HTML</div>',
+					isHtml: true,
+				},
+				{
+					id: 'field-5',
+					errorId: 'error-field-5',
+					hiddenName: 'Powerpuff Girl',
+					hiddenValue: 'Blossom',
+					label: 'Powerpuff Girl',
+					isHidden: true,
+					inputRequired: '',
+					defaultValue: '',
+					placeholder: undefined,
+				},
 			],
 			formSubmittedText: 'Your response has been recorded',
 			formTitle: 'Test Form',
@@ -110,8 +202,55 @@ describe('FormTrigger, formWebhook', () => {
 		});
 	});
 
+	it('should sanitize form descriptions', async () => {
+		const mockRender = jest.fn();
+
+		const formDescription = [
+			{ description: 'Test Description', expected: 'Test Description' },
+			{ description: '<i>hello</i>', expected: '<i>hello</i>' },
+			{ description: '<script>alert("hello world")</script>', expected: '' },
+		];
+		const formFields: FormFieldsParameter = [
+			{ fieldLabel: 'Name', fieldType: 'text', requiredField: true },
+		];
+
+		executeFunctions.getNodeParameter.calledWith('formFields.values').mockReturnValue(formFields);
+		executeFunctions.getResponseObject.mockReturnValue({ render: mockRender } as any);
+
+		for (const { description, expected } of formDescription) {
+			executeFunctions.getNodeParameter.calledWith('formDescription').mockReturnValue(description);
+
+			await formWebhook(executeFunctions);
+
+			expect(mockRender).toHaveBeenCalledWith('form-trigger', {
+				appendAttribution: true,
+				buttonLabel: 'Submit',
+				formDescription: expected,
+				formDescriptionMetadata: createDescriptionMetadata(expected),
+				formFields: [
+					{
+						defaultValue: '',
+						errorId: 'error-field-0',
+						id: 'field-0',
+						inputRequired: 'form-required',
+						isInput: true,
+						label: 'Name',
+						placeholder: undefined,
+						type: 'text',
+					},
+				],
+				formSubmittedText: 'Your response has been recorded',
+				formTitle: 'Test Form',
+				n8nWebsiteLink:
+					'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=instanceId',
+				testRun: true,
+				useResponseData: false,
+				validForm: true,
+			});
+		}
+	});
+
 	it('should return workflowData on POST request', async () => {
-		const executeFunctions = mock<IWebhookFunctions>();
 		const mockStatus = jest.fn();
 		const mockEnd = jest.fn();
 
@@ -125,15 +264,9 @@ describe('FormTrigger, formWebhook', () => {
 			'field-1': '30',
 		};
 
-		executeFunctions.getNode.mockReturnValue({ typeVersion: 2.1 } as any);
-		executeFunctions.getNodeParameter.calledWith('options').mockReturnValue({});
-		executeFunctions.getNodeParameter.calledWith('responseMode').mockReturnValue('onReceived');
-		executeFunctions.getChildNodes.mockReturnValue([]);
 		executeFunctions.getNodeParameter.calledWith('formFields.values').mockReturnValue(formFields);
 		executeFunctions.getResponseObject.mockReturnValue({ status: mockStatus, end: mockEnd } as any);
 		executeFunctions.getRequestObject.mockReturnValue({ method: 'POST' } as any);
-		executeFunctions.getMode.mockReturnValue('manual');
-		executeFunctions.getInstanceId.mockReturnValue('instanceId');
 		executeFunctions.getBodyData.mockReturnValue({ data: bodyData, files: {} });
 
 		const result = await formWebhook(executeFunctions);
@@ -184,9 +317,21 @@ describe('FormTrigger, prepareFormData', () => {
 				acceptFileTypes: '.jpg,.png',
 				multipleFiles: true,
 			},
+			{
+				fieldLabel: 'username',
+				fieldName: 'username',
+				fieldValue: 'powerpuffgirl125',
+				fieldType: 'hiddenField',
+			},
+			{
+				fieldLabel: 'villain',
+				fieldName: 'villain',
+				fieldValue: 'Mojo Dojo',
+				fieldType: 'hiddenField',
+			},
 		];
 
-		const query = { Name: 'John Doe', Email: 'john@example.com' };
+		const query = { Name: 'John Doe', Email: 'john@example.com', villain: 'princess morbucks' };
 
 		const result = prepareFormData({
 			formTitle: 'Test Form',
@@ -206,6 +351,7 @@ describe('FormTrigger, prepareFormData', () => {
 			validForm: true,
 			formTitle: 'Test Form',
 			formDescription: 'This is a test form',
+			formDescriptionMetadata: 'This is a test form',
 			formSubmittedText: 'Thank you for your submission',
 			n8nWebsiteLink:
 				'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger&utm_campaign=test-instance',
@@ -251,6 +397,28 @@ describe('FormTrigger, prepareFormData', () => {
 					acceptFileTypes: '.jpg,.png',
 					multipleFiles: 'multiple',
 				},
+				{
+					id: 'field-4',
+					errorId: 'error-field-4',
+					label: 'username',
+					inputRequired: '',
+					defaultValue: '',
+					placeholder: undefined,
+					hiddenName: 'username',
+					hiddenValue: 'powerpuffgirl125',
+					isHidden: true,
+				},
+				{
+					id: 'field-5',
+					errorId: 'error-field-5',
+					label: 'villain',
+					inputRequired: '',
+					defaultValue: 'princess morbucks',
+					placeholder: undefined,
+					hiddenName: 'villain',
+					isHidden: true,
+					hiddenValue: 'princess morbucks',
+				},
 			],
 			useResponseData: true,
 			appendAttribution: true,
@@ -285,6 +453,7 @@ describe('FormTrigger, prepareFormData', () => {
 			validForm: true,
 			formTitle: 'Test Form',
 			formDescription: 'This is a test form',
+			formDescriptionMetadata: 'This is a test form',
 			formSubmittedText: 'Your response has been recorded',
 			n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
 			formFields: [
@@ -574,6 +743,22 @@ describe('prepareFormReturnItem', () => {
 
 		expect(result.json.formQueryParameters).toEqual(staticData);
 	});
+
+	it('should return html if field name is set', async () => {
+		mockContext.getBodyData.mockReturnValue({
+			data: { 'field-0': '<div>hi</div>', 'field-1': '<h1><haha/hi>' },
+			files: {},
+		});
+
+		const formFields = [
+			{ fieldLabel: '', elementName: 'greeting', fieldType: 'html' },
+			{ fieldLabel: '', elementName: '', fieldType: 'html' },
+		];
+		const result = await prepareFormReturnItem(mockContext, formFields, 'production');
+
+		expect(result.json.greeting).toBe('<div>hi</div>');
+		expect(result.json.formMode).toBe('production');
+	});
 });
 
 describe('resolveRawData', () => {
@@ -721,3 +906,36 @@ describe('resolveRawData', () => {
 		);
 	});
 });
+
+describe('FormTrigger, isFormConnected', () => {
+	it('should return false if Wait node is connected but resume parameter is not form', async () => {
+		const result = isFormConnected([
+			mock<NodeTypeAndVersion>({
+				type: 'n8n-nodes-base.wait',
+				parameters: {
+					resume: 'timeInterval',
+				},
+			}),
+		]);
+		expect(result).toBe(false);
+	});
+	it('should return true if Wait node is connected and resume parameter is form', async () => {
+		const result = isFormConnected([
+			mock<NodeTypeAndVersion>({
+				type: 'n8n-nodes-base.wait',
+				parameters: {
+					resume: 'form',
+				},
+			}),
+		]);
+		expect(result).toBe(true);
+	});
+	it('should return true if Form node is connected', async () => {
+		const result = isFormConnected([
+			mock<NodeTypeAndVersion>({
+				type: 'n8n-nodes-base.form',
+			}),
+		]);
+		expect(result).toBe(true);
+	});
+});
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 87dda98f88..114ccef35a 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -16,6 +16,7 @@ import {
 	WAIT_NODE_TYPE,
 	jsonParse,
 } from 'n8n-workflow';
+import sanitize from 'sanitize-html';
 
 import type { FormTriggerData, FormTriggerInput } from './interfaces';
 import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from './interfaces';
@@ -23,6 +24,60 @@ import { getResolvables } from '../../utils/utilities';
 import { WebhookAuthorizationError } from '../Webhook/error';
 import { validateWebhookAuthentication } from '../Webhook/utils';
 
+export function sanitizeHtml(text: string) {
+	return sanitize(text, {
+		allowedTags: [
+			'b',
+			'div',
+			'i',
+			'iframe',
+			'img',
+			'video',
+			'source',
+			'em',
+			'strong',
+			'a',
+			'h1',
+			'h2',
+			'h3',
+			'h4',
+			'h5',
+			'h6',
+			'u',
+			'sub',
+			'sup',
+			'code',
+			'pre',
+			'span',
+			'br',
+			'ul',
+			'ol',
+			'li',
+			'p',
+		],
+		allowedAttributes: {
+			a: ['href', 'target', 'rel'],
+			img: ['src', 'alt', 'width', 'height'],
+			video: ['*'],
+			iframe: ['*'],
+			source: ['*'],
+		},
+		transformTags: {
+			iframe: sanitize.simpleTransform('iframe', {
+				sandbox: '',
+				referrerpolicy: 'strict-origin-when-cross-origin',
+				allow: 'fullscreen; autoplay; encrypted-media',
+			}),
+		},
+	});
+}
+
+export function createDescriptionMetadata(description: string) {
+	return description === ''
+		? 'n8n form'
+		: description.replace(/^\s*\n+|<\/?[^>]+(>|$)/g, '').slice(0, 150);
+}
+
 export function prepareFormData({
 	formTitle,
 	formDescription,
@@ -63,6 +118,7 @@ export function prepareFormData({
 		validForm,
 		formTitle,
 		formDescription,
+		formDescriptionMetadata: createDescriptionMetadata(formDescription),
 		formSubmittedHeader,
 		formSubmittedText,
 		n8nWebsiteLink,
@@ -112,6 +168,14 @@ export function prepareFormData({
 			input.selectOptions = fieldOptions.map((e) => e.option);
 		} else if (fieldType === 'textarea') {
 			input.isTextarea = true;
+		} else if (fieldType === 'html') {
+			input.isHtml = true;
+			input.html = field.html as string;
+		} else if (fieldType === 'hiddenField') {
+			input.isHidden = true;
+			input.hiddenName = field.fieldName as string;
+			input.hiddenValue =
+				input.defaultValue === '' ? (field.fieldValue as string) : input.defaultValue;
 		} else {
 			input.isInput = true;
 			input.type = fieldType as 'text' | 'number' | 'date' | 'email';
@@ -123,7 +187,7 @@ export function prepareFormData({
 	return formData;
 }
 
-const checkResponseModeConfiguration = (context: IWebhookFunctions) => {
+const validateResponseModeConfiguration = (context: IWebhookFunctions) => {
 	const responseMode = context.getNodeParameter('responseMode', 'onReceived') as string;
 	const connectedNodes = context.getChildNodes(context.getNode().name);
 
@@ -220,6 +284,13 @@ export async function prepareFormReturnItem(
 			continue;
 		}
 
+		if (field.fieldType === 'html') {
+			if (field.elementName) {
+				returnItem.json[field.elementName as string] = value;
+			}
+			continue;
+		}
+
 		if (field.fieldType === 'number') {
 			value = Number(value);
 		}
@@ -326,6 +397,13 @@ export function renderForm({
 	res.render('form-trigger', data);
 }
 
+export const isFormConnected = (nodes: NodeTypeAndVersion[]) => {
+	return nodes.some(
+		(n) =>
+			n.type === FORM_NODE_TYPE || (n.type === WAIT_NODE_TYPE && n.parameters?.resume === 'form'),
+	);
+};
+
 export async function formWebhook(
 	context: IWebhookFunctions,
 	authProperty = FORM_TRIGGER_AUTHENTICATION_PROPERTY,
@@ -365,15 +443,25 @@ export async function formWebhook(
 	}
 
 	const mode = context.getMode() === 'manual' ? 'test' : 'production';
-	const formFields = context.getNodeParameter('formFields.values', []) as FormFieldsParameter;
+	const formFields = (context.getNodeParameter('formFields.values', []) as FormFieldsParameter).map(
+		(field) => {
+			if (field.fieldType === 'html') {
+				field.html = sanitizeHtml(field.html as string);
+			}
+			if (field.fieldType === 'hiddenField') {
+				field.fieldLabel = field.fieldName as string;
+			}
+			return field;
+		},
+	);
 	const method = context.getRequestObject().method;
 
-	checkResponseModeConfiguration(context);
+	validateResponseModeConfiguration(context);
 
 	//Show the form on GET request
 	if (method === 'GET') {
 		const formTitle = context.getNodeParameter('formTitle', '') as string;
-		const formDescription = context.getNodeParameter('formDescription', '') as string;
+		const formDescription = sanitizeHtml(context.getNodeParameter('formDescription', '') as string);
 		const responseMode = context.getNodeParameter('responseMode', '') as string;
 
 		let formSubmittedText;
@@ -403,10 +491,10 @@ export async function formWebhook(
 		}
 
 		if (!redirectUrl && node.type !== FORM_TRIGGER_NODE_TYPE) {
-			const connectedNodes = context.getChildNodes(context.getNode().name);
-			const hasNextPage = connectedNodes.some(
-				(n) => n.type === FORM_NODE_TYPE || n.type === WAIT_NODE_TYPE,
-			);
+			const connectedNodes = context.getChildNodes(context.getNode().name, {
+				includeNodeParameters: true,
+			});
+			const hasNextPage = isFormConnected(connectedNodes);
 
 			if (hasNextPage) {
 				redirectUrl = context.evaluateExpression('{{ $execution.resumeFormUrl }}') as string;
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 1345725a69..ef676df597 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -81,6 +81,7 @@ export class Freshdesk implements INodeType {
 		defaults: {
 			name: 'Freshdesk',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..cb13f264f8
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,72 @@
+{
+    "type": "object",
+    "properties": {
+        "active": {
+            "type": "boolean"
+        },
+        "email": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "null"
+        },
+        "time_zone": {
+            "type": "string"
+        },
+        "twitter_id": {
+            "type": "null"
+        },
+        "facebook_id": {
+            "type": "null"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "unique_external_id": {
+            "type": "null"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "last_name": {
+            "type": "string"
+        },
+        "visitor_id": {
+            "type": "string"
+        },
+        "org_contact_id": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "active",
+        "address",
+        "description",
+        "email",
+        "id",
+        "job_title",
+        "language",
+        "mobile",
+        "name",
+        "phone",
+        "time_zone",
+        "twitter_id",
+        "custom_fields",
+        "facebook_id",
+        "created_at",
+        "updated_at",
+        "csat_rating",
+        "preferred_source",
+        "company_id",
+        "unique_external_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/create.json b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/create.json
new file mode 100644
index 0000000000..e27cf0000a
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/create.json
@@ -0,0 +1,99 @@
+{
+    "type": "object",
+    "properties": {
+        "fr_escalated": {
+            "type": "boolean"
+        },
+        "spam": {
+            "type": "boolean"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "source": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "integer"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "support_email": {
+            "type": "null"
+        },
+        "to_emails": {
+            "type": "null"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "is_escalated": {
+            "type": "boolean"
+        },
+        "description": {
+            "type": "string"
+        },
+        "description_text": {
+            "type": "string"
+        },
+        "custom_fields": {
+            "type": "object",
+            "properties": {
+                "cf_reference_number": {
+                    "type": "null"
+                }
+            }
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "form_id": {
+            "type": "integer"
+        },
+        "nr_due_by": {
+            "type": "null"
+        },
+        "nr_escalated": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "cc_emails",
+        "fwd_emails",
+        "reply_cc_emails",
+        "ticket_cc_emails",
+        "fr_escalated",
+        "spam",
+        "email_config_id",
+        "group_id",
+        "priority",
+        "requester_id",
+        "responder_id",
+        "source",
+        "company_id",
+        "status",
+        "subject",
+        "support_email",
+        "to_emails",
+        "product_id",
+        "id",
+        "type",
+        "due_by",
+        "fr_due_by",
+        "is_escalated",
+        "description",
+        "description_text",
+        "custom_fields",
+        "created_at",
+        "updated_at",
+        "tags",
+        "attachments"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/get.json b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/get.json
new file mode 100644
index 0000000000..82d7ace13e
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/get.json
@@ -0,0 +1,160 @@
+{
+    "type": "object",
+    "properties": {
+        "cc_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "fwd_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "reply_cc_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "ticket_cc_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "fr_escalated": {
+            "type": "boolean"
+        },
+        "spam": {
+            "type": "boolean"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "source": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "integer"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "association_type": {
+            "type": "null"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "due_by": {
+            "type": "string"
+        },
+        "fr_due_by": {
+            "type": "string"
+        },
+        "is_escalated": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "description": {
+            "type": "string"
+        },
+        "description_text": {
+            "type": "string"
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "content_type": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "attachment_url": {
+                        "type": "string"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "content_type",
+                    "size",
+                    "name",
+                    "attachment_url",
+                    "created_at",
+                    "updated_at"
+                ]
+            }
+        },
+        "source_additional_info": {
+            "type": "null"
+        },
+        "nr_due_by": {
+            "type": "null"
+        },
+        "nr_escalated": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "cc_emails",
+        "fwd_emails",
+        "reply_cc_emails",
+        "ticket_cc_emails",
+        "fr_escalated",
+        "spam",
+        "email_config_id",
+        "group_id",
+        "priority",
+        "requester_id",
+        "responder_id",
+        "source",
+        "company_id",
+        "status",
+        "subject",
+        "association_type",
+        "support_email",
+        "to_emails",
+        "product_id",
+        "id",
+        "type",
+        "due_by",
+        "fr_due_by",
+        "is_escalated",
+        "custom_fields",
+        "created_at",
+        "updated_at",
+        "tags"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/getAll.json b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/getAll.json
new file mode 100644
index 0000000000..04c3a86d3d
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshdesk/__schema__/v1.0.0/ticket/getAll.json
@@ -0,0 +1,102 @@
+{
+    "type": "object",
+    "properties": {
+        "cc_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "reply_cc_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "ticket_cc_emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "fr_escalated": {
+            "type": "boolean"
+        },
+        "spam": {
+            "type": "boolean"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "source": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "integer"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "due_by": {
+            "type": "string"
+        },
+        "fr_due_by": {
+            "type": "string"
+        },
+        "is_escalated": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "associated_tickets_count": {
+            "type": "null"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "cc_emails",
+        "fwd_emails",
+        "reply_cc_emails",
+        "ticket_cc_emails",
+        "fr_escalated",
+        "spam",
+        "email_config_id",
+        "group_id",
+        "priority",
+        "requester_id",
+        "responder_id",
+        "source",
+        "company_id",
+        "status",
+        "subject",
+        "association_type",
+        "support_email",
+        "to_emails",
+        "product_id",
+        "id",
+        "type",
+        "due_by",
+        "fr_due_by",
+        "is_escalated",
+        "custom_fields",
+        "created_at",
+        "updated_at",
+        "associated_tickets_count",
+        "tags"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index d2dd220e04..c6e4698294 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
@@ -69,6 +69,7 @@ export class Freshservice implements INodeType {
 		defaults: {
 			name: 'Freshservice',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Freshservice/__schema__/v1.0.0/ticket/get.json b/packages/nodes-base/nodes/Freshservice/__schema__/v1.0.0/ticket/get.json
new file mode 100644
index 0000000000..b31b93c601
--- /dev/null
+++ b/packages/nodes-base/nodes/Freshservice/__schema__/v1.0.0/ticket/get.json
@@ -0,0 +1,199 @@
+{
+	"type": "object",
+	"properties": {
+		"subject": {
+			"type": "string"
+		},
+		"requester_id": {
+			"type": "integer"
+		},
+		"due_by": {
+			"type": "string"
+		},
+		"fr_escalated": {
+			"type": "boolean"
+		},
+		"deleted": {
+			"type": "boolean"
+		},
+		"spam": {
+			"type": "boolean"
+		},
+		"reply_cc_emails": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"cc_emails": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"is_escalated": {
+			"type": "boolean"
+		},
+		"fr_due_by": {
+			"type": "string"
+		},
+		"id": {
+			"type": "integer"
+		},
+		"priority": {
+			"type": "integer"
+		},
+		"status": {
+			"type": "integer"
+		},
+		"source": {
+			"type": "integer"
+		},
+		"created_at": {
+			"type": "string"
+		},
+		"updated_at": {
+			"type": "string"
+		},
+		"workspace_id": {
+			"type": "integer"
+		},
+		"requested_for_id": {
+			"type": "integer"
+		},
+		"type": {
+			"type": "string"
+		},
+		"description": {
+			"type": "string"
+		},
+		"description_text": {
+			"type": "string"
+		},
+		"custom_fields": {
+			"type": "object",
+			"properties": {
+				"major_incident_type": {
+					"type": "null"
+				},
+				"business_impact": {
+					"type": "null"
+				},
+				"impacted_locations": {
+					"type": "null"
+				},
+				"no_of_customers_impacted": {
+					"type": "null"
+				},
+				"ticket_has_been_triaged": {
+					"type": "null"
+				}
+			}
+		},
+		"tasks_dependency_type": {
+			"type": "integer"
+		},
+		"sla_policy_id": {
+			"type": "integer"
+		},
+		"impact": {
+			"type": "integer"
+		},
+		"urgency": {
+			"type": "integer"
+		},
+		"applied_business_hours": {
+			"type": "integer"
+		},
+		"created_within_business_hours": {
+			"type": "boolean"
+		},
+		"resolution_notes": {
+			"type": "null"
+		},
+		"resolution_notes_html": {
+			"type": "null"
+		},
+		"attachments": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"attachment_url": {
+						"type": "string"
+					},
+					"content_type": {
+						"type": "string"
+					},
+					"created_at": {
+						"type": "string"
+					},
+					"id": {
+						"type": "integer"
+					},
+					"name": {
+						"type": "string"
+					},
+					"size": {
+						"type": "integer"
+					},
+					"updated_at": {
+						"type": "string"
+					}
+				},
+				"required": [
+					"attachment_url",
+					"content_type",
+					"created_at",
+					"id",
+					"name",
+					"size",
+					"updated_at"
+				]
+			}
+		}
+	},
+	"required": [
+		"subject",
+		"group_id",
+		"department_id",
+		"category",
+		"sub_category",
+		"item_category",
+		"requester_id",
+		"responder_id",
+		"due_by",
+		"fr_escalated",
+		"deleted",
+		"spam",
+		"email_config_id",
+		"fwd_emails",
+		"reply_cc_emails",
+		"cc_emails",
+		"is_escalated",
+		"fr_due_by",
+		"id",
+		"priority",
+		"status",
+		"source",
+		"created_at",
+		"updated_at",
+		"workspace_id",
+		"requested_for_id",
+		"to_emails",
+		"type",
+		"description",
+		"description_text",
+		"custom_fields",
+		"tasks_dependency_type",
+		"sla_policy_id",
+		"impact",
+		"urgency",
+		"bcc_emails",
+		"applied_business_hours",
+		"created_within_business_hours",
+		"resolution_notes",
+		"resolution_notes_html",
+		"attachments"
+	]
+}
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
index 3e8a246fbd..3ad23f073e 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
@@ -50,6 +50,7 @@ export class FreshworksCrm implements INodeType {
 		defaults: {
 			name: 'Freshworks CRM',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 682eee343c..a5d34e4a14 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -19,7 +19,7 @@ import type { Readable } from 'stream';
 import { pipeline } from 'stream/promises';
 import { file as tmpFile } from 'tmp-promise';
 
-import { formatPrivateKey, generatePairedItemData } from '@utils/utilities';
+import { formatPrivateKey } from '@utils/utilities';
 
 interface ReturnFtpItem {
 	type: string;
@@ -550,9 +550,7 @@ export class Ftp implements INodeType {
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					const pairedItem = generatePairedItemData(items.length);
-
-					return [[{ json: { error: error.message }, pairedItem }]];
+					return [[{ json: { error: error.message } }]];
 				}
 				throw error;
 			}
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index 74a54e61d2..63bea6e9f7 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -26,6 +26,7 @@ export class GetResponse implements INodeType {
 		defaults: {
 			name: 'GetResponse',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/GetResponse/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/GetResponse/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..6a6e5ce74c
--- /dev/null
+++ b/packages/nodes-base/nodes/GetResponse/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,71 @@
+{
+    "type": "object",
+    "properties": {
+        "contactId": {
+            "type": "string"
+        },
+        "href": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "note": {
+            "type": "null"
+        },
+        "origin": {
+            "type": "string"
+        },
+        "changedOn": {
+            "type": "string"
+        },
+        "timeZone": {
+            "type": "string"
+        },
+        "ipAddress": {
+            "type": "string"
+        },
+        "activities": {
+            "type": "string"
+        },
+        "campaign": {
+            "type": "object",
+            "properties": {
+                "campaignId": {
+                    "type": "string"
+                },
+                "href": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "campaignId",
+                "href",
+                "name"
+            ]
+        },
+        "createdOn": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "contactId",
+        "href",
+        "name",
+        "email",
+        "note",
+        "origin",
+        "dayOfCycle",
+        "changedOn",
+        "timeZone",
+        "ipAddress",
+        "activities",
+        "campaign",
+        "createdOn",
+        "scoring",
+        "engagementScore"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index a28e40ae5d..819f4cd2aa 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -25,6 +25,7 @@ export class Ghost implements INodeType {
 		defaults: {
 			name: 'Ghost',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Ghost/__schema__/v1.0.0/post/create.json b/packages/nodes-base/nodes/Ghost/__schema__/v1.0.0/post/create.json
new file mode 100644
index 0000000000..7d9cf36efc
--- /dev/null
+++ b/packages/nodes-base/nodes/Ghost/__schema__/v1.0.0/post/create.json
@@ -0,0 +1,470 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "uuid": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "lexical": {
+            "type": "string"
+        },
+        "comment_id": {
+            "type": "string"
+        },
+        "feature_image": {
+            "type": "null"
+        },
+        "featured": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "custom_excerpt": {
+            "type": "null"
+        },
+        "codeinjection_head": {
+            "type": "null"
+        },
+        "codeinjection_foot": {
+            "type": "null"
+        },
+        "custom_template": {
+            "type": "null"
+        },
+        "canonical_url": {
+            "type": "null"
+        },
+        "authors": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    },
+                    "email": {
+                        "type": "string"
+                    },
+                    "cover_image": {
+                        "type": "null"
+                    },
+                    "bio": {
+                        "type": "null"
+                    },
+                    "website": {
+                        "type": "null"
+                    },
+                    "location": {
+                        "type": "null"
+                    },
+                    "facebook": {
+                        "type": "null"
+                    },
+                    "twitter": {
+                        "type": "null"
+                    },
+                    "accessibility": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "meta_title": {
+                        "type": "null"
+                    },
+                    "meta_description": {
+                        "type": "null"
+                    },
+                    "tour": {
+                        "type": "null"
+                    },
+                    "last_seen": {
+                        "type": "string"
+                    },
+                    "comment_notifications": {
+                        "type": "boolean"
+                    },
+                    "free_member_signup_notification": {
+                        "type": "boolean"
+                    },
+                    "paid_subscription_started_notification": {
+                        "type": "boolean"
+                    },
+                    "paid_subscription_canceled_notification": {
+                        "type": "boolean"
+                    },
+                    "mention_notifications": {
+                        "type": "boolean"
+                    },
+                    "recommendation_notifications": {
+                        "type": "boolean"
+                    },
+                    "milestone_notifications": {
+                        "type": "boolean"
+                    },
+                    "donation_notifications": {
+                        "type": "boolean"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "roles": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                },
+                                "description": {
+                                    "type": "string"
+                                },
+                                "created_at": {
+                                    "type": "string"
+                                },
+                                "updated_at": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "name",
+                                "description",
+                                "created_at",
+                                "updated_at"
+                            ]
+                        }
+                    },
+                    "url": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug",
+                    "email",
+                    "profile_image",
+                    "cover_image",
+                    "bio",
+                    "website",
+                    "location",
+                    "facebook",
+                    "twitter",
+                    "accessibility",
+                    "status",
+                    "meta_title",
+                    "meta_description",
+                    "tour",
+                    "last_seen",
+                    "comment_notifications",
+                    "created_at",
+                    "updated_at",
+                    "roles",
+                    "url"
+                ]
+            }
+        },
+        "tiers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    },
+                    "active": {
+                        "type": "boolean"
+                    },
+                    "welcome_page_url": {
+                        "type": "null"
+                    },
+                    "visibility": {
+                        "type": "string"
+                    },
+                    "trial_days": {
+                        "type": "integer"
+                    },
+                    "description": {
+                        "type": "null"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "monthly_price_id": {
+                        "type": "null"
+                    },
+                    "yearly_price_id": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug",
+                    "active",
+                    "welcome_page_url",
+                    "visibility",
+                    "description",
+                    "type",
+                    "created_at",
+                    "updated_at",
+                    "monthly_price_id",
+                    "yearly_price_id"
+                ]
+            }
+        },
+        "count": {
+            "type": "object",
+            "properties": {
+                "clicks": {
+                    "type": "integer"
+                },
+                "positive_feedback": {
+                    "type": "integer"
+                },
+                "negative_feedback": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "clicks",
+                "positive_feedback",
+                "negative_feedback"
+            ]
+        },
+        "primary_author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "slug": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "cover_image": {
+                    "type": "null"
+                },
+                "bio": {
+                    "type": "null"
+                },
+                "website": {
+                    "type": "null"
+                },
+                "location": {
+                    "type": "null"
+                },
+                "facebook": {
+                    "type": "null"
+                },
+                "twitter": {
+                    "type": "null"
+                },
+                "accessibility": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "meta_title": {
+                    "type": "null"
+                },
+                "meta_description": {
+                    "type": "null"
+                },
+                "tour": {
+                    "type": "null"
+                },
+                "last_seen": {
+                    "type": "string"
+                },
+                "comment_notifications": {
+                    "type": "boolean"
+                },
+                "free_member_signup_notification": {
+                    "type": "boolean"
+                },
+                "paid_subscription_started_notification": {
+                    "type": "boolean"
+                },
+                "paid_subscription_canceled_notification": {
+                    "type": "boolean"
+                },
+                "mention_notifications": {
+                    "type": "boolean"
+                },
+                "recommendation_notifications": {
+                    "type": "boolean"
+                },
+                "milestone_notifications": {
+                    "type": "boolean"
+                },
+                "donation_notifications": {
+                    "type": "boolean"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                },
+                "roles": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "description": {
+                                "type": "string"
+                            },
+                            "created_at": {
+                                "type": "string"
+                            },
+                            "updated_at": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "name",
+                            "description",
+                            "created_at",
+                            "updated_at"
+                        ]
+                    }
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "slug",
+                "email",
+                "profile_image",
+                "cover_image",
+                "bio",
+                "website",
+                "location",
+                "facebook",
+                "twitter",
+                "accessibility",
+                "status",
+                "meta_title",
+                "meta_description",
+                "tour",
+                "last_seen",
+                "comment_notifications",
+                "created_at",
+                "updated_at",
+                "roles",
+                "url"
+            ]
+        },
+        "primary_tag": {
+            "type": "null"
+        },
+        "email_segment": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "og_title": {
+            "type": "null"
+        },
+        "og_description": {
+            "type": "null"
+        },
+        "twitter_title": {
+            "type": "null"
+        },
+        "twitter_description": {
+            "type": "null"
+        },
+        "meta_title": {
+            "type": "null"
+        },
+        "meta_description": {
+            "type": "null"
+        },
+        "email_subject": {
+            "type": "null"
+        },
+        "frontmatter": {
+            "type": "null"
+        },
+        "feature_image_alt": {
+            "type": "null"
+        },
+        "feature_image_caption": {
+            "type": "null"
+        },
+        "email_only": {
+            "type": "boolean"
+        },
+        "email": {
+            "type": "null"
+        },
+        "newsletter": {
+            "type": "null"
+        },
+        "reading_time": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
index 75b2631cbd..91528b1a6c 100644
--- a/packages/nodes-base/nodes/Git/Git.node.ts
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -31,6 +31,7 @@ export class Git implements INodeType {
 		defaults: {
 			name: 'Git',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 07b6826bb7..75ba137c7e 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -30,6 +30,7 @@ export class Github implements INodeType {
 		defaults: {
 			name: 'GitHub',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/create.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/create.json
new file mode 100644
index 0000000000..82610ec11c
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/create.json
@@ -0,0 +1,201 @@
+{
+    "type": "object",
+    "properties": {
+        "content": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "sha": {
+                    "type": "string"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "git_url": {
+                    "type": "string"
+                },
+                "download_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "_links": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "git": {
+                            "type": "string"
+                        },
+                        "html": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "git",
+                        "html"
+                    ]
+                }
+            },
+            "required": [
+                "name",
+                "path",
+                "sha",
+                "size",
+                "url",
+                "html_url",
+                "git_url",
+                "download_url",
+                "type",
+                "_links"
+            ]
+        },
+        "commit": {
+            "type": "object",
+            "properties": {
+                "sha": {
+                    "type": "string"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "author": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "date": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "email",
+                        "date"
+                    ]
+                },
+                "committer": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "date": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "email",
+                        "date"
+                    ]
+                },
+                "tree": {
+                    "type": "object",
+                    "properties": {
+                        "sha": {
+                            "type": "string"
+                        },
+                        "url": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "sha",
+                        "url"
+                    ]
+                },
+                "message": {
+                    "type": "string"
+                },
+                "parents": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "sha": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            },
+                            "html_url": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "sha",
+                            "url",
+                            "html_url"
+                        ]
+                    }
+                },
+                "verification": {
+                    "type": "object",
+                    "properties": {
+                        "verified": {
+                            "type": "boolean"
+                        },
+                        "reason": {
+                            "type": "string"
+                        },
+                        "signature": {
+                            "type": "null"
+                        },
+                        "payload": {
+                            "type": "null"
+                        },
+                        "verified_at": {
+                            "type": "null"
+                        }
+                    },
+                    "required": [
+                        "verified",
+                        "reason",
+                        "signature",
+                        "payload"
+                    ]
+                }
+            },
+            "required": [
+                "sha",
+                "node_id",
+                "url",
+                "html_url",
+                "author",
+                "committer",
+                "tree",
+                "message",
+                "parents",
+                "verification"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/edit.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/edit.json
new file mode 100644
index 0000000000..82610ec11c
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/edit.json
@@ -0,0 +1,201 @@
+{
+    "type": "object",
+    "properties": {
+        "content": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "sha": {
+                    "type": "string"
+                },
+                "size": {
+                    "type": "integer"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "git_url": {
+                    "type": "string"
+                },
+                "download_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "_links": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "git": {
+                            "type": "string"
+                        },
+                        "html": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "git",
+                        "html"
+                    ]
+                }
+            },
+            "required": [
+                "name",
+                "path",
+                "sha",
+                "size",
+                "url",
+                "html_url",
+                "git_url",
+                "download_url",
+                "type",
+                "_links"
+            ]
+        },
+        "commit": {
+            "type": "object",
+            "properties": {
+                "sha": {
+                    "type": "string"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "author": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "date": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "email",
+                        "date"
+                    ]
+                },
+                "committer": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "date": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "email",
+                        "date"
+                    ]
+                },
+                "tree": {
+                    "type": "object",
+                    "properties": {
+                        "sha": {
+                            "type": "string"
+                        },
+                        "url": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "sha",
+                        "url"
+                    ]
+                },
+                "message": {
+                    "type": "string"
+                },
+                "parents": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "sha": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            },
+                            "html_url": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "sha",
+                            "url",
+                            "html_url"
+                        ]
+                    }
+                },
+                "verification": {
+                    "type": "object",
+                    "properties": {
+                        "verified": {
+                            "type": "boolean"
+                        },
+                        "reason": {
+                            "type": "string"
+                        },
+                        "signature": {
+                            "type": "null"
+                        },
+                        "payload": {
+                            "type": "null"
+                        },
+                        "verified_at": {
+                            "type": "null"
+                        }
+                    },
+                    "required": [
+                        "verified",
+                        "reason",
+                        "signature",
+                        "payload"
+                    ]
+                }
+            },
+            "required": [
+                "sha",
+                "node_id",
+                "url",
+                "html_url",
+                "author",
+                "committer",
+                "tree",
+                "message",
+                "parents",
+                "verification"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/get.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/get.json
new file mode 100644
index 0000000000..d74ca04b17
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/get.json
@@ -0,0 +1,8 @@
+{
+	"type": "object",
+	"properties": {
+		"type": {
+			"type": "string"
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/list.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/list.json
new file mode 100644
index 0000000000..9cead63e56
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/file/list.json
@@ -0,0 +1,48 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "path": {
+            "type": "string"
+        },
+        "sha": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "url": {
+            "type": "string"
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "git_url": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "git": {
+                    "type": "string"
+                },
+                "html": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "git",
+                "html"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/create.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/create.json
new file mode 100644
index 0000000000..18f1504ad1
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/create.json
@@ -0,0 +1,348 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "repository_url": {
+            "type": "string"
+        },
+        "labels_url": {
+            "type": "string"
+        },
+        "comments_url": {
+            "type": "string"
+        },
+        "events_url": {
+            "type": "string"
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "number": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "node_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "node_id",
+                    "url",
+                    "name",
+                    "color",
+                    "default",
+                    "description"
+                ]
+            }
+        },
+        "state": {
+            "type": "string"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "login": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "node_id": {
+                        "type": "string"
+                    },
+                    "avatar_url": {
+                        "type": "string"
+                    },
+                    "gravatar_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "html_url": {
+                        "type": "string"
+                    },
+                    "followers_url": {
+                        "type": "string"
+                    },
+                    "following_url": {
+                        "type": "string"
+                    },
+                    "gists_url": {
+                        "type": "string"
+                    },
+                    "starred_url": {
+                        "type": "string"
+                    },
+                    "subscriptions_url": {
+                        "type": "string"
+                    },
+                    "organizations_url": {
+                        "type": "string"
+                    },
+                    "repos_url": {
+                        "type": "string"
+                    },
+                    "events_url": {
+                        "type": "string"
+                    },
+                    "received_events_url": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "site_admin": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "login",
+                    "id",
+                    "node_id",
+                    "avatar_url",
+                    "gravatar_id",
+                    "url",
+                    "html_url",
+                    "followers_url",
+                    "following_url",
+                    "gists_url",
+                    "starred_url",
+                    "subscriptions_url",
+                    "organizations_url",
+                    "repos_url",
+                    "events_url",
+                    "received_events_url",
+                    "type",
+                    "site_admin"
+                ]
+            }
+        },
+        "milestone": {
+            "type": "null"
+        },
+        "comments": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "closed_at": {
+            "type": "null"
+        },
+        "author_association": {
+            "type": "string"
+        },
+        "active_lock_reason": {
+            "type": "null"
+        },
+        "closed_by": {
+            "type": "null"
+        },
+        "reactions": {
+            "type": "object",
+            "properties": {
+                "url": {
+                    "type": "string"
+                },
+                "total_count": {
+                    "type": "integer"
+                },
+                "+1": {
+                    "type": "integer"
+                },
+                "-1": {
+                    "type": "integer"
+                },
+                "laugh": {
+                    "type": "integer"
+                },
+                "hooray": {
+                    "type": "integer"
+                },
+                "confused": {
+                    "type": "integer"
+                },
+                "heart": {
+                    "type": "integer"
+                },
+                "rocket": {
+                    "type": "integer"
+                },
+                "eyes": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "url",
+                "total_count",
+                "+1",
+                "-1",
+                "laugh",
+                "hooray",
+                "confused",
+                "heart",
+                "rocket",
+                "eyes"
+            ]
+        },
+        "timeline_url": {
+            "type": "string"
+        },
+        "performed_via_github_app": {
+            "type": "null"
+        },
+        "state_reason": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "url",
+        "repository_url",
+        "labels_url",
+        "comments_url",
+        "events_url",
+        "html_url",
+        "id",
+        "node_id",
+        "number",
+        "title",
+        "user",
+        "labels",
+        "state",
+        "locked",
+        "assignee",
+        "assignees",
+        "milestone",
+        "comments",
+        "created_at",
+        "updated_at",
+        "closed_at",
+        "author_association",
+        "active_lock_reason",
+        "body",
+        "closed_by",
+        "reactions",
+        "timeline_url",
+        "performed_via_github_app",
+        "state_reason"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/createComment.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/createComment.json
new file mode 100644
index 0000000000..34175f8c63
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/createComment.json
@@ -0,0 +1,178 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "issue_url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "user_view_type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "author_association": {
+            "type": "string"
+        },
+        "body": {
+            "type": "string"
+        },
+        "reactions": {
+            "type": "object",
+            "properties": {
+                "url": {
+                    "type": "string"
+                },
+                "total_count": {
+                    "type": "integer"
+                },
+                "+1": {
+                    "type": "integer"
+                },
+                "-1": {
+                    "type": "integer"
+                },
+                "laugh": {
+                    "type": "integer"
+                },
+                "hooray": {
+                    "type": "integer"
+                },
+                "confused": {
+                    "type": "integer"
+                },
+                "heart": {
+                    "type": "integer"
+                },
+                "rocket": {
+                    "type": "integer"
+                },
+                "eyes": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "url",
+                "total_count",
+                "+1",
+                "-1",
+                "laugh",
+                "hooray",
+                "confused",
+                "heart",
+                "rocket",
+                "eyes"
+            ]
+        },
+        "performed_via_github_app": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "url",
+        "html_url",
+        "issue_url",
+        "id",
+        "node_id",
+        "user",
+        "created_at",
+        "updated_at",
+        "author_association",
+        "body",
+        "reactions",
+        "performed_via_github_app"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/get.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/get.json
new file mode 100644
index 0000000000..a379346ecc
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/issue/get.json
@@ -0,0 +1,342 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "repository_url": {
+            "type": "string"
+        },
+        "labels_url": {
+            "type": "string"
+        },
+        "comments_url": {
+            "type": "string"
+        },
+        "events_url": {
+            "type": "string"
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "number": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "user_view_type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "node_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "node_id",
+                    "url",
+                    "name",
+                    "color",
+                    "default",
+                    "description"
+                ]
+            }
+        },
+        "state": {
+            "type": "string"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "login": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "node_id": {
+                        "type": "string"
+                    },
+                    "avatar_url": {
+                        "type": "string"
+                    },
+                    "gravatar_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "html_url": {
+                        "type": "string"
+                    },
+                    "followers_url": {
+                        "type": "string"
+                    },
+                    "following_url": {
+                        "type": "string"
+                    },
+                    "gists_url": {
+                        "type": "string"
+                    },
+                    "starred_url": {
+                        "type": "string"
+                    },
+                    "subscriptions_url": {
+                        "type": "string"
+                    },
+                    "organizations_url": {
+                        "type": "string"
+                    },
+                    "repos_url": {
+                        "type": "string"
+                    },
+                    "events_url": {
+                        "type": "string"
+                    },
+                    "received_events_url": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "user_view_type": {
+                        "type": "string"
+                    },
+                    "site_admin": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "login",
+                    "id",
+                    "node_id",
+                    "avatar_url",
+                    "gravatar_id",
+                    "url",
+                    "html_url",
+                    "followers_url",
+                    "following_url",
+                    "gists_url",
+                    "starred_url",
+                    "subscriptions_url",
+                    "organizations_url",
+                    "repos_url",
+                    "events_url",
+                    "received_events_url",
+                    "type",
+                    "site_admin"
+                ]
+            }
+        },
+        "comments": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "author_association": {
+            "type": "string"
+        },
+        "active_lock_reason": {
+            "type": "null"
+        },
+        "reactions": {
+            "type": "object",
+            "properties": {
+                "url": {
+                    "type": "string"
+                },
+                "total_count": {
+                    "type": "integer"
+                },
+                "+1": {
+                    "type": "integer"
+                },
+                "-1": {
+                    "type": "integer"
+                },
+                "laugh": {
+                    "type": "integer"
+                },
+                "hooray": {
+                    "type": "integer"
+                },
+                "confused": {
+                    "type": "integer"
+                },
+                "heart": {
+                    "type": "integer"
+                },
+                "rocket": {
+                    "type": "integer"
+                },
+                "eyes": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "url",
+                "total_count",
+                "+1",
+                "-1",
+                "laugh",
+                "hooray",
+                "confused",
+                "heart",
+                "rocket",
+                "eyes"
+            ]
+        },
+        "timeline_url": {
+            "type": "string"
+        },
+        "performed_via_github_app": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "url",
+        "repository_url",
+        "labels_url",
+        "comments_url",
+        "events_url",
+        "html_url",
+        "id",
+        "node_id",
+        "number",
+        "title",
+        "user",
+        "labels",
+        "state",
+        "locked",
+        "assignee",
+        "assignees",
+        "milestone",
+        "comments",
+        "created_at",
+        "updated_at",
+        "closed_at",
+        "author_association",
+        "active_lock_reason",
+        "body",
+        "closed_by",
+        "reactions",
+        "timeline_url",
+        "performed_via_github_app",
+        "state_reason"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/organization/getRepositories.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/organization/getRepositories.json
new file mode 100644
index 0000000000..ae769d612c
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/organization/getRepositories.json
@@ -0,0 +1,339 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "user_view_type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "fork": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "forks_url": {
+            "type": "string"
+        },
+        "keys_url": {
+            "type": "string"
+        },
+        "collaborators_url": {
+            "type": "string"
+        },
+        "teams_url": {
+            "type": "string"
+        },
+        "hooks_url": {
+            "type": "string"
+        },
+        "issue_events_url": {
+            "type": "string"
+        },
+        "events_url": {
+            "type": "string"
+        },
+        "assignees_url": {
+            "type": "string"
+        },
+        "branches_url": {
+            "type": "string"
+        },
+        "tags_url": {
+            "type": "string"
+        },
+        "blobs_url": {
+            "type": "string"
+        },
+        "git_tags_url": {
+            "type": "string"
+        },
+        "git_refs_url": {
+            "type": "string"
+        },
+        "trees_url": {
+            "type": "string"
+        },
+        "statuses_url": {
+            "type": "string"
+        },
+        "languages_url": {
+            "type": "string"
+        },
+        "stargazers_url": {
+            "type": "string"
+        },
+        "contributors_url": {
+            "type": "string"
+        },
+        "subscribers_url": {
+            "type": "string"
+        },
+        "subscription_url": {
+            "type": "string"
+        },
+        "commits_url": {
+            "type": "string"
+        },
+        "git_commits_url": {
+            "type": "string"
+        },
+        "comments_url": {
+            "type": "string"
+        },
+        "issue_comment_url": {
+            "type": "string"
+        },
+        "contents_url": {
+            "type": "string"
+        },
+        "compare_url": {
+            "type": "string"
+        },
+        "merges_url": {
+            "type": "string"
+        },
+        "archive_url": {
+            "type": "string"
+        },
+        "downloads_url": {
+            "type": "string"
+        },
+        "issues_url": {
+            "type": "string"
+        },
+        "pulls_url": {
+            "type": "string"
+        },
+        "milestones_url": {
+            "type": "string"
+        },
+        "notifications_url": {
+            "type": "string"
+        },
+        "labels_url": {
+            "type": "string"
+        },
+        "releases_url": {
+            "type": "string"
+        },
+        "deployments_url": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "pushed_at": {
+            "type": "string"
+        },
+        "git_url": {
+            "type": "string"
+        },
+        "ssh_url": {
+            "type": "string"
+        },
+        "clone_url": {
+            "type": "string"
+        },
+        "svn_url": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "stargazers_count": {
+            "type": "integer"
+        },
+        "watchers_count": {
+            "type": "integer"
+        },
+        "has_issues": {
+            "type": "boolean"
+        },
+        "has_projects": {
+            "type": "boolean"
+        },
+        "has_downloads": {
+            "type": "boolean"
+        },
+        "has_wiki": {
+            "type": "boolean"
+        },
+        "has_pages": {
+            "type": "boolean"
+        },
+        "has_discussions": {
+            "type": "boolean"
+        },
+        "forks_count": {
+            "type": "integer"
+        },
+        "mirror_url": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "disabled": {
+            "type": "boolean"
+        },
+        "open_issues_count": {
+            "type": "integer"
+        },
+        "allow_forking": {
+            "type": "boolean"
+        },
+        "is_template": {
+            "type": "boolean"
+        },
+        "web_commit_signoff_required": {
+            "type": "boolean"
+        },
+        "topics": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "forks": {
+            "type": "integer"
+        },
+        "open_issues": {
+            "type": "integer"
+        },
+        "watchers": {
+            "type": "integer"
+        },
+        "default_branch": {
+            "type": "string"
+        },
+        "permissions": {
+            "type": "object",
+            "properties": {
+                "admin": {
+                    "type": "boolean"
+                },
+                "maintain": {
+                    "type": "boolean"
+                },
+                "push": {
+                    "type": "boolean"
+                },
+                "triage": {
+                    "type": "boolean"
+                },
+                "pull": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "admin",
+                "maintain",
+                "push",
+                "triage",
+                "pull"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/release/getAll.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/release/getAll.json
new file mode 100644
index 0000000000..b16ddd09c3
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/release/getAll.json
@@ -0,0 +1,149 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "assets_url": {
+            "type": "string"
+        },
+        "upload_url": {
+            "type": "string"
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "user_view_type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "tag_name": {
+            "type": "string"
+        },
+        "target_commitish": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "draft": {
+            "type": "boolean"
+        },
+        "prerelease": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "body": {
+            "type": "string"
+        },
+        "mentions_count": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "url",
+        "assets_url",
+        "upload_url",
+        "html_url",
+        "id",
+        "author",
+        "node_id",
+        "tag_name",
+        "target_commitish",
+        "name",
+        "draft",
+        "prerelease",
+        "created_at",
+        "published_at",
+        "assets",
+        "tarball_url",
+        "zipball_url",
+        "body"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/repository/get.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/repository/get.json
new file mode 100644
index 0000000000..2ddb00bd85
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/repository/get.json
@@ -0,0 +1,465 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "user_view_type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "fork": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "forks_url": {
+            "type": "string"
+        },
+        "keys_url": {
+            "type": "string"
+        },
+        "collaborators_url": {
+            "type": "string"
+        },
+        "teams_url": {
+            "type": "string"
+        },
+        "hooks_url": {
+            "type": "string"
+        },
+        "issue_events_url": {
+            "type": "string"
+        },
+        "events_url": {
+            "type": "string"
+        },
+        "assignees_url": {
+            "type": "string"
+        },
+        "branches_url": {
+            "type": "string"
+        },
+        "tags_url": {
+            "type": "string"
+        },
+        "blobs_url": {
+            "type": "string"
+        },
+        "git_tags_url": {
+            "type": "string"
+        },
+        "git_refs_url": {
+            "type": "string"
+        },
+        "trees_url": {
+            "type": "string"
+        },
+        "statuses_url": {
+            "type": "string"
+        },
+        "languages_url": {
+            "type": "string"
+        },
+        "stargazers_url": {
+            "type": "string"
+        },
+        "contributors_url": {
+            "type": "string"
+        },
+        "subscribers_url": {
+            "type": "string"
+        },
+        "subscription_url": {
+            "type": "string"
+        },
+        "commits_url": {
+            "type": "string"
+        },
+        "git_commits_url": {
+            "type": "string"
+        },
+        "comments_url": {
+            "type": "string"
+        },
+        "issue_comment_url": {
+            "type": "string"
+        },
+        "contents_url": {
+            "type": "string"
+        },
+        "compare_url": {
+            "type": "string"
+        },
+        "merges_url": {
+            "type": "string"
+        },
+        "archive_url": {
+            "type": "string"
+        },
+        "downloads_url": {
+            "type": "string"
+        },
+        "issues_url": {
+            "type": "string"
+        },
+        "pulls_url": {
+            "type": "string"
+        },
+        "milestones_url": {
+            "type": "string"
+        },
+        "notifications_url": {
+            "type": "string"
+        },
+        "labels_url": {
+            "type": "string"
+        },
+        "releases_url": {
+            "type": "string"
+        },
+        "deployments_url": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "pushed_at": {
+            "type": "string"
+        },
+        "git_url": {
+            "type": "string"
+        },
+        "ssh_url": {
+            "type": "string"
+        },
+        "clone_url": {
+            "type": "string"
+        },
+        "svn_url": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "stargazers_count": {
+            "type": "integer"
+        },
+        "watchers_count": {
+            "type": "integer"
+        },
+        "has_issues": {
+            "type": "boolean"
+        },
+        "has_projects": {
+            "type": "boolean"
+        },
+        "has_downloads": {
+            "type": "boolean"
+        },
+        "has_wiki": {
+            "type": "boolean"
+        },
+        "has_pages": {
+            "type": "boolean"
+        },
+        "has_discussions": {
+            "type": "boolean"
+        },
+        "forks_count": {
+            "type": "integer"
+        },
+        "mirror_url": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "disabled": {
+            "type": "boolean"
+        },
+        "open_issues_count": {
+            "type": "integer"
+        },
+        "allow_forking": {
+            "type": "boolean"
+        },
+        "is_template": {
+            "type": "boolean"
+        },
+        "web_commit_signoff_required": {
+            "type": "boolean"
+        },
+        "topics": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "forks": {
+            "type": "integer"
+        },
+        "open_issues": {
+            "type": "integer"
+        },
+        "watchers": {
+            "type": "integer"
+        },
+        "default_branch": {
+            "type": "string"
+        },
+        "permissions": {
+            "type": "object",
+            "properties": {
+                "admin": {
+                    "type": "boolean"
+                },
+                "maintain": {
+                    "type": "boolean"
+                },
+                "push": {
+                    "type": "boolean"
+                },
+                "triage": {
+                    "type": "boolean"
+                },
+                "pull": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "admin",
+                "maintain",
+                "push",
+                "triage",
+                "pull"
+            ]
+        },
+        "temp_clone_token": {
+            "type": "string"
+        },
+        "allow_squash_merge": {
+            "type": "boolean"
+        },
+        "allow_merge_commit": {
+            "type": "boolean"
+        },
+        "allow_rebase_merge": {
+            "type": "boolean"
+        },
+        "allow_auto_merge": {
+            "type": "boolean"
+        },
+        "delete_branch_on_merge": {
+            "type": "boolean"
+        },
+        "allow_update_branch": {
+            "type": "boolean"
+        },
+        "use_squash_pr_title_as_default": {
+            "type": "boolean"
+        },
+        "squash_merge_commit_message": {
+            "type": "string"
+        },
+        "squash_merge_commit_title": {
+            "type": "string"
+        },
+        "merge_commit_message": {
+            "type": "string"
+        },
+        "merge_commit_title": {
+            "type": "string"
+        },
+        "network_count": {
+            "type": "integer"
+        },
+        "subscribers_count": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "node_id",
+        "name",
+        "full_name",
+        "private",
+        "owner",
+        "html_url",
+        "description",
+        "fork",
+        "url",
+        "forks_url",
+        "keys_url",
+        "collaborators_url",
+        "teams_url",
+        "hooks_url",
+        "issue_events_url",
+        "events_url",
+        "assignees_url",
+        "branches_url",
+        "tags_url",
+        "blobs_url",
+        "git_tags_url",
+        "git_refs_url",
+        "trees_url",
+        "statuses_url",
+        "languages_url",
+        "stargazers_url",
+        "contributors_url",
+        "subscribers_url",
+        "subscription_url",
+        "commits_url",
+        "git_commits_url",
+        "comments_url",
+        "issue_comment_url",
+        "contents_url",
+        "compare_url",
+        "merges_url",
+        "archive_url",
+        "downloads_url",
+        "issues_url",
+        "pulls_url",
+        "milestones_url",
+        "notifications_url",
+        "labels_url",
+        "releases_url",
+        "deployments_url",
+        "created_at",
+        "updated_at",
+        "pushed_at",
+        "git_url",
+        "ssh_url",
+        "clone_url",
+        "svn_url",
+        "homepage",
+        "size",
+        "stargazers_count",
+        "watchers_count",
+        "language",
+        "has_issues",
+        "has_projects",
+        "has_downloads",
+        "has_wiki",
+        "has_pages",
+        "has_discussions",
+        "forks_count",
+        "mirror_url",
+        "archived",
+        "disabled",
+        "open_issues_count",
+        "license",
+        "allow_forking",
+        "is_template",
+        "web_commit_signoff_required",
+        "topics",
+        "visibility",
+        "forks",
+        "open_issues",
+        "watchers",
+        "default_branch",
+        "permissions",
+        "network_count",
+        "subscribers_count"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/repository/getIssues.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/repository/getIssues.json
new file mode 100644
index 0000000000..7213d7a977
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/repository/getIssues.json
@@ -0,0 +1,311 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "repository_url": {
+            "type": "string"
+        },
+        "labels_url": {
+            "type": "string"
+        },
+        "comments_url": {
+            "type": "string"
+        },
+        "events_url": {
+            "type": "string"
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "number": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "user_view_type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "node_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "node_id",
+                    "url",
+                    "name",
+                    "color",
+                    "default",
+                    "description"
+                ]
+            }
+        },
+        "state": {
+            "type": "string"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "login": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "node_id": {
+                        "type": "string"
+                    },
+                    "avatar_url": {
+                        "type": "string"
+                    },
+                    "gravatar_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "html_url": {
+                        "type": "string"
+                    },
+                    "followers_url": {
+                        "type": "string"
+                    },
+                    "following_url": {
+                        "type": "string"
+                    },
+                    "gists_url": {
+                        "type": "string"
+                    },
+                    "starred_url": {
+                        "type": "string"
+                    },
+                    "subscriptions_url": {
+                        "type": "string"
+                    },
+                    "organizations_url": {
+                        "type": "string"
+                    },
+                    "repos_url": {
+                        "type": "string"
+                    },
+                    "events_url": {
+                        "type": "string"
+                    },
+                    "received_events_url": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "user_view_type": {
+                        "type": "string"
+                    },
+                    "site_admin": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "login",
+                    "id",
+                    "node_id",
+                    "avatar_url",
+                    "gravatar_id",
+                    "url",
+                    "html_url",
+                    "followers_url",
+                    "following_url",
+                    "gists_url",
+                    "starred_url",
+                    "subscriptions_url",
+                    "organizations_url",
+                    "repos_url",
+                    "events_url",
+                    "received_events_url",
+                    "type",
+                    "site_admin"
+                ]
+            }
+        },
+        "comments": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "author_association": {
+            "type": "string"
+        },
+        "active_lock_reason": {
+            "type": "null"
+        },
+        "reactions": {
+            "type": "object",
+            "properties": {
+                "url": {
+                    "type": "string"
+                },
+                "total_count": {
+                    "type": "integer"
+                },
+                "+1": {
+                    "type": "integer"
+                },
+                "-1": {
+                    "type": "integer"
+                },
+                "laugh": {
+                    "type": "integer"
+                },
+                "hooray": {
+                    "type": "integer"
+                },
+                "confused": {
+                    "type": "integer"
+                },
+                "heart": {
+                    "type": "integer"
+                },
+                "rocket": {
+                    "type": "integer"
+                },
+                "eyes": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "url",
+                "total_count",
+                "+1",
+                "-1",
+                "laugh",
+                "hooray",
+                "confused",
+                "heart",
+                "rocket",
+                "eyes"
+            ]
+        },
+        "timeline_url": {
+            "type": "string"
+        },
+        "performed_via_github_app": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Github/__schema__/v1.0.0/user/getRepositories.json b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/user/getRepositories.json
new file mode 100644
index 0000000000..b15549099a
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/__schema__/v1.0.0/user/getRepositories.json
@@ -0,0 +1,342 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "node_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "login": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "node_id": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "gravatar_id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "html_url": {
+                    "type": "string"
+                },
+                "followers_url": {
+                    "type": "string"
+                },
+                "following_url": {
+                    "type": "string"
+                },
+                "gists_url": {
+                    "type": "string"
+                },
+                "starred_url": {
+                    "type": "string"
+                },
+                "subscriptions_url": {
+                    "type": "string"
+                },
+                "organizations_url": {
+                    "type": "string"
+                },
+                "repos_url": {
+                    "type": "string"
+                },
+                "events_url": {
+                    "type": "string"
+                },
+                "received_events_url": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "site_admin": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "login",
+                "id",
+                "node_id",
+                "avatar_url",
+                "gravatar_id",
+                "url",
+                "html_url",
+                "followers_url",
+                "following_url",
+                "gists_url",
+                "starred_url",
+                "subscriptions_url",
+                "organizations_url",
+                "repos_url",
+                "events_url",
+                "received_events_url",
+                "type",
+                "site_admin"
+            ]
+        },
+        "html_url": {
+            "type": "string"
+        },
+        "fork": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "forks_url": {
+            "type": "string"
+        },
+        "keys_url": {
+            "type": "string"
+        },
+        "collaborators_url": {
+            "type": "string"
+        },
+        "teams_url": {
+            "type": "string"
+        },
+        "hooks_url": {
+            "type": "string"
+        },
+        "issue_events_url": {
+            "type": "string"
+        },
+        "events_url": {
+            "type": "string"
+        },
+        "assignees_url": {
+            "type": "string"
+        },
+        "branches_url": {
+            "type": "string"
+        },
+        "tags_url": {
+            "type": "string"
+        },
+        "blobs_url": {
+            "type": "string"
+        },
+        "git_tags_url": {
+            "type": "string"
+        },
+        "git_refs_url": {
+            "type": "string"
+        },
+        "trees_url": {
+            "type": "string"
+        },
+        "statuses_url": {
+            "type": "string"
+        },
+        "languages_url": {
+            "type": "string"
+        },
+        "stargazers_url": {
+            "type": "string"
+        },
+        "contributors_url": {
+            "type": "string"
+        },
+        "subscribers_url": {
+            "type": "string"
+        },
+        "subscription_url": {
+            "type": "string"
+        },
+        "commits_url": {
+            "type": "string"
+        },
+        "git_commits_url": {
+            "type": "string"
+        },
+        "comments_url": {
+            "type": "string"
+        },
+        "issue_comment_url": {
+            "type": "string"
+        },
+        "contents_url": {
+            "type": "string"
+        },
+        "compare_url": {
+            "type": "string"
+        },
+        "merges_url": {
+            "type": "string"
+        },
+        "archive_url": {
+            "type": "string"
+        },
+        "downloads_url": {
+            "type": "string"
+        },
+        "issues_url": {
+            "type": "string"
+        },
+        "pulls_url": {
+            "type": "string"
+        },
+        "milestones_url": {
+            "type": "string"
+        },
+        "notifications_url": {
+            "type": "string"
+        },
+        "labels_url": {
+            "type": "string"
+        },
+        "releases_url": {
+            "type": "string"
+        },
+        "deployments_url": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "pushed_at": {
+            "type": "string"
+        },
+        "git_url": {
+            "type": "string"
+        },
+        "ssh_url": {
+            "type": "string"
+        },
+        "clone_url": {
+            "type": "string"
+        },
+        "svn_url": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "stargazers_count": {
+            "type": "integer"
+        },
+        "watchers_count": {
+            "type": "integer"
+        },
+        "has_issues": {
+            "type": "boolean"
+        },
+        "has_projects": {
+            "type": "boolean"
+        },
+        "has_downloads": {
+            "type": "boolean"
+        },
+        "has_wiki": {
+            "type": "boolean"
+        },
+        "has_pages": {
+            "type": "boolean"
+        },
+        "has_discussions": {
+            "type": "boolean"
+        },
+        "forks_count": {
+            "type": "integer"
+        },
+        "mirror_url": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "disabled": {
+            "type": "boolean"
+        },
+        "open_issues_count": {
+            "type": "integer"
+        },
+        "allow_forking": {
+            "type": "boolean"
+        },
+        "is_template": {
+            "type": "boolean"
+        },
+        "web_commit_signoff_required": {
+            "type": "boolean"
+        },
+        "topics": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "forks": {
+            "type": "integer"
+        },
+        "open_issues": {
+            "type": "integer"
+        },
+        "watchers": {
+            "type": "integer"
+        },
+        "default_branch": {
+            "type": "string"
+        },
+        "permissions": {
+            "type": "object",
+            "properties": {
+                "admin": {
+                    "type": "boolean"
+                },
+                "maintain": {
+                    "type": "boolean"
+                },
+                "push": {
+                    "type": "boolean"
+                },
+                "triage": {
+                    "type": "boolean"
+                },
+                "pull": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "admin",
+                "maintain",
+                "push",
+                "triage",
+                "pull"
+            ]
+        }
+    },
+    "required": [
+        "keys_url",
+        "events_url",
+        "issues_url",
+        "notifications_url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 88395f2eb8..ee289e6511 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -22,6 +22,7 @@ export class Gitlab implements INodeType {
 		defaults: {
 			name: 'GitLab',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/file/get.json b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/file/get.json
new file mode 100644
index 0000000000..7923992b81
--- /dev/null
+++ b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/file/get.json
@@ -0,0 +1,38 @@
+{
+    "type": "object",
+    "properties": {
+        "file_name": {
+            "type": "string"
+        },
+        "file_path": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "encoding": {
+            "type": "string"
+        },
+        "content_sha256": {
+            "type": "string"
+        },
+        "ref": {
+            "type": "string"
+        },
+        "blob_id": {
+            "type": "string"
+        },
+        "commit_id": {
+            "type": "string"
+        },
+        "last_commit_id": {
+            "type": "string"
+        },
+        "execute_filemode": {
+            "type": "boolean"
+        },
+        "content": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/file/list.json b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/file/list.json
new file mode 100644
index 0000000000..ad92d5bb63
--- /dev/null
+++ b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/file/list.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "path": {
+            "type": "string"
+        },
+        "mode": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "type",
+        "path",
+        "mode"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/issue/create.json b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/issue/create.json
new file mode 100644
index 0000000000..d8833b6bd4
--- /dev/null
+++ b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/issue/create.json
@@ -0,0 +1,255 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "iid": {
+            "type": "integer"
+        },
+        "project_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "closed_at": {
+            "type": "null"
+        },
+        "closed_by": {
+            "type": "null"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "milestone": {
+            "type": "null"
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "locked": {
+                        "type": "boolean"
+                    },
+                    "avatar_url": {
+                        "type": "string"
+                    },
+                    "web_url": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "name",
+                    "state",
+                    "locked",
+                    "avatar_url",
+                    "web_url"
+                ]
+            }
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "locked": {
+                    "type": "boolean"
+                },
+                "web_url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "name",
+                "state",
+                "locked",
+                "avatar_url",
+                "web_url"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "user_notes_count": {
+            "type": "integer"
+        },
+        "merge_requests_count": {
+            "type": "integer"
+        },
+        "upvotes": {
+            "type": "integer"
+        },
+        "downvotes": {
+            "type": "integer"
+        },
+        "confidential": {
+            "type": "boolean"
+        },
+        "discussion_locked": {
+            "type": "null"
+        },
+        "issue_type": {
+            "type": "string"
+        },
+        "web_url": {
+            "type": "string"
+        },
+        "time_stats": {
+            "type": "object",
+            "properties": {
+                "time_estimate": {
+                    "type": "integer"
+                },
+                "total_time_spent": {
+                    "type": "integer"
+                },
+                "human_time_estimate": {
+                    "type": "null"
+                },
+                "human_total_time_spent": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "time_estimate",
+                "total_time_spent",
+                "human_time_estimate",
+                "human_total_time_spent"
+            ]
+        },
+        "task_completion_status": {
+            "type": "object",
+            "properties": {
+                "count": {
+                    "type": "integer"
+                },
+                "completed_count": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "count",
+                "completed_count"
+            ]
+        },
+        "weight": {
+            "type": "null"
+        },
+        "blocking_issues_count": {
+            "type": "integer"
+        },
+        "has_tasks": {
+            "type": "boolean"
+        },
+        "task_status": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "award_emoji": {
+                    "type": "string"
+                },
+                "project": {
+                    "type": "string"
+                },
+                "closed_as_duplicate_of": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "self",
+                "notes",
+                "award_emoji",
+                "project",
+                "closed_as_duplicate_of"
+            ]
+        },
+        "references": {
+            "type": "object",
+            "properties": {
+                "short": {
+                    "type": "string"
+                },
+                "relative": {
+                    "type": "string"
+                },
+                "full": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "short",
+                "relative",
+                "full"
+            ]
+        },
+        "severity": {
+            "type": "string"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "moved_to_id": {
+            "type": "null"
+        },
+        "service_desk_reply_to": {
+            "type": "null"
+        },
+        "epic_iid": {
+            "type": "null"
+        },
+        "epic": {
+            "type": "null"
+        },
+        "iteration": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/issue/get.json b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/issue/get.json
new file mode 100644
index 0000000000..d62c9e5612
--- /dev/null
+++ b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/issue/get.json
@@ -0,0 +1,270 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "iid": {
+            "type": "integer"
+        },
+        "project_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "locked": {
+                        "type": "boolean"
+                    },
+                    "avatar_url": {
+                        "type": "string"
+                    },
+                    "web_url": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "name",
+                    "state",
+                    "locked",
+                    "avatar_url",
+                    "web_url"
+                ]
+            }
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "locked": {
+                    "type": "boolean"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "web_url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "name",
+                "state",
+                "locked",
+                "avatar_url",
+                "web_url"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "user_notes_count": {
+            "type": "integer"
+        },
+        "merge_requests_count": {
+            "type": "integer"
+        },
+        "upvotes": {
+            "type": "integer"
+        },
+        "downvotes": {
+            "type": "integer"
+        },
+        "confidential": {
+            "type": "boolean"
+        },
+        "issue_type": {
+            "type": "string"
+        },
+        "web_url": {
+            "type": "string"
+        },
+        "time_stats": {
+            "type": "object",
+            "properties": {
+                "time_estimate": {
+                    "type": "integer"
+                },
+                "total_time_spent": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "time_estimate",
+                "total_time_spent",
+                "human_time_estimate",
+                "human_total_time_spent"
+            ]
+        },
+        "task_completion_status": {
+            "type": "object",
+            "properties": {
+                "count": {
+                    "type": "integer"
+                },
+                "completed_count": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "count",
+                "completed_count"
+            ]
+        },
+        "blocking_issues_count": {
+            "type": "integer"
+        },
+        "has_tasks": {
+            "type": "boolean"
+        },
+        "task_status": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "award_emoji": {
+                    "type": "string"
+                },
+                "project": {
+                    "type": "string"
+                },
+                "closed_as_duplicate_of": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "self",
+                "notes",
+                "award_emoji",
+                "project",
+                "closed_as_duplicate_of"
+            ]
+        },
+        "references": {
+            "type": "object",
+            "properties": {
+                "short": {
+                    "type": "string"
+                },
+                "relative": {
+                    "type": "string"
+                },
+                "full": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "short",
+                "relative",
+                "full"
+            ]
+        },
+        "severity": {
+            "type": "string"
+        },
+        "moved_to_id": {
+            "type": "null"
+        },
+        "imported": {
+            "type": "boolean"
+        },
+        "imported_from": {
+            "type": "string"
+        },
+        "service_desk_reply_to": {
+            "type": "null"
+        },
+        "subscribed": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "iid",
+        "project_id",
+        "title",
+        "description",
+        "state",
+        "created_at",
+        "updated_at",
+        "closed_at",
+        "closed_by",
+        "labels",
+        "milestone",
+        "assignees",
+        "author",
+        "type",
+        "assignee",
+        "user_notes_count",
+        "merge_requests_count",
+        "upvotes",
+        "downvotes",
+        "due_date",
+        "confidential",
+        "discussion_locked",
+        "issue_type",
+        "web_url",
+        "time_stats",
+        "task_completion_status",
+        "blocking_issues_count",
+        "has_tasks",
+        "_links",
+        "references",
+        "severity",
+        "moved_to_id",
+        "service_desk_reply_to"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/repository/get.json b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/repository/get.json
new file mode 100644
index 0000000000..53148aaeb6
--- /dev/null
+++ b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/repository/get.json
@@ -0,0 +1,410 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "name_with_namespace": {
+            "type": "string"
+        },
+        "path": {
+            "type": "string"
+        },
+        "path_with_namespace": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "default_branch": {
+            "type": "string"
+        },
+        "ssh_url_to_repo": {
+            "type": "string"
+        },
+        "http_url_to_repo": {
+            "type": "string"
+        },
+        "web_url": {
+            "type": "string"
+        },
+        "readme_url": {
+            "type": "string"
+        },
+        "forks_count": {
+            "type": "integer"
+        },
+        "star_count": {
+            "type": "integer"
+        },
+        "last_activity_at": {
+            "type": "string"
+        },
+        "namespace": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "kind": {
+                    "type": "string"
+                },
+                "full_path": {
+                    "type": "string"
+                },
+                "web_url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "path",
+                "kind",
+                "full_path",
+                "parent_id",
+                "avatar_url",
+                "web_url"
+            ]
+        },
+        "container_registry_image_prefix": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "issues": {
+                    "type": "string"
+                },
+                "merge_requests": {
+                    "type": "string"
+                },
+                "repo_branches": {
+                    "type": "string"
+                },
+                "labels": {
+                    "type": "string"
+                },
+                "events": {
+                    "type": "string"
+                },
+                "members": {
+                    "type": "string"
+                },
+                "cluster_agents": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self"
+            ]
+        },
+        "packages_enabled": {
+            "type": "boolean"
+        },
+        "empty_repo": {
+            "type": "boolean"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "resolve_outdated_diff_discussions": {
+            "type": "boolean"
+        },
+        "container_expiration_policy": {
+            "type": "object",
+            "properties": {
+                "cadence": {
+                    "type": "string"
+                },
+                "enabled": {
+                    "type": "boolean"
+                },
+                "older_than": {
+                    "type": "string"
+                },
+                "name_regex": {
+                    "type": "string"
+                },
+                "name_regex_keep": {
+                    "type": "null"
+                },
+                "next_run_at": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "cadence",
+                "enabled",
+                "keep_n",
+                "older_than",
+                "name_regex",
+                "name_regex_keep",
+                "next_run_at"
+            ]
+        },
+        "repository_object_format": {
+            "type": "string"
+        },
+        "issues_enabled": {
+            "type": "boolean"
+        },
+        "merge_requests_enabled": {
+            "type": "boolean"
+        },
+        "wiki_enabled": {
+            "type": "boolean"
+        },
+        "jobs_enabled": {
+            "type": "boolean"
+        },
+        "snippets_enabled": {
+            "type": "boolean"
+        },
+        "container_registry_enabled": {
+            "type": "boolean"
+        },
+        "service_desk_enabled": {
+            "type": "boolean"
+        },
+        "can_create_merge_request_in": {
+            "type": "boolean"
+        },
+        "issues_access_level": {
+            "type": "string"
+        },
+        "repository_access_level": {
+            "type": "string"
+        },
+        "merge_requests_access_level": {
+            "type": "string"
+        },
+        "forking_access_level": {
+            "type": "string"
+        },
+        "wiki_access_level": {
+            "type": "string"
+        },
+        "builds_access_level": {
+            "type": "string"
+        },
+        "snippets_access_level": {
+            "type": "string"
+        },
+        "pages_access_level": {
+            "type": "string"
+        },
+        "analytics_access_level": {
+            "type": "string"
+        },
+        "container_registry_access_level": {
+            "type": "string"
+        },
+        "security_and_compliance_access_level": {
+            "type": "string"
+        },
+        "releases_access_level": {
+            "type": "string"
+        },
+        "environments_access_level": {
+            "type": "string"
+        },
+        "feature_flags_access_level": {
+            "type": "string"
+        },
+        "infrastructure_access_level": {
+            "type": "string"
+        },
+        "monitor_access_level": {
+            "type": "string"
+        },
+        "model_experiments_access_level": {
+            "type": "string"
+        },
+        "model_registry_access_level": {
+            "type": "string"
+        },
+        "emails_enabled": {
+            "type": "boolean"
+        },
+        "shared_runners_enabled": {
+            "type": "boolean"
+        },
+        "lfs_enabled": {
+            "type": "boolean"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "import_status": {
+            "type": "string"
+        },
+        "import_error": {
+            "type": "null"
+        },
+        "open_issues_count": {
+            "type": "integer"
+        },
+        "description_html": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "ci_delete_pipelines_in_seconds": {
+            "type": "null"
+        },
+        "ci_forward_deployment_enabled": {
+            "type": "boolean"
+        },
+        "ci_forward_deployment_rollback_allowed": {
+            "type": "boolean"
+        },
+        "ci_job_token_scope_enabled": {
+            "type": "boolean"
+        },
+        "ci_separated_caches": {
+            "type": "boolean"
+        },
+        "ci_allow_fork_pipelines_to_run_in_parent_project": {
+            "type": "boolean"
+        },
+        "ci_id_token_sub_claim_components": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "build_git_strategy": {
+            "type": "string"
+        },
+        "keep_latest_artifact": {
+            "type": "boolean"
+        },
+        "restrict_user_defined_variables": {
+            "type": "boolean"
+        },
+        "ci_pipeline_variables_minimum_override_role": {
+            "type": "string"
+        },
+        "runner_token_expiration_interval": {
+            "type": "null"
+        },
+        "group_runners_enabled": {
+            "type": "boolean"
+        },
+        "auto_cancel_pending_pipelines": {
+            "type": "string"
+        },
+        "build_timeout": {
+            "type": "integer"
+        },
+        "auto_devops_enabled": {
+            "type": "boolean"
+        },
+        "auto_devops_deploy_strategy": {
+            "type": "string"
+        },
+        "ci_push_repository_for_job_token_allowed": {
+            "type": "boolean"
+        },
+        "public_jobs": {
+            "type": "boolean"
+        },
+        "shared_with_groups": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "group_id": {
+                        "type": "integer"
+                    },
+                    "group_name": {
+                        "type": "string"
+                    },
+                    "group_full_path": {
+                        "type": "string"
+                    },
+                    "group_access_level": {
+                        "type": "integer"
+                    },
+                    "expires_at": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "group_id",
+                    "group_name",
+                    "group_full_path",
+                    "group_access_level",
+                    "expires_at"
+                ]
+            }
+        },
+        "only_allow_merge_if_pipeline_succeeds": {
+            "type": "boolean"
+        },
+        "request_access_enabled": {
+            "type": "boolean"
+        },
+        "only_allow_merge_if_all_discussions_are_resolved": {
+            "type": "boolean"
+        },
+        "remove_source_branch_after_merge": {
+            "type": "boolean"
+        },
+        "printing_merge_request_link_enabled": {
+            "type": "boolean"
+        },
+        "merge_method": {
+            "type": "string"
+        },
+        "squash_option": {
+            "type": "string"
+        },
+        "enforce_auth_checks_on_uploads": {
+            "type": "boolean"
+        },
+        "squash_commit_template": {
+            "type": "null"
+        },
+        "warn_about_potentially_unwanted_characters": {
+            "type": "boolean"
+        },
+        "autoclose_referenced_issues": {
+            "type": "boolean"
+        },
+        "requirements_enabled": {
+            "type": "boolean"
+        },
+        "requirements_access_level": {
+            "type": "string"
+        },
+        "security_and_compliance_enabled": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "description",
+        "created_at",
+        "web_url",
+        "_links",
+        "updated_at"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/repository/getIssues.json b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/repository/getIssues.json
new file mode 100644
index 0000000000..9b81a90c24
--- /dev/null
+++ b/packages/nodes-base/nodes/Gitlab/__schema__/v1.0.0/repository/getIssues.json
@@ -0,0 +1,258 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "iid": {
+            "type": "integer"
+        },
+        "project_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "assignees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "avatar_url": {
+                        "type": "string"
+                    },
+                    "web_url": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "username",
+                    "name",
+                    "state",
+                    "avatar_url",
+                    "web_url"
+                ]
+            }
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "avatar_url": {
+                    "type": "string"
+                },
+                "web_url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "username",
+                "name",
+                "state",
+                "avatar_url",
+                "web_url"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "user_notes_count": {
+            "type": "integer"
+        },
+        "merge_requests_count": {
+            "type": "integer"
+        },
+        "upvotes": {
+            "type": "integer"
+        },
+        "downvotes": {
+            "type": "integer"
+        },
+        "confidential": {
+            "type": "boolean"
+        },
+        "discussion_locked": {
+            "type": "null"
+        },
+        "issue_type": {
+            "type": "string"
+        },
+        "web_url": {
+            "type": "string"
+        },
+        "time_stats": {
+            "type": "object",
+            "properties": {
+                "time_estimate": {
+                    "type": "integer"
+                },
+                "total_time_spent": {
+                    "type": "integer"
+                },
+                "human_time_estimate": {
+                    "type": "null"
+                },
+                "human_total_time_spent": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "time_estimate",
+                "total_time_spent",
+                "human_time_estimate",
+                "human_total_time_spent"
+            ]
+        },
+        "task_completion_status": {
+            "type": "object",
+            "properties": {
+                "count": {
+                    "type": "integer"
+                },
+                "completed_count": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "count",
+                "completed_count"
+            ]
+        },
+        "has_tasks": {
+            "type": "boolean"
+        },
+        "task_status": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "award_emoji": {
+                    "type": "string"
+                },
+                "project": {
+                    "type": "string"
+                },
+                "closed_as_duplicate_of": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "self",
+                "notes",
+                "award_emoji",
+                "project",
+                "closed_as_duplicate_of"
+            ]
+        },
+        "references": {
+            "type": "object",
+            "properties": {
+                "short": {
+                    "type": "string"
+                },
+                "relative": {
+                    "type": "string"
+                },
+                "full": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "short",
+                "relative",
+                "full"
+            ]
+        },
+        "severity": {
+            "type": "string"
+        },
+        "moved_to_id": {
+            "type": "null"
+        },
+        "service_desk_reply_to": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "iid",
+        "project_id",
+        "title",
+        "description",
+        "state",
+        "created_at",
+        "updated_at",
+        "closed_at",
+        "closed_by",
+        "labels",
+        "milestone",
+        "assignees",
+        "author",
+        "type",
+        "assignee",
+        "user_notes_count",
+        "merge_requests_count",
+        "upvotes",
+        "downvotes",
+        "due_date",
+        "confidential",
+        "discussion_locked",
+        "issue_type",
+        "web_url",
+        "time_stats",
+        "task_completion_status",
+        "has_tasks",
+        "_links",
+        "references",
+        "severity",
+        "moved_to_id",
+        "service_desk_reply_to"
+    ]
+}
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index 96acec9be6..3f69f283db 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -49,6 +49,7 @@ export class GoToWebinar implements INodeType {
 		defaults: {
 			name: 'GoToWebinar',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Gong/Gong.node.ts b/packages/nodes-base/nodes/Gong/Gong.node.ts
index 81b678f283..197badfb0b 100644
--- a/packages/nodes-base/nodes/Gong/Gong.node.ts
+++ b/packages/nodes-base/nodes/Gong/Gong.node.ts
@@ -23,6 +23,7 @@ export class Gong implements INodeType {
 		defaults: {
 			name: 'Gong',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Gong/__schema__/v1.0.0/call/get.json b/packages/nodes-base/nodes/Gong/__schema__/v1.0.0/call/get.json
new file mode 100644
index 0000000000..6e3eb274ac
--- /dev/null
+++ b/packages/nodes-base/nodes/Gong/__schema__/v1.0.0/call/get.json
@@ -0,0 +1,100 @@
+{
+    "type": "object",
+    "properties": {
+        "metaData": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "scheduled": {
+                    "type": "string"
+                },
+                "started": {
+                    "type": "string"
+                },
+                "duration": {
+                    "type": "integer"
+                },
+                "primaryUserId": {
+                    "type": "string"
+                },
+                "direction": {
+                    "type": "string"
+                },
+                "system": {
+                    "type": "string"
+                },
+                "scope": {
+                    "type": "string"
+                },
+                "media": {
+                    "type": "string"
+                },
+                "language": {
+                    "type": "string"
+                },
+                "workspaceId": {
+                    "type": "string"
+                },
+                "customData": {
+                    "type": "null"
+                },
+                "purpose": {
+                    "type": "null"
+                },
+                "meetingUrl": {
+                    "type": "string"
+                },
+                "isPrivate": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "url",
+                "title",
+                "scheduled",
+                "started",
+                "duration",
+                "primaryUserId",
+                "direction",
+                "system",
+                "scope",
+                "media",
+                "language",
+                "workspaceId",
+                "sdrDisposition",
+                "clientUniqueId",
+                "customData",
+                "purpose",
+                "meetingUrl",
+                "isPrivate",
+                "calendarEventId"
+            ]
+        },
+        "media": {
+            "type": "object",
+            "properties": {
+                "audioUrl": {
+                    "type": "string"
+                },
+                "videoUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "audioUrl"
+            ]
+        }
+    },
+    "required": [
+        "metaData"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Gong/__schema__/v1.0.0/call/getAll.json b/packages/nodes-base/nodes/Gong/__schema__/v1.0.0/call/getAll.json
new file mode 100644
index 0000000000..f041f8948b
--- /dev/null
+++ b/packages/nodes-base/nodes/Gong/__schema__/v1.0.0/call/getAll.json
@@ -0,0 +1,78 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"url": {
+			"type": "string"
+		},
+		"title": {
+			"type": "string"
+		},
+		"scheduled": {
+			"type": "string"
+		},
+		"started": {
+			"type": "string"
+		},
+		"duration": {
+			"type": "integer"
+		},
+		"primaryUserId": {
+			"type": "string"
+		},
+		"direction": {
+			"type": "string"
+		},
+		"system": {
+			"type": "string"
+		},
+		"scope": {
+			"type": "string"
+		},
+		"media": {
+			"type": "string"
+		},
+		"language": {
+			"type": "string"
+		},
+		"workspaceId": {
+			"type": "string"
+		},
+		"customData": {
+			"type": "null"
+		},
+		"purpose": {
+			"type": "null"
+		},
+		"meetingUrl": {
+			"type": "string"
+		},
+		"isPrivate": {
+			"type": "boolean"
+		}
+	},
+	"required": [
+		"id",
+		"url",
+		"title",
+		"scheduled",
+		"started",
+		"duration",
+		"primaryUserId",
+		"direction",
+		"system",
+		"scope",
+		"media",
+		"language",
+		"workspaceId",
+		"sdrDisposition",
+		"clientUniqueId",
+		"customData",
+		"purpose",
+		"meetingUrl",
+		"isPrivate",
+		"calendarEventId"
+	]
+}
diff --git a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
index cee940a5cd..53131b691d 100644
--- a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
+++ b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
@@ -125,8 +125,6 @@ describe('Gong Node', () => {
 		];
 
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			jest
 				.spyOn(Helpers.CredentialsHelper.prototype, 'authenticate')
 				.mockImplementation(
@@ -161,11 +159,6 @@ describe('Gong Node', () => {
 				);
 		});
 
-		afterAll(() => {
-			nock.restore();
-			jest.restoreAllMocks();
-		});
-
 		nock(baseUrl)
 			.post('/v2/calls/extensive', { filter: { callIds: ['7782342274025937895'] } })
 			.matchHeader(
diff --git a/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts b/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts
index 606e58e77d..2ee8c73035 100644
--- a/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts
+++ b/packages/nodes-base/nodes/Google/Ads/GoogleAds.node.ts
@@ -14,6 +14,7 @@ export class GoogleAds implements INodeType {
 		defaults: {
 			name: 'Google Ads',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/Ads/__schema__/v1.0.0/campaign/getAll.json b/packages/nodes-base/nodes/Google/Ads/__schema__/v1.0.0/campaign/getAll.json
new file mode 100644
index 0000000000..ea6c34dbd0
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Ads/__schema__/v1.0.0/campaign/getAll.json
@@ -0,0 +1,44 @@
+{
+    "type": "object",
+    "properties": {
+        "resourceName": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "advertisingChannelType": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "videoViews": {
+            "type": "string"
+        },
+        "costMicros": {
+            "type": "string"
+        },
+        "impressions": {
+            "type": "string"
+        },
+        "interactions": {
+            "type": "string"
+        },
+        "period": {
+            "type": "string"
+        },
+        "amountMicros": {
+            "type": "string"
+        },
+        "interactionRate": {
+            "type": "number"
+        },
+        "optimizationScore": {
+            "type": "number"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Analytics/__schema__/v2.0.0/report/get.json b/packages/nodes-base/nodes/Google/Analytics/__schema__/v2.0.0/report/get.json
new file mode 100644
index 0000000000..c471587a2e
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Analytics/__schema__/v2.0.0/report/get.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "screenPageViews": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "totalUsers": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
index 1988e4e988..f9717b7687 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
@@ -17,6 +17,7 @@ export class GoogleAnalyticsV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
index 542f3206b1..616260f8b5 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
@@ -33,16 +32,6 @@ jest.mock('../../../v2/transport', () => {
 describe('Test Google BigQuery V2, executeQuery', () => {
 	const workflows = ['nodes/Google/BigQuery/test/v2/node/executeQuery.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
index 6a8effcb81..6b282c6bae 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
@@ -41,16 +40,6 @@ jest.mock('../../../v2/transport', () => {
 describe('Test Google BigQuery V2, insert auto map', () => {
 	const workflows = ['nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
index 4be27d3b3e..b9bf456526 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
@@ -42,16 +41,6 @@ jest.mock('../../../v2/transport', () => {
 describe('Test Google BigQuery V2, insert define manually', () => {
 	const workflows = ['nodes/Google/BigQuery/test/v2/node/insert.manualMode.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
index 160360ede3..527bb6edec 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
@@ -16,7 +16,6 @@ import { oldVersionNotice } from '@utils/descriptions';
 
 import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions';
 import { recordFields, recordOperations } from './RecordDescription';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google BigQuery',
@@ -195,8 +194,6 @@ export class GoogleBigQueryV1 implements INodeType {
 
 				body.rows = rows;
 
-				const itemData = generatePairedItemData(items.length);
-
 				try {
 					responseData = await googleApiRequest.call(
 						this,
@@ -205,17 +202,11 @@ export class GoogleBigQueryV1 implements INodeType {
 						body,
 					);
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData },
-					);
+					const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 					returnData.push(...executionData);
 				} catch (error) {
 					if (this.continueOnFail()) {
-						const executionErrorData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ error: error.message }),
-							{ itemData },
-						);
+						const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
 						returnData.push(...executionErrorData);
 					}
 					throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: 0 });
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
index b3276e6904..bd69399482 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
@@ -17,6 +17,7 @@ export class GoogleBigQueryV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
index c0c197d96b..1b0fed5435 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
@@ -7,7 +7,7 @@ import type {
 import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
@@ -227,7 +227,6 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		}
 	}
 
-	const itemData = generatePairedItemData(items.length);
 	for (let i = 0; i < rows.length; i += batchSize) {
 		const batch = rows.slice(i, i + batchSize);
 		body.rows = batch;
@@ -281,10 +280,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 			});
 		}
 
-		const executionData = this.helpers.constructExecutionMetaData(
-			wrapData(responseData as IDataObject[]),
-			{ itemData },
-		);
+		const executionData = wrapData(responseData as IDataObject[]);
 
 		returnData.push(...executionData);
 	}
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
index facf7d14cc..5a73ed7c1e 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
@@ -26,6 +26,7 @@ export class GoogleBooks implements INodeType {
 		defaults: {
 			name: 'Google Books',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/BusinessProfile/GoogleBusinessProfile.node.ts b/packages/nodes-base/nodes/Google/BusinessProfile/GoogleBusinessProfile.node.ts
index d70a8d0e63..e566292ba2 100644
--- a/packages/nodes-base/nodes/Google/BusinessProfile/GoogleBusinessProfile.node.ts
+++ b/packages/nodes-base/nodes/Google/BusinessProfile/GoogleBusinessProfile.node.ts
@@ -16,6 +16,7 @@ export class GoogleBusinessProfile implements INodeType {
 		defaults: {
 			name: 'Google Business Profile',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		hints: [
diff --git a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
index d2d2950f17..59e4591dd5 100644
--- a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
@@ -84,6 +84,7 @@ export const calendarFields: INodeProperties[] = [
 			show: {
 				operation: ['availability'],
 				resource: ['calendar'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
@@ -98,11 +99,44 @@ export const calendarFields: INodeProperties[] = [
 			show: {
 				operation: ['availability'],
 				resource: ['calendar'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
 		description: 'End of the interval',
 	},
+	{
+		displayName: 'Start Time',
+		name: 'timeMin',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['availability'],
+				resource: ['calendar'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: '={{ $now }}',
+		description:
+			'Start of the interval, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
+	{
+		displayName: 'End Time',
+		name: 'timeMax',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['availability'],
+				resource: ['calendar'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: "={{ $now.plus(1, 'hour') }}",
+		description:
+			'End of the interval, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index 6892c88152..797445b893 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -112,6 +112,7 @@ export const eventFields: INodeProperties[] = [
 			show: {
 				operation: ['create'],
 				resource: ['event'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
@@ -126,11 +127,44 @@ export const eventFields: INodeProperties[] = [
 			show: {
 				operation: ['create'],
 				resource: ['event'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
 		description: 'End time of the event',
 	},
+	{
+		displayName: 'Start',
+		name: 'start',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['event'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: '={{ $now }}',
+		description:
+			'Start time of the event, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
+	{
+		displayName: 'End',
+		name: 'end',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['event'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: "={{ $now.plus(1, 'hour') }}",
+		description:
+			'End time of the event, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
 	{
 		displayName: 'Use Default Reminders',
 		name: 'useDefaultReminders',
@@ -553,6 +587,19 @@ export const eventFields: INodeProperties[] = [
 				description:
 					'The maximum number of attendees to include in the response. If there are more than the specified number of attendees, only the participant is returned.',
 			},
+			{
+				displayName: 'Return Next Instance of Recurring Event',
+				name: 'returnNextInstance',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to return the next instance of a recurring event instead of the event itself',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
 			{
 				displayName: 'Timezone',
 				name: 'timeZone',
@@ -629,6 +676,36 @@ export const eventFields: INodeProperties[] = [
 		default: 50,
 		description: 'Max number of results to return',
 	},
+	{
+		displayName: 'After',
+		name: 'timeMin',
+		type: 'dateTime',
+		default: '={{ $now }}',
+		description:
+			'At least some part of the event must be after this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.3 } }],
+				operation: ['getAll'],
+				resource: ['event'],
+			},
+		},
+	},
+	{
+		displayName: 'Before',
+		name: 'timeMax',
+		type: 'dateTime',
+		default: '={{ $now.plus({ week: 1 }) }}',
+		description:
+			'At least some part of the event must be before this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.3 } }],
+				operation: ['getAll'],
+				resource: ['event'],
+			},
+		},
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -647,14 +724,39 @@ export const eventFields: INodeProperties[] = [
 				name: 'timeMin',
 				type: 'dateTime',
 				default: '',
-				description: 'At least some part of the event must be after this time',
+				description:
+					'At least some part of the event must be after this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Before',
 				name: 'timeMax',
 				type: 'dateTime',
 				default: '',
-				description: 'At least some part of the event must be before this time',
+				description:
+					'At least some part of the event must be before this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Expand Events',
+				name: 'singleEvents',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to expand recurring events into instances and only return single one-off events and instances of recurring events, but not the underlying recurring events themselves',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Fields',
@@ -708,6 +810,34 @@ export const eventFields: INodeProperties[] = [
 				description:
 					'Free text search terms to find events that match these terms in any field, except for extended properties',
 			},
+			{
+				displayName: 'Recurring Event Handling',
+				name: 'recurringEventHandling',
+				type: 'options',
+				default: 'expand',
+				options: [
+					{
+						name: 'All Occurrences',
+						value: 'expand',
+						description: 'Return all instances of recurring event for specified time range',
+					},
+					{
+						name: 'First Occurrence',
+						value: 'first',
+						description: 'Return event with specified recurrence rule',
+					},
+					{
+						name: 'Next Occurrence',
+						value: 'next',
+						description: 'Return next instance of recurring event',
+					},
+				],
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
 			{
 				displayName: 'Show Deleted',
 				name: 'showDeleted',
@@ -723,14 +853,7 @@ export const eventFields: INodeProperties[] = [
 				default: false,
 				description: 'Whether to include hidden invitations in the result',
 			},
-			{
-				displayName: 'Single Events',
-				name: 'singleEvents',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to expand recurring events into instances and only return single one-off events and instances of recurring events, but not the underlying recurring events themselves',
-			},
+
 			{
 				displayName: 'Timezone',
 				name: 'timeZone',
@@ -797,6 +920,30 @@ export const eventFields: INodeProperties[] = [
 		},
 		default: '',
 	},
+	{
+		displayName: 'Modify',
+		name: 'modifyTarget',
+		type: 'options',
+		options: [
+			{
+				name: 'Recurring Event Instance',
+				value: 'instance',
+			},
+			{
+				name: 'Recurring Event',
+				value: 'event',
+			},
+		],
+		default: 'instance',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.3 } }],
+				resource: ['event'],
+				operation: ['update'],
+				eventId: [{ _cnd: { includes: '_' } }],
+			},
+		},
+	},
 	{
 		displayName: 'Use Default Reminders',
 		name: 'useDefaultReminders',
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts b/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
index d1907fbf2d..26212658d7 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
@@ -34,3 +34,8 @@ export interface IEvent {
 	visibility?: string;
 	conferenceData?: IConferenceData;
 }
+
+export type RecurringEventInstance = {
+	recurringEventId?: string;
+	start: { dateTime: string; date: string };
+};
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index f440efaee9..100800c9f6 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -1,18 +1,22 @@
+import { DateTime } from 'luxon';
 import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	INode,
 	INodeListSearchItems,
 	INodeListSearchResult,
 	IPollFunctions,
 	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 import { RRule } from 'rrule';
 
+import type { RecurringEventInstance } from './EventInterface';
+
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
@@ -50,7 +54,6 @@ export async function googleApiRequestAllItems(
 	propertyName: string,
 	method: IHttpRequestMethods,
 	endpoint: string,
-
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
@@ -127,58 +130,75 @@ export async function getTimezones(
 	return { results };
 }
 
-type RecurentEvent = {
+export type RecurrentEvent = {
 	start: {
-		dateTime: string;
-		timeZone: string;
+		date?: string;
+		dateTime?: string;
+		timeZone?: string;
 	};
 	end: {
-		dateTime: string;
-		timeZone: string;
+		date?: string;
+		dateTime?: string;
+		timeZone?: string;
 	};
 	recurrence: string[];
 	nextOccurrence?: {
 		start: {
 			dateTime: string;
-			timeZone: string;
+			timeZone?: string;
 		};
 		end: {
 			dateTime: string;
-			timeZone: string;
+			timeZone?: string;
 		};
 	};
 };
 
-export function addNextOccurrence(items: RecurentEvent[]) {
+export function addNextOccurrence(items: RecurrentEvent[]) {
 	for (const item of items) {
 		if (item.recurrence) {
 			let eventRecurrence;
 			try {
 				eventRecurrence = item.recurrence.find((r) => r.toUpperCase().startsWith('RRULE'));
+
 				if (!eventRecurrence) continue;
 
-				const rrule = RRule.fromString(eventRecurrence);
+				const start = moment(item.start.dateTime || item.end.date).utc();
+				const end = moment(item.end.dateTime || item.end.date).utc();
+
+				const rruleWithStartDate = `DTSTART:${start.format(
+					'YYYYMMDDTHHmmss',
+				)}Z\n${eventRecurrence}`;
+
+				const rrule = RRule.fromString(rruleWithStartDate);
+
 				const until = rrule.options?.until;
 
-				const now = new Date();
-				if (until && until < now) {
+				const now = moment().utc();
+
+				if (until && moment(until).isBefore(now)) {
 					continue;
 				}
 
-				const nextOccurrence = rrule.after(new Date());
+				const nextDate = rrule.after(now.toDate(), false);
 
-				item.nextOccurrence = {
-					start: {
-						dateTime: moment(nextOccurrence).format(),
-						timeZone: item.start.timeZone,
-					},
-					end: {
-						dateTime: moment(nextOccurrence)
-							.add(moment(item.end.dateTime).diff(moment(item.start.dateTime)))
-							.format(),
-						timeZone: item.end.timeZone,
-					},
-				};
+				if (nextDate) {
+					const nextStart = moment(nextDate);
+
+					const duration = moment.duration(moment(end).diff(moment(start)));
+					const nextEnd = moment(nextStart).add(duration);
+
+					item.nextOccurrence = {
+						start: {
+							dateTime: nextStart.format(),
+							timeZone: item.start.timeZone,
+						},
+						end: {
+							dateTime: nextEnd.format(),
+							timeZone: item.end.timeZone,
+						},
+					};
+				}
 			} catch (error) {
 				console.log(`Error adding next occurrence ${eventRecurrence}`);
 			}
@@ -193,3 +213,92 @@ export function addTimezoneToDate(date: string, timezone: string) {
 	if (hasTimezone(date)) return date;
 	return moment.tz(date, timezone).utc().format();
 }
+
+async function requestWithRetries(
+	node: INode,
+	requestFn: () => Promise<any>,
+	retryCount: number = 0,
+	maxRetries: number = 10,
+	itemIndex: number = 0,
+): Promise<any> {
+	try {
+		return await requestFn();
+	} catch (error) {
+		if (!(error instanceof NodeApiError)) {
+			throw new NodeOperationError(node, error.message, { itemIndex });
+		}
+
+		if (retryCount >= maxRetries) throw error;
+
+		if (error.httpCode === '403' || error.httpCode === '429') {
+			const delay = 1000 * Math.pow(2, retryCount);
+
+			console.log(`Rate limit hit. Retrying in ${delay}ms... (Attempt ${retryCount + 1})`);
+
+			await sleep(delay);
+			return await requestWithRetries(node, requestFn, retryCount + 1, maxRetries, itemIndex);
+		}
+
+		throw error;
+	}
+}
+
+export async function googleApiRequestWithRetries({
+	context,
+	method,
+	resource,
+	body = {},
+	qs = {},
+	uri,
+	headers = {},
+	itemIndex = 0,
+}: {
+	context: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions;
+	method: IHttpRequestMethods;
+	resource: string;
+	body?: any;
+	qs?: IDataObject;
+	uri?: string;
+	headers?: IDataObject;
+	itemIndex?: number;
+}) {
+	const requestFn = async (): Promise<any> => {
+		return await googleApiRequest.call(context, method, resource, body, qs, uri, headers);
+	};
+
+	const retryCount = 0;
+	const maxRetries = 10;
+
+	return await requestWithRetries(context.getNode(), requestFn, retryCount, maxRetries, itemIndex);
+}
+
+export const eventExtendYearIntoFuture = (
+	data: RecurringEventInstance[],
+	timezone: string,
+	currentYear?: number, // for testing purposes
+) => {
+	const thisYear = currentYear || moment().tz(timezone).year();
+
+	return data.some((event) => {
+		if (!event.recurringEventId) return false;
+
+		const eventStart = event.start.dateTime || event.start.date;
+
+		const eventDateTime = moment(eventStart).tz(timezone);
+		if (!eventDateTime.isValid()) return false;
+
+		const targetYear = eventDateTime.year();
+
+		if (targetYear - thisYear >= 1) {
+			return true;
+		} else {
+			return false;
+		}
+	});
+};
+
+export function dateObjectToISO<T>(date: T): string {
+	if (date instanceof DateTime) return date.toISO();
+	if (date instanceof Date) return date.toISOString();
+	return date as string;
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
index 737faf8fa1..690ea4f243 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
@@ -36,7 +36,7 @@
 				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
 			},
 			{
-				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"label": "5 workflow automation for Mattermost that we love at n8n",
 				"icon": "🤖",
 				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
 			},
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 189f737888..3ae9ab7142 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -8,22 +8,33 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	NodeExecutionHint,
+} from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	NodeApiError,
+	NodeOperationError,
+	NodeExecutionOutput,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
 import { calendarFields, calendarOperations } from './CalendarDescription';
 import { eventFields, eventOperations } from './EventDescription';
-import type { IEvent } from './EventInterface';
+import type { IEvent, RecurringEventInstance } from './EventInterface';
 import {
 	addNextOccurrence,
 	addTimezoneToDate,
+	dateObjectToISO,
 	encodeURIComponentOnce,
+	eventExtendYearIntoFuture,
 	getCalendars,
 	getTimezones,
 	googleApiRequest,
 	googleApiRequestAllItems,
+	googleApiRequestWithRetries,
+	type RecurrentEvent,
 } from './GenericFunctions';
+import { sortItemKeysByPriorityList } from '../../../utils/utilities';
 
 export class GoogleCalendar implements INodeType {
 	description: INodeTypeDescription = {
@@ -31,7 +42,7 @@ export class GoogleCalendar implements INodeType {
 		name: 'googleCalendar',
 		icon: 'file:googleCalendar.svg',
 		group: ['input'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Google Calendar API',
 		defaults: {
@@ -132,6 +143,7 @@ export class GoogleCalendar implements INodeType {
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
+		const hints: NodeExecutionHint[] = [];
 		let responseData;
 
 		const resource = this.getNodeParameter('resource', 0);
@@ -148,8 +160,8 @@ export class GoogleCalendar implements INodeType {
 						const calendarId = decodeURIComponent(
 							this.getNodeParameter('calendar', i, '', { extractValue: true }) as string,
 						);
-						const timeMin = this.getNodeParameter('timeMin', i) as string;
-						const timeMax = this.getNodeParameter('timeMax', i) as string;
+						const timeMin = dateObjectToISO(this.getNodeParameter('timeMin', i));
+						const timeMax = dateObjectToISO(this.getNodeParameter('timeMax', i));
 						const options = this.getNodeParameter('options', i);
 						const outputFormat = options.outputFormat || 'availability';
 						const tz = this.getNodeParameter('options.timezone', i, '', {
@@ -200,8 +212,8 @@ export class GoogleCalendar implements INodeType {
 						const calendarId = encodeURIComponentOnce(
 							this.getNodeParameter('calendar', i, '', { extractValue: true }) as string,
 						);
-						const start = this.getNodeParameter('start', i) as string;
-						const end = this.getNodeParameter('end', i) as string;
+						const start = dateObjectToISO(this.getNodeParameter('start', i));
+						const end = dateObjectToISO(this.getNodeParameter('end', i));
 						const useDefaultReminders = this.getNodeParameter('useDefaultReminders', i) as boolean;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
@@ -379,16 +391,33 @@ export class GoogleCalendar implements INodeType {
 						if (tz) {
 							qs.timeZone = tz;
 						}
-						responseData = await googleApiRequest.call(
+						responseData = (await googleApiRequest.call(
 							this,
 							'GET',
 							`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
 							{},
 							qs,
-						);
+						)) as IDataObject;
 
 						if (responseData) {
-							responseData = addNextOccurrence([responseData]);
+							if (nodeVersion >= 1.3 && options.returnNextInstance && responseData.recurrence) {
+								const eventInstances =
+									((
+										(await googleApiRequest.call(
+											this,
+											'GET',
+											`/calendar/v3/calendars/${calendarId}/events/${responseData.id}/instances`,
+											{},
+											{
+												timeMin: new Date().toISOString(),
+												maxResults: 1,
+											},
+										)) as IDataObject
+									).items as IDataObject[]) || [];
+								responseData = eventInstances[0] ? [eventInstances[0]] : [responseData];
+							} else {
+								responseData = addNextOccurrence([responseData as RecurrentEvent]);
+							}
 						}
 					}
 					//https://developers.google.com/calendar/v3/reference/events/list
@@ -401,6 +430,22 @@ export class GoogleCalendar implements INodeType {
 						const tz = this.getNodeParameter('options.timeZone', i, '', {
 							extractValue: true,
 						}) as string;
+
+						if (nodeVersion >= 1.3) {
+							const timeMin = dateObjectToISO(this.getNodeParameter('timeMin', i));
+							const timeMax = dateObjectToISO(this.getNodeParameter('timeMax', i));
+							if (timeMin) {
+								qs.timeMin = addTimezoneToDate(timeMin, tz || timezone);
+							}
+							if (timeMax) {
+								qs.timeMax = addTimezoneToDate(timeMax, tz || timezone);
+							}
+
+							if (!options.recurringEventHandling || options.recurringEventHandling === 'expand') {
+								qs.singleEvents = true;
+							}
+						}
+
 						if (options.iCalUID) {
 							qs.iCalUID = options.iCalUID as string;
 						}
@@ -423,16 +468,19 @@ export class GoogleCalendar implements INodeType {
 							qs.singleEvents = options.singleEvents as boolean;
 						}
 						if (options.timeMax) {
-							qs.timeMax = addTimezoneToDate(options.timeMax as string, tz || timezone);
+							qs.timeMax = addTimezoneToDate(dateObjectToISO(options.timeMax), tz || timezone);
 						}
 						if (options.timeMin) {
-							qs.timeMin = addTimezoneToDate(options.timeMin as string, tz || timezone);
+							qs.timeMin = addTimezoneToDate(dateObjectToISO(options.timeMin), tz || timezone);
 						}
 						if (tz) {
 							qs.timeZone = tz;
 						}
 						if (options.updatedMin) {
-							qs.updatedMin = addTimezoneToDate(options.updatedMin as string, tz || timezone);
+							qs.updatedMin = addTimezoneToDate(
+								dateObjectToISO(options.updatedMin),
+								tz || timezone,
+							);
 						}
 						if (options.fields) {
 							qs.fields = options.fields as string;
@@ -460,7 +508,76 @@ export class GoogleCalendar implements INodeType {
 						}
 
 						if (responseData) {
-							responseData = addNextOccurrence(responseData);
+							if (nodeVersion >= 1.3 && options.recurringEventHandling === 'next') {
+								const updatedEvents: IDataObject[] = [];
+
+								for (const event of responseData) {
+									if (event.recurrence) {
+										const eventInstances =
+											((
+												(await googleApiRequestWithRetries({
+													context: this,
+													method: 'GET',
+													resource: `/calendar/v3/calendars/${calendarId}/events/${event.id}/instances`,
+													qs: {
+														timeMin: new Date().toISOString(),
+														maxResults: 1,
+													},
+													itemIndex: i,
+												})) as IDataObject
+											).items as IDataObject[]) || [];
+										updatedEvents.push(eventInstances[0] || event);
+										continue;
+									}
+
+									updatedEvents.push(event);
+								}
+								responseData = updatedEvents;
+							} else if (nodeVersion >= 1.3 && options.recurringEventHandling === 'first') {
+								responseData = responseData.filter((event: IDataObject) => {
+									if (
+										qs.timeMin &&
+										event.recurrence &&
+										event.created &&
+										event.created < qs.timeMin
+									) {
+										return false;
+									}
+
+									if (
+										qs.timeMax &&
+										event.recurrence &&
+										event.created &&
+										event.created > qs.timeMax
+									) {
+										return false;
+									}
+
+									return true;
+								});
+							} else if (nodeVersion < 1.3) {
+								// in node version above or equal to 1.3, this would correspond to the 'expand' option,
+								// so no need to add the next occurrence as event instances returned by the API
+								responseData = addNextOccurrence(responseData);
+							}
+
+							if (
+								!qs.timeMax &&
+								(!options.recurringEventHandling || options.recurringEventHandling === 'expand')
+							) {
+								const suggestTrim = eventExtendYearIntoFuture(
+									responseData as RecurringEventInstance[],
+									timezone,
+								);
+
+								if (suggestTrim) {
+									hints.push({
+										message:
+											"Some events repeat far into the future. To return less of them, add a 'Before' date or change the 'Recurring Event Handling' option.",
+										location: 'outputPane',
+									});
+								}
+							}
 						}
 					}
 					//https://developers.google.com/calendar/v3/reference/events/patch
@@ -468,7 +585,22 @@ export class GoogleCalendar implements INodeType {
 						const calendarId = encodeURIComponentOnce(
 							this.getNodeParameter('calendar', i, '', { extractValue: true }) as string,
 						);
-						const eventId = this.getNodeParameter('eventId', i) as string;
+						let eventId = this.getNodeParameter('eventId', i) as string;
+
+						if (nodeVersion >= 1.3) {
+							const modifyTarget = this.getNodeParameter('modifyTarget', i, 'instance') as string;
+							if (modifyTarget === 'event') {
+								const instance = (await googleApiRequest.call(
+									this,
+									'GET',
+									`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
+									{},
+									qs,
+								)) as IDataObject;
+								eventId = instance.recurringEventId as string;
+							}
+						}
+
 						const useDefaultReminders = this.getNodeParameter('useDefaultReminders', i) as boolean;
 						const updateFields = this.getNodeParameter('updateFields', i);
 						let updateTimezone = updateFields.timezone as string;
@@ -658,6 +790,30 @@ export class GoogleCalendar implements INodeType {
 				}
 			}
 		}
-		return [returnData];
+
+		const keysPriorityList = [
+			'id',
+			'summary',
+			'start',
+			'end',
+			'attendees',
+			'creator',
+			'organizer',
+			'description',
+			'location',
+			'created',
+			'updated',
+		];
+
+		let nodeExecutionData = returnData;
+		if (nodeVersion >= 1.3) {
+			nodeExecutionData = sortItemKeysByPriorityList(returnData, keysPriorityList);
+		}
+
+		if (hints.length) {
+			return new NodeExecutionOutput([nodeExecutionData], hints);
+		}
+
+		return [nodeExecutionData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/calendar/availability.json b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/calendar/availability.json
new file mode 100644
index 0000000000..a93cdc2366
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/calendar/availability.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "available": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/create.json b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/create.json
new file mode 100644
index 0000000000..dd2b74838e
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/create.json
@@ -0,0 +1,97 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            }
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            }
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "self": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "self": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "email",
+                "self"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "eventType": {
+            "type": "string"
+        },
+        "htmlLink": {
+            "type": "string"
+        },
+        "iCalUID": {
+            "type": "string"
+        },
+        "kind": {
+            "type": "string"
+        },
+        "reminders": {
+            "type": "object",
+            "properties": {
+                "useDefault": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "useDefault"
+            ]
+        },
+        "sequence": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/get.json b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/get.json
new file mode 100644
index 0000000000..0c8eb69d64
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/get.json
@@ -0,0 +1,198 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "summary": {
+            "type": "string"
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "attendees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "email": {
+                        "type": "string"
+                    },
+                    "responseStatus": {
+                        "type": "string"
+                    },
+                    "self": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "email",
+                    "responseStatus"
+                ]
+            }
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "self": {
+                    "type": "boolean"
+                },
+                "displayName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "conferenceData": {
+            "type": "object",
+            "properties": {
+                "entryPoints": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "entryPointType": {
+                                "type": "string"
+                            },
+                            "uri": {
+                                "type": "string"
+                            },
+                            "label": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "entryPointType",
+                            "uri"
+                        ]
+                    }
+                },
+                "conferenceSolution": {
+                    "type": "object",
+                    "properties": {
+                        "key": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ]
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "iconUri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "key",
+                        "name",
+                        "iconUri"
+                    ]
+                },
+                "conferenceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "entryPoints",
+                "conferenceSolution",
+                "conferenceId"
+            ]
+        },
+        "etag": {
+            "type": "string"
+        },
+        "eventType": {
+            "type": "string"
+        },
+        "hangoutLink": {
+            "type": "string"
+        },
+        "htmlLink": {
+            "type": "string"
+        },
+        "iCalUID": {
+            "type": "string"
+        },
+        "kind": {
+            "type": "string"
+        },
+        "reminders": {
+            "type": "object",
+            "properties": {
+                "useDefault": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "useDefault"
+            ]
+        },
+        "sequence": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "summary",
+        "updated",
+        "etag",
+        "kind"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/getAll.json b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/getAll.json
new file mode 100644
index 0000000000..40e1aad521
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/getAll.json
@@ -0,0 +1,99 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "summary": {
+            "type": "string"
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            }
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            }
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "self": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "self": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "eventType": {
+            "type": "string"
+        },
+        "htmlLink": {
+            "type": "string"
+        },
+        "iCalUID": {
+            "type": "string"
+        },
+        "kind": {
+            "type": "string"
+        },
+        "reminders": {
+            "type": "object",
+            "properties": {
+                "useDefault": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "useDefault"
+            ]
+        },
+        "sequence": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/update.json b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/update.json
new file mode 100644
index 0000000000..fe2ac886a2
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/__schema__/v1.3.0/event/update.json
@@ -0,0 +1,99 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"summary": {
+			"type": "string"
+		},
+		"start": {
+			"type": "object",
+			"properties": {
+				"dateTime": {
+					"type": "string"
+				},
+				"timeZone": {
+					"type": "string"
+				}
+			}
+		},
+		"end": {
+			"type": "object",
+			"properties": {
+				"dateTime": {
+					"type": "string"
+				},
+				"timeZone": {
+					"type": "string"
+				}
+			}
+		},
+		"creator": {
+			"type": "object",
+			"properties": {
+				"email": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"email"
+			]
+		},
+		"organizer": {
+			"type": "object",
+			"properties": {
+				"email": {
+					"type": "string"
+				},
+				"displayName": {
+					"type": "string"
+				},
+				"self": {
+					"type": "boolean"
+				}
+			},
+			"required": [
+				"email"
+			]
+		},
+		"created": {
+			"type": "string"
+		},
+		"updated": {
+			"type": "string"
+		},
+		"etag": {
+			"type": "string"
+		},
+		"eventType": {
+			"type": "string"
+		},
+		"htmlLink": {
+			"type": "string"
+		},
+		"iCalUID": {
+			"type": "string"
+		},
+		"kind": {
+			"type": "string"
+		},
+		"reminders": {
+			"type": "object",
+			"properties": {
+				"useDefault": {
+					"type": "boolean"
+				}
+			},
+			"required": [
+				"useDefault"
+			]
+		},
+		"sequence": {
+			"type": "integer"
+		},
+		"status": {
+			"type": "string"
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
index 1da9122e2c..6dab75ee0a 100644
--- a/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
@@ -1,4 +1,7 @@
-import { addTimezoneToDate } from '../GenericFunctions';
+import { DateTime } from 'luxon';
+
+import type { RecurringEventInstance } from '../EventInterface';
+import { addTimezoneToDate, dateObjectToISO, eventExtendYearIntoFuture } from '../GenericFunctions';
 
 describe('addTimezoneToDate', () => {
 	it('should add timezone to date', () => {
@@ -18,3 +21,87 @@ describe('addTimezoneToDate', () => {
 		expect(result4).toBe('2021-09-01T12:00:00.000+08:00');
 	});
 });
+
+describe('dateObjectToISO', () => {
+	test('should return ISO string for DateTime instance', () => {
+		const mockDateTime = DateTime.fromISO('2025-01-07T12:00:00');
+		const result = dateObjectToISO(mockDateTime);
+		expect(result).toBe('2025-01-07T12:00:00.000+00:00');
+	});
+
+	test('should return ISO string for Date instance', () => {
+		const mockDate = new Date('2025-01-07T12:00:00Z');
+		const result = dateObjectToISO(mockDate);
+		expect(result).toBe('2025-01-07T12:00:00.000Z');
+	});
+
+	test('should return string when input is not a DateTime or Date instance', () => {
+		const inputString = '2025-01-07T12:00:00';
+		const result = dateObjectToISO(inputString);
+		expect(result).toBe(inputString);
+	});
+});
+
+describe('eventExtendYearIntoFuture', () => {
+	const timezone = 'UTC';
+
+	it('should return true if any event extends into the next year', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: '2026-01-01T00:00:00Z', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(true);
+	});
+
+	it('should return false if no event extends into the next year', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: '2025-12-31T23:59:59Z', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for invalid event start dates', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: 'invalid-date', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for events without a recurringEventId', () => {
+		const events = [
+			{
+				recurringEventId: null,
+				start: { dateTime: '2025-01-01T00:00:00Z', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(false);
+	});
+
+	it('should handle events with only a date and no time', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: null, date: '2026-01-01' },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(true);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/addNextOccurrence.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/addNextOccurrence.test.ts
new file mode 100644
index 0000000000..5390500ca6
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/test/addNextOccurrence.test.ts
@@ -0,0 +1,89 @@
+import moment from 'moment-timezone';
+
+import type { RecurrentEvent } from '../GenericFunctions';
+import { addNextOccurrence } from '../GenericFunctions';
+
+const mockNow = '2024-09-06T16:30:00+03:00';
+jest.spyOn(global.Date, 'now').mockImplementation(() => moment(mockNow).valueOf());
+
+describe('addNextOccurrence', () => {
+	it('should not modify event if no recurrence exists', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-09-01T08:00:00Z',
+					timeZone: 'UTC',
+				},
+				end: {
+					dateTime: '2024-09-01T09:00:00Z',
+					timeZone: 'UTC',
+				},
+				recurrence: [],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result[0].nextOccurrence).toBeUndefined();
+	});
+
+	it('should handle event with no RRULE correctly', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-09-01T08:00:00Z',
+					timeZone: 'UTC',
+				},
+				end: {
+					dateTime: '2024-09-01T09:00:00Z',
+					timeZone: 'UTC',
+				},
+				recurrence: ['FREQ=WEEKLY;COUNT=2'],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result[0].nextOccurrence).toBeUndefined();
+	});
+
+	it('should ignore recurrence if until date is in the past', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-08-01T08:00:00Z',
+					timeZone: 'UTC',
+				},
+				end: {
+					dateTime: '2024-08-01T09:00:00Z',
+					timeZone: 'UTC',
+				},
+				recurrence: ['RRULE:FREQ=DAILY;UNTIL=20240805T000000Z'],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result[0].nextOccurrence).toBeUndefined();
+	});
+
+	it('should handle errors gracefully without breaking and return unchanged event', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-09-06T17:30:00+03:00',
+					timeZone: 'Europe/Berlin',
+				},
+				end: {
+					dateTime: '2024-09-06T18:00:00+03:00',
+					timeZone: 'Europe/Berlin',
+				},
+				recurrence: ['xxxxx'],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result).toEqual(event);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/node/event.getAll.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/node/event.getAll.test.ts
new file mode 100644
index 0000000000..5cdaf3e25b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/test/node/event.getAll.test.ts
@@ -0,0 +1,221 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { INode, IExecuteFunctions, IDataObject, NodeExecutionOutput } from 'n8n-workflow';
+
+import * as genericFunctions from '../../GenericFunctions';
+import { GoogleCalendar } from '../../GoogleCalendar.node';
+
+let response: IDataObject[] | undefined = [];
+let responseWithRetries: IDataObject | undefined = {};
+
+jest.mock('../../GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../GenericFunctions');
+	return {
+		...originalModule,
+		getTimezones: jest.fn(),
+		googleApiRequest: jest.fn(),
+		googleApiRequestAllItems: jest.fn(async function () {
+			return (() => response)();
+		}),
+		googleApiRequestWithRetries: jest.fn(async function () {
+			return (() => responseWithRetries)();
+		}),
+		addNextOccurrence: jest.fn(function (data: IDataObject[]) {
+			return data;
+		}),
+	};
+});
+
+describe('Google Calendar Node', () => {
+	let googleCalendar: GoogleCalendar;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		googleCalendar = new GoogleCalendar();
+		mockExecuteFunctions = mock<IExecuteFunctions>({
+			getInputData: jest.fn(),
+			getNode: jest.fn(),
+			getNodeParameter: jest.fn(),
+			getTimezone: jest.fn(),
+			helpers: {
+				constructExecutionMetaData: jest.fn().mockReturnValue([]),
+			},
+		});
+		response = undefined;
+		responseWithRetries = undefined;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('Google Calendar > Event > Get Many', () => {
+		it('should configure get all request parameters in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				iCalUID: 'uid',
+				maxAttendees: 25,
+				orderBy: 'startTime',
+				query: 'test query',
+				recurringEventHandling: 'expand',
+				showDeleted: true,
+				showHiddenInvitations: true,
+				updatedMin: '2024-12-21T00:00:00',
+			}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-26T00:00:00'); //timeMax
+
+			await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequestAllItems).toHaveBeenCalledWith(
+				'items',
+				'GET',
+				'/calendar/v3/calendars/myCalendar/events',
+				{},
+				{
+					iCalUID: 'uid',
+					maxAttendees: 25,
+					orderBy: 'startTime',
+					q: 'test query',
+					showDeleted: true,
+					showHiddenInvitations: true,
+					singleEvents: true,
+					timeMax: '2024-12-25T23:00:00Z',
+					timeMin: '2024-12-19T23:00:00Z',
+					timeZone: 'Europe/Berlin',
+					updatedMin: '2024-12-20T23:00:00Z',
+				},
+			);
+		});
+
+		it('should configure get all recurringEventHandling equals next in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				recurringEventHandling: 'next',
+			}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-26T00:00:00'); //timeMax
+
+			response = [
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+				},
+			];
+
+			responseWithRetries = { items: [] };
+
+			const result = await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequestAllItems).toHaveBeenCalledWith(
+				'items',
+				'GET',
+				'/calendar/v3/calendars/myCalendar/events',
+				{},
+				{
+					timeMax: '2024-12-25T23:00:00Z',
+					timeMin: '2024-12-19T23:00:00Z',
+					timeZone: 'Europe/Berlin',
+				},
+			);
+			expect(genericFunctions.googleApiRequestWithRetries).toHaveBeenCalledWith(
+				expect.objectContaining({
+					method: 'GET',
+					itemIndex: 0,
+					resource: '/calendar/v3/calendars/myCalendar/events/undefined/instances',
+				}),
+			);
+
+			expect(result).toEqual([[]]);
+		});
+
+		it('should configure get all recurringEventHandling equals first in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				recurringEventHandling: 'first',
+			}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-26T00:00:00'); //timeMax
+
+			response = [
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+					created: '2024-12-19T00:00:00',
+				},
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+					created: '2024-12-27T00:00:00',
+				},
+			];
+
+			const result = await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(result).toEqual([[]]);
+		});
+
+		it('should configure get all should have hint in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(''); //timeMax
+
+			response = [
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+					created: '2024-12-25T00:00:00',
+					recurringEventId: '1',
+					start: { dateTime: '2027-12-25T00:00:00' },
+				},
+			];
+
+			const result = await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect((result as NodeExecutionOutput).getHints()).toEqual([
+				{
+					message:
+						"Some events repeat far into the future. To return less of them, add a 'Before' date or change the 'Recurring Event Handling' option.",
+					location: 'outputPane',
+				},
+			]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
index b242c73063..1cada0cf06 100644
--- a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
@@ -14,7 +14,7 @@ jest.mock('../../GenericFunctions', () => ({
 	encodeURIComponentOnce: jest.fn(),
 }));
 
-describe('RespondToWebhook Node', () => {
+describe('Google Calendar Node', () => {
 	let googleCalendar: GoogleCalendar;
 	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
 
diff --git a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
index 442ba4799d..45389da271 100644
--- a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
@@ -9,48 +9,71 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import { getSendAndWaitConfig } from '../../../utils/sendAndWait/utils';
+import { createUtmCampaignLink } from '../../../utils/utilities';
 import { getGoogleAccessToken } from '../GenericFunctions';
 
+async function googleServiceAccountApiRequest(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	options: IRequestOptions,
+	noCredentials = false,
+): Promise<any> {
+	if (noCredentials) {
+		return await this.helpers.request(options);
+	}
+
+	const credentials = await this.getCredentials('googleApi');
+
+	const { access_token } = await getGoogleAccessToken.call(this, credentials, 'chat');
+	options.headers!.Authorization = `Bearer ${access_token}`;
+
+	return await this.helpers.request(options);
+}
+
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	noCredentials = false,
 	encoding?: null | undefined,
-): Promise<any> {
+) {
 	const options: IRequestOptions = {
 		headers: {
+			Accept: 'application/json',
 			'Content-Type': 'application/json',
 		},
 		method,
 		body,
 		qs,
 		uri: uri || `https://chat.googleapis.com${resource}`,
+		qsStringifyOptions: {
+			arrayFormat: 'repeat',
+		},
 		json: true,
 	};
 
-	if (Object.keys(body as IDataObject).length === 0) {
-		delete options.body;
-	}
-
 	if (encoding === null) {
 		options.encoding = null;
 	}
 
-	let responseData: IDataObject | undefined;
-	try {
-		if (noCredentials) {
-			responseData = await this.helpers.request(options);
-		} else {
-			const credentials = await this.getCredentials('googleApi');
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
 
-			const { access_token } = await getGoogleAccessToken.call(this, credentials, 'chat');
-			options.headers!.Authorization = `Bearer ${access_token}`;
-			responseData = await this.helpers.request(options);
+	let responseData;
+
+	try {
+		if (noCredentials || this.getNodeParameter('authentication', 0) === 'serviceAccount') {
+			responseData = await googleServiceAccountApiRequest.call(this, options, noCredentials);
+		} else {
+			responseData = await this.helpers.requestWithAuthentication.call(
+				this,
+				'googleChatOAuth2Api',
+				options,
+			);
 		}
 	} catch (error) {
 		if (error.code === 'ERR_OSSL_PEM_NO_START_LINE') {
@@ -59,6 +82,7 @@ export async function googleApiRequest(
 
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
+
 	if (Object.keys(responseData as IDataObject).length !== 0) {
 		return responseData;
 	} else {
@@ -134,3 +158,24 @@ export function getPagingParameters(resource: string, operation = 'getAll') {
 	];
 	return pagingParameters;
 }
+
+export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
+	const config = getSendAndWaitConfig(context);
+
+	const instanceId = context.getInstanceId();
+	const attributionText = '_This_ _message_ _was_ _sent_ _automatically_ _with_';
+	const link = createUtmCampaignLink('n8n-nodes-base.googleChat', instanceId);
+	const attribution = `${attributionText} _<${link}|n8n>_`;
+
+	const buttons: string[] = config.options.map(
+		(option) => `*<${`${config.url}?approved=${option.value}`}|${option.label}>*`,
+	);
+
+	const text = `${config.message}\n\n\n${buttons.join('   ')}\n\n${attribution}`;
+
+	const body = {
+		text,
+	};
+
+	return body;
+}
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json
index 326830ccbf..06853fd679 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.json
@@ -2,7 +2,10 @@
 	"node": "n8n-nodes-base.googleChat",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -14,5 +17,6 @@
 				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.googlechat/"
 			}
 		]
-	}
+	},
+	"alias": ["human", "form", "wait", "hitl", "approval"]
 }
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index 7a66126762..20665bdfee 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -13,7 +13,7 @@ import type {
 	INodeTypeDescription,
 	IRequestOptions,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
 import {
 	// attachmentFields,
@@ -27,10 +27,22 @@ import {
 	messageFields,
 	messageOperations,
 	spaceFields,
+	spaceIdProperty,
 	spaceOperations,
 } from './descriptions';
-import { googleApiRequest, googleApiRequestAllItems, validateJSON } from './GenericFunctions';
+import {
+	createSendAndWaitMessageBody,
+	googleApiRequest,
+	googleApiRequestAllItems,
+	validateJSON,
+} from './GenericFunctions';
 import type { IMessage, IMessageUi } from './MessageInterface';
+import { sendAndWaitWebhooksDescription } from '../../../utils/sendAndWait/descriptions';
+import {
+	configureWaitTillDate,
+	getSendAndWaitProperties,
+	sendAndWaitWebhook,
+} from '../../../utils/sendAndWait/utils';
 
 export class GoogleChat implements INodeType {
 	description: INodeTypeDescription = {
@@ -44,16 +56,49 @@ export class GoogleChat implements INodeType {
 		defaults: {
 			name: 'Google Chat',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
+		webhooks: sendAndWaitWebhooksDescription,
 		credentials: [
 			{
 				name: 'googleApi',
 				required: true,
 				testedBy: 'testGoogleTokenAuth',
+				displayOptions: {
+					show: {
+						authentication: ['serviceAccount'],
+					},
+				},
+			},
+			{
+				name: 'googleChatOAuth2Api',
+				required: true,
+				displayOptions: {
+					show: {
+						authentication: ['oAuth2'],
+					},
+				},
 			},
 		],
 		properties: [
+			{
+				displayName: 'Authentication',
+				name: 'authentication',
+				type: 'options',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'OAuth2 (recommended)',
+						value: 'oAuth2',
+					},
+					{
+						name: 'Service Account',
+						value: 'serviceAccount',
+					},
+				],
+				default: 'serviceAccount',
+			},
 			{
 				displayName: 'Resource',
 				name: 'resource',
@@ -100,9 +145,16 @@ export class GoogleChat implements INodeType {
 			...messageFields,
 			...spaceOperations,
 			...spaceFields,
+			...getSendAndWaitProperties([spaceIdProperty], 'message', undefined, {
+				noButtonStyle: true,
+				defaultApproveLabel: '✅ Approve',
+				defaultDisapproveLabel: '❌ Decline',
+			}).filter((p) => p.name !== 'subject'),
 		],
 	};
 
+	webhook = sendAndWaitWebhook;
+
 	methods = {
 		loadOptions: {
 			// Get all the spaces to display them to user so that they can
@@ -196,6 +248,19 @@ export class GoogleChat implements INodeType {
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
+
+		if (resource === 'message' && operation === SEND_AND_WAIT_OPERATION) {
+			const spaceId = this.getNodeParameter('spaceId', 0) as string;
+			const body = createSendAndWaitMessageBody(this);
+
+			await googleApiRequest.call(this, 'POST', `/v1/${spaceId}/messages`, body);
+
+			const waitTill = configureWaitTillDate(this);
+
+			await this.putExecutionToWait(waitTill);
+			return [this.getInputData()];
+		}
+
 		for (let i = 0; i < length; i++) {
 			try {
 				if (resource === 'media') {
diff --git a/packages/nodes-base/nodes/Google/Chat/__schema__/v1.0.0/message/create.json b/packages/nodes-base/nodes/Google/Chat/__schema__/v1.0.0/message/create.json
new file mode 100644
index 0000000000..7572b1fb9b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Chat/__schema__/v1.0.0/message/create.json
@@ -0,0 +1,108 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "sender": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "displayName",
+                "type"
+            ]
+        },
+        "createTime": {
+            "type": "string"
+        },
+        "text": {
+            "type": "string"
+        },
+        "thread": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name"
+            ]
+        },
+        "space": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "spaceThreadingState": {
+                    "type": "string"
+                },
+                "spaceType": {
+                    "type": "string"
+                },
+                "spaceHistoryState": {
+                    "type": "string"
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "lastActiveTime": {
+                    "type": "string"
+                },
+                "membershipCount": {
+                    "type": "object",
+                    "properties": {
+                        "joinedDirectHumanUserCount": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "joinedDirectHumanUserCount"
+                    ]
+                },
+                "spaceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "type",
+                "spaceThreadingState",
+                "spaceType",
+                "spaceHistoryState",
+                "spaceUri"
+            ]
+        },
+        "argumentText": {
+            "type": "string"
+        },
+        "formattedText": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "name",
+        "sender",
+        "createTime",
+        "thread",
+        "space"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts b/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts
index 18279be8f5..56dcb0d7c1 100644
--- a/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Chat/descriptions/MessageDescription.ts
@@ -1,4 +1,4 @@
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 
 export const messageOperations: INodeProperties[] = [
 	{
@@ -30,6 +30,12 @@ export const messageOperations: INodeProperties[] = [
 				description: 'Get a message',
 				action: 'Get a message',
 			},
+			{
+				name: 'Send and Wait for Response',
+				value: SEND_AND_WAIT_OPERATION,
+				description: 'Send a message and wait for response',
+				action: 'Send message and wait for response',
+			},
 			{
 				name: 'Update',
 				value: 'update',
@@ -41,27 +47,31 @@ export const messageOperations: INodeProperties[] = [
 	},
 ];
 
+export const spaceIdProperty: INodeProperties = {
+	displayName: 'Space Name or ID',
+	name: 'spaceId',
+	type: 'options',
+	required: true,
+	typeOptions: {
+		loadOptionsMethod: 'getSpaces',
+	},
+	default: '',
+	description:
+		'Space resource name, in the form "spaces/*". Example: spaces/AAAAMpdlehY. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+};
+
 export const messageFields: INodeProperties[] = [
 	/* -------------------------------------------------------------------------- */
 	/*                                 message:create                              */
 	/* -------------------------------------------------------------------------- */
 	{
-		displayName: 'Space Name or ID',
-		name: 'spaceId',
-		type: 'options',
-		required: true,
-		typeOptions: {
-			loadOptionsMethod: 'getSpaces',
-		},
+		...spaceIdProperty,
 		displayOptions: {
 			show: {
 				resource: ['message'],
 				operation: ['create'],
 			},
 		},
-		default: '',
-		description:
-			'Space resource name, in the form "spaces/*". Example: spaces/AAAAMpdlehY. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 	},
 	{
 		displayName: 'JSON Parameters',
diff --git a/packages/nodes-base/nodes/Google/Chat/googleChat.svg b/packages/nodes-base/nodes/Google/Chat/googleChat.svg
index 1646e75d0a..8f3922cc3a 100644
--- a/packages/nodes-base/nodes/Google/Chat/googleChat.svg
+++ b/packages/nodes-base/nodes/Google/Chat/googleChat.svg
@@ -1 +1,19 @@
-<svg xmlns="http://www.w3.org/2000/svg" data-name="Layer 1" viewBox="0 0 479.4 499.98"><path d="M121.24 275.69v-162.5h-71a37.86 37.86 0 0 0-37.8 37.9V487c0 16.9 20.4 25.3 32.3 13.4l78.1-78.1h222.4a37.77 37.77 0 0 0 37.8-37.8v-71h-223.9a37.86 37.86 0 0 1-37.9-37.81" style="fill:#00ac47" transform="translate(-12.44 -5.99)"/><path d="M454 6H159.14a37.77 37.77 0 0 0-37.8 37.8v69.4h223.9A37.77 37.77 0 0 1 383 151v162.4h71a37.77 37.77 0 0 0 37.8-37.8V43.79A37.77 37.77 0 0 0 454 6" style="fill:#5bb974" transform="translate(-12.44 -5.99)"/><path d="M345.24 113.19h-224v162.4a37.77 37.77 0 0 0 37.8 37.8h223.9v-162.3a37.71 37.71 0 0 0-37.7-37.9" style="fill:#00832d" transform="translate(-12.44 -5.99)"/></svg>
\ No newline at end of file
+
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewBox="0.00 0.00 311.00 320.00">
+<g stroke-width="2.00" fill="none" stroke-linecap="butt">
+<path stroke="#7e916f" vector-effect="non-scaling-stroke" d="   M 76.37 0.51   L 76.38 76.98"/>
+<path stroke="#1375eb" vector-effect="non-scaling-stroke" d="   M 76.38 76.98   L 0.00 76.96"/>
+<path stroke="#f3801d" vector-effect="non-scaling-stroke" d="   M 235.08 1.09   Q 234.92 1.15 234.81 1.22   Q 234.64 1.31 234.64 1.50   L 234.62 77.01"/>
+<path stroke="#7eb426" vector-effect="non-scaling-stroke" d="   M 234.62 77.01   Q 234.60 77.01 234.57 77.01"/>
+<path stroke="#91a080" vector-effect="non-scaling-stroke" d="   M 76.41 77.01   Q 76.40 77.00 76.38 76.98"/>
+<path stroke="#75783e" vector-effect="non-scaling-stroke" d="   M 310.53 76.77   L 234.62 77.01"/>
+<path stroke="#138495" vector-effect="non-scaling-stroke" d="   M 76.43 182.69   L 0.00 182.67"/>
+<path stroke="#00983a" vector-effect="non-scaling-stroke" d="   M 76.44 259.13   L 76.43 220.85"/>
+</g>
+<path fill="#0066da" d="   M 76.37 0.51   L 76.38 76.98   L 0.00 76.96   L 0.00 20.77   Q 0.85 14.81 3.53 10.76   Q 10.14 0.74 22.75 0.67   Q 49.41 0.53 76.37 0.51   Z"/>
+<path fill="#fbbc04" d="   M 76.37 0.51   L 233.79 0.53   A 1.61 1.57 -26.7 0 1 234.71 0.82   L 235.08 1.09   Q 234.92 1.15 234.81 1.22   Q 234.64 1.31 234.64 1.50   L 234.62 77.01   Q 234.60 77.01 234.57 77.01   L 76.41 77.01   Q 76.40 77.00 76.38 76.98   L 76.37 0.51   Z"/>
+<path fill="#ea4335" d="   M 235.08 1.09   L 310.53 76.77   L 234.62 77.01   L 234.64 1.50   Q 234.64 1.31 234.81 1.22   Q 234.92 1.15 235.08 1.09   Z"/>
+<path fill="#2684fc" d="   M 0.00 76.96   L 76.38 76.98   Q 76.40 77.00 76.41 77.01   L 76.43 182.69   L 0.00 182.67   L 0.00 76.96   Z"/>
+<path fill="#00ac47" d="   M 310.53 76.77   L 311.00 77.11   L 311.00 239.01   Q 308.34 253.54 295.94 257.78   Q 291.52 259.30 282.91 259.28   Q 227.02 259.19 169.99 259.11   Q 161.71 259.10 153.19 259.23   Q 152.72 259.24 152.39 259.57   Q 124.49 287.34 96.39 315.59   C 93.52 318.48 90.27 320.09 86.15 319.48   Q 80.39 318.63 77.66 313.54   Q 76.51 311.38 76.49 305.66   Q 76.42 282.47 76.44 259.13   L 76.43 220.85   L 114.21 183.07   A 1.79 1.77 22.3 0 1 115.47 182.55   L 233.77 182.59   A 0.83 0.83 0.0 0 0 234.60 181.76   L 234.57 77.01   Q 234.60 77.01 234.62 77.01   L 310.53 76.77   Z"/>
+<path fill="#00832d" d="   M 76.43 182.69   L 76.43 220.85   L 76.44 259.13   Q 52.47 259.27 28.91 259.22   Q 19.09 259.20 14.76 257.68   Q 2.62 253.44 0.00 238.88   L 0.00 182.67   L 76.43 182.69   Z"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Google/Chat/test/genericFunctions.test.ts b/packages/nodes-base/nodes/Google/Chat/test/genericFunctions.test.ts
new file mode 100644
index 0000000000..79aeb47732
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Chat/test/genericFunctions.test.ts
@@ -0,0 +1,97 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { type IExecuteFunctions } from 'n8n-workflow';
+
+import * as googleHelpers from '../../GenericFunctions';
+import { googleApiRequest } from '../GenericFunctions';
+
+jest.mock('../../GenericFunctions', () => ({
+	...jest.requireActual('../../GenericFunctions'),
+	getGoogleAccessToken: jest.fn().mockResolvedValue({ access_token: 'mock-access-token' }),
+}));
+
+describe('Test GoogleChat, googleApiRequest', () => {
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+
+		mockExecuteFunctions.helpers = {
+			requestWithAuthentication: jest.fn().mockResolvedValue({}),
+			request: jest.fn().mockResolvedValue({}),
+		} as any;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should call requestWithAuthentication when authentication set to OAuth2', async () => {
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('oAuth2'); // authentication
+
+		const result = await googleApiRequest.call(mockExecuteFunctions, 'POST', '/test-resource', {
+			text: 'test',
+		});
+
+		expect(result).toEqual({ success: true });
+
+		expect(mockExecuteFunctions.helpers.requestWithAuthentication).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.helpers.requestWithAuthentication).toHaveBeenCalledWith(
+			'googleChatOAuth2Api',
+			{
+				body: { text: 'test' },
+				headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
+				json: true,
+				method: 'POST',
+				qs: {},
+				qsStringifyOptions: { arrayFormat: 'repeat' },
+				uri: 'https://chat.googleapis.com/test-resource',
+			},
+		);
+	});
+
+	it('should call request when authentication set to serviceAccount', async () => {
+		const mockCredentials = {
+			email: 'test@example.com',
+			privateKey: 'private-key',
+		};
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('serviceAccount');
+		mockExecuteFunctions.getCredentials.mockResolvedValueOnce(mockCredentials);
+
+		const result = await googleApiRequest.call(mockExecuteFunctions, 'GET', '/test-resource');
+
+		expect(googleHelpers.getGoogleAccessToken).toHaveBeenCalledWith(mockCredentials, 'chat');
+		expect(mockExecuteFunctions.helpers.request).toHaveBeenCalledWith(
+			expect.objectContaining({
+				headers: expect.objectContaining({
+					Authorization: 'Bearer mock-access-token',
+				}),
+			}),
+		);
+		expect(result).toEqual({ success: true });
+	});
+
+	it('should call request when noCredentials equals true', async () => {
+		const result = await googleApiRequest.call(
+			mockExecuteFunctions,
+			'GET',
+			'/test-resource',
+			{},
+			{},
+			undefined,
+			true,
+		);
+
+		expect(mockExecuteFunctions.helpers.request).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.helpers.request).toHaveBeenCalledWith({
+			headers: { Accept: 'application/json', 'Content-Type': 'application/json' },
+			json: true,
+			method: 'GET',
+			qs: {},
+			qsStringifyOptions: { arrayFormat: 'repeat' },
+			uri: 'https://chat.googleapis.com/test-resource',
+		});
+		expect(result).toEqual({ success: true });
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Chat/test/node/sendAndWait.operation.test.ts b/packages/nodes-base/nodes/Google/Chat/test/node/sendAndWait.operation.test.ts
new file mode 100644
index 0000000000..0f18928c7c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Chat/test/node/sendAndWait.operation.test.ts
@@ -0,0 +1,60 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { type INode, SEND_AND_WAIT_OPERATION, type IExecuteFunctions } from 'n8n-workflow';
+
+import * as genericFunctions from '../../GenericFunctions';
+import { GoogleChat } from '../../GoogleChat.node';
+
+jest.mock('../../GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../GenericFunctions');
+	return {
+		...originalModule,
+		googleApiRequest: jest.fn(),
+	};
+});
+
+describe('Test GoogleChat, message => sendAndWait', () => {
+	let googleChat: GoogleChat;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		googleChat = new GoogleChat();
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		//node
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(SEND_AND_WAIT_OPERATION);
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('spaceID');
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>());
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+
+		//getSendAndWaitConfig
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my subject');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({});
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('approval');
+
+		// configureWaitTillDate
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({}); //options.limitWaitTime.values
+
+		const result = await googleChat.execute.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+		expect(genericFunctions.googleApiRequest).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(genericFunctions.googleApiRequest).toHaveBeenCalledWith('POST', '/v1/spaceID/messages', {
+			text: 'my message\n\n\n*<http://localhost/waiting-webhook/nodeID?approved=true|Approve>*\n\n_This_ _message_ _was_ _sent_ _automatically_ _with_ _<https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.googleChat_instanceId|n8n>_',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
index 674302b3d0..f701bab1a9 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
@@ -22,6 +22,7 @@ export class GoogleCloudNaturalLanguage implements INodeType {
 		defaults: {
 			name: 'Google Cloud Natural Language',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/__schema__/v1.0.0/document/analyzeSentiment.json b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/__schema__/v1.0.0/document/analyzeSentiment.json
new file mode 100644
index 0000000000..fe604e9d61
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/__schema__/v1.0.0/document/analyzeSentiment.json
@@ -0,0 +1,40 @@
+{
+    "type": "object",
+    "properties": {
+        "language": {
+            "type": "string"
+        },
+        "sentences": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "text": {
+                        "type": "object",
+                        "properties": {
+                            "content": {
+                                "type": "string"
+                            },
+                            "beginOffset": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "content",
+                            "beginOffset"
+                        ]
+                    }
+                },
+                "required": [
+                    "text",
+                    "sentiment"
+                ]
+            }
+        }
+    },
+    "required": [
+        "documentSentiment",
+        "language",
+        "sentences"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.ts b/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.ts
index 7613cb3b57..faf234ca79 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/GoogleCloudStorage.node.ts
@@ -15,6 +15,7 @@ export class GoogleCloudStorage implements INodeType {
 		defaults: {
 			name: 'Google Cloud Storage',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/bucket/get.json b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/bucket/get.json
new file mode 100644
index 0000000000..384c135909
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/bucket/get.json
@@ -0,0 +1,111 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "projectNumber": {
+            "type": "string"
+        },
+        "generation": {
+            "type": "string"
+        },
+        "metageneration": {
+            "type": "string"
+        },
+        "location": {
+            "type": "string"
+        },
+        "storageClass": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "timeCreated": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "softDeletePolicy": {
+            "type": "object",
+            "properties": {
+                "retentionDurationSeconds": {
+                    "type": "string"
+                },
+                "effectiveTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "retentionDurationSeconds"
+            ]
+        },
+        "iamConfiguration": {
+            "type": "object",
+            "properties": {
+                "bucketPolicyOnly": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enabled"
+                    ]
+                },
+                "uniformBucketLevelAccess": {
+                    "type": "object",
+                    "properties": {
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enabled"
+                    ]
+                },
+                "publicAccessPrevention": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "bucketPolicyOnly",
+                "uniformBucketLevelAccess",
+                "publicAccessPrevention"
+            ]
+        },
+        "locationType": {
+            "type": "string"
+        },
+        "rpo": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "selfLink",
+        "id",
+        "name",
+        "projectNumber",
+        "metageneration",
+        "location",
+        "storageClass",
+        "etag",
+        "timeCreated",
+        "updated",
+        "softDeletePolicy",
+        "locationType"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/create.json b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/create.json
new file mode 100644
index 0000000000..ca31e1f614
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/create.json
@@ -0,0 +1,59 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "mediaLink": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "bucket": {
+            "type": "string"
+        },
+        "generation": {
+            "type": "string"
+        },
+        "metageneration": {
+            "type": "string"
+        },
+        "contentType": {
+            "type": "string"
+        },
+        "storageClass": {
+            "type": "string"
+        },
+        "size": {
+            "type": "string"
+        },
+        "md5Hash": {
+            "type": "string"
+        },
+        "crc32c": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "timeCreated": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "timeStorageClassUpdated": {
+            "type": "string"
+        },
+        "timeFinalized": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/get.json b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/get.json
new file mode 100644
index 0000000000..9835e58179
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/get.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "mediaLink": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "bucket": {
+            "type": "string"
+        },
+        "generation": {
+            "type": "string"
+        },
+        "metageneration": {
+            "type": "string"
+        },
+        "contentType": {
+            "type": "string"
+        },
+        "storageClass": {
+            "type": "string"
+        },
+        "size": {
+            "type": "string"
+        },
+        "md5Hash": {
+            "type": "string"
+        },
+        "crc32c": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "timeCreated": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "timeStorageClassUpdated": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/getAll.json b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/getAll.json
new file mode 100644
index 0000000000..5bc957b969
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/getAll.json
@@ -0,0 +1,77 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "mediaLink": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "bucket": {
+            "type": "string"
+        },
+        "generation": {
+            "type": "string"
+        },
+        "metageneration": {
+            "type": "string"
+        },
+        "contentType": {
+            "type": "string"
+        },
+        "storageClass": {
+            "type": "string"
+        },
+        "size": {
+            "type": "string"
+        },
+        "md5Hash": {
+            "type": "string"
+        },
+        "crc32c": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "timeCreated": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "timeStorageClassUpdated": {
+            "type": "string"
+        },
+        "timeFinalized": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "selfLink",
+        "mediaLink",
+        "name",
+        "bucket",
+        "generation",
+        "metageneration",
+        "storageClass",
+        "size",
+        "md5Hash",
+        "crc32c",
+        "etag",
+        "timeCreated",
+        "updated",
+        "timeStorageClassUpdated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/update.json b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/update.json
new file mode 100644
index 0000000000..ca31e1f614
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/CloudStorage/__schema__/v1.0.0/object/update.json
@@ -0,0 +1,59 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "mediaLink": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "bucket": {
+            "type": "string"
+        },
+        "generation": {
+            "type": "string"
+        },
+        "metageneration": {
+            "type": "string"
+        },
+        "contentType": {
+            "type": "string"
+        },
+        "storageClass": {
+            "type": "string"
+        },
+        "size": {
+            "type": "string"
+        },
+        "md5Hash": {
+            "type": "string"
+        },
+        "crc32c": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "timeCreated": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "timeStorageClassUpdated": {
+            "type": "string"
+        },
+        "timeFinalized": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index a6da7b13fb..7fdd3ae9fc 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -31,6 +31,7 @@ export class GoogleContacts implements INodeType {
 		defaults: {
 			name: 'Google Contacts',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/create.json b/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/create.json
new file mode 100644
index 0000000000..4d9ebdd8c1
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/create.json
@@ -0,0 +1,255 @@
+{
+    "type": "object",
+    "properties": {
+        "resourceName": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "sources": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "etag": {
+                                "type": "string"
+                            },
+                            "updateTime": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "etag",
+                            "updateTime"
+                        ]
+                    }
+                },
+                "objectType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "sources",
+                "objectType"
+            ]
+        },
+        "names": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            },
+                            "sourcePrimary": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "familyName": {
+                        "type": "string"
+                    },
+                    "displayNameLastFirst": {
+                        "type": "string"
+                    },
+                    "unstructuredName": {
+                        "type": "string"
+                    },
+                    "givenName": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "displayName",
+                    "displayNameLastFirst",
+                    "unstructuredName"
+                ]
+            }
+        },
+        "photos": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "url"
+                ]
+            }
+        },
+        "memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "contactGroupMembership": {
+                        "type": "object",
+                        "properties": {
+                            "contactGroupId": {
+                                "type": "string"
+                            },
+                            "contactGroupResourceName": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "contactGroupId",
+                            "contactGroupResourceName"
+                        ]
+                    }
+                },
+                "required": [
+                    "metadata"
+                ]
+            }
+        },
+        "contactId": {
+            "type": "string"
+        },
+        "phoneNumbers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "canonicalForm": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "formattedType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "value",
+                    "type",
+                    "formattedType"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..fe8756f62f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,50 @@
+{
+    "type": "object",
+    "properties": {
+        "resourceName": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "names": {
+            "type": "object",
+            "properties": {
+                "displayName": {
+                    "type": "string"
+                },
+                "familyName": {
+                    "type": "string"
+                },
+                "givenName": {
+                    "type": "string"
+                },
+                "displayNameLastFirst": {
+                    "type": "string"
+                },
+                "unstructuredName": {
+                    "type": "string"
+                }
+            }
+        },
+        "contactId": {
+            "type": "string"
+        },
+        "phoneNumbers": {
+            "type": "object",
+            "properties": {
+                "mobile": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    },
+    "required": [
+        "resourceName",
+        "etag",
+        "contactId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/update.json b/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/update.json
new file mode 100644
index 0000000000..e7198e66f0
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Contacts/__schema__/v1.0.0/contact/update.json
@@ -0,0 +1,323 @@
+{
+    "type": "object",
+    "properties": {
+        "resourceName": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "contactId": {
+            "type": "string"
+        },
+        "phoneNumbers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            },
+                            "sourcePrimary": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "canonicalForm": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "formattedType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "value",
+                    "type",
+                    "formattedType"
+                ]
+            }
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "sources": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "etag": {
+                                "type": "string"
+                            },
+                            "updateTime": {
+                                "type": "string"
+                            },
+                            "profileMetadata": {
+                                "type": "object",
+                                "properties": {
+                                    "objectType": {
+                                        "type": "string"
+                                    },
+                                    "userTypes": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "objectType",
+                                    "userTypes"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "id",
+                            "etag"
+                        ]
+                    }
+                },
+                "objectType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "sources",
+                "objectType"
+            ]
+        },
+        "names": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            },
+                            "sourcePrimary": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "primary",
+                            "source",
+                            "sourcePrimary"
+                        ]
+                    },
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "givenName": {
+                        "type": "string"
+                    },
+                    "displayNameLastFirst": {
+                        "type": "string"
+                    },
+                    "unstructuredName": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "metadata"
+                ]
+            }
+        },
+        "photos": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "url",
+                    "default"
+                ]
+            }
+        },
+        "organizations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            },
+                            "sourcePrimary": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "primary",
+                            "source"
+                        ]
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "name"
+                ]
+            }
+        },
+        "memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "metadata": {
+                        "type": "object",
+                        "properties": {
+                            "source": {
+                                "type": "object",
+                                "properties": {
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "type",
+                                    "id"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "source"
+                        ]
+                    },
+                    "contactGroupMembership": {
+                        "type": "object",
+                        "properties": {
+                            "contactGroupId": {
+                                "type": "string"
+                            },
+                            "contactGroupResourceName": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "contactGroupId",
+                            "contactGroupResourceName"
+                        ]
+                    }
+                },
+                "required": [
+                    "metadata",
+                    "contactGroupMembership"
+                ]
+            }
+        }
+    },
+    "required": [
+        "resourceName",
+        "etag",
+        "contactId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/create.json b/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/create.json
new file mode 100644
index 0000000000..257c64b3be
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/create.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "mimeType": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "name",
+        "mimeType"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/get.json b/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/get.json
new file mode 100644
index 0000000000..ba2d017155
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/get.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "documentId": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "documentId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/update.json b/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/update.json
new file mode 100644
index 0000000000..d9cfafc984
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Docs/__schema__/v2.0.0/document/update.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "documentId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "documentId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v2.0.0/file/list.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v2.0.0/file/list.json
new file mode 100644
index 0000000000..0dcf19619b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v2.0.0/file/list.json
@@ -0,0 +1,15 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"name": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"id",
+		"name"
+	]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/drive/get.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/drive/get.json
new file mode 100644
index 0000000000..942fe0e90f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/drive/get.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/drive/list.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/drive/list.json
new file mode 100644
index 0000000000..5e156717d9
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/drive/list.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "kind": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "kind"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/copy.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/copy.json
new file mode 100644
index 0000000000..257c64b3be
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/copy.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "mimeType": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "name",
+        "mimeType"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/createFromText.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/createFromText.json
new file mode 100644
index 0000000000..6b84d794c1
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/createFromText.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/deleteFile.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/deleteFile.json
new file mode 100644
index 0000000000..c0d4713018
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/deleteFile.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/move.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/move.json
new file mode 100644
index 0000000000..257c64b3be
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/move.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "mimeType": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "name",
+        "mimeType"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/share.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/share.json
new file mode 100644
index 0000000000..82a7d5795b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/share.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "role": {
+            "type": "string"
+        },
+        "allowFileDiscovery": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "type",
+        "role"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/update.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/update.json
new file mode 100644
index 0000000000..dc7bbe50c5
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/update.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "mimeType": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/upload.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/upload.json
new file mode 100644
index 0000000000..3117af9d6e
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/file/upload.json
@@ -0,0 +1,364 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "mimeType": {
+            "type": "string"
+        },
+        "starred": {
+            "type": "boolean"
+        },
+        "trashed": {
+            "type": "boolean"
+        },
+        "explicitlyTrashed": {
+            "type": "boolean"
+        },
+        "parents": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "spaces": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "version": {
+            "type": "string"
+        },
+        "webContentLink": {
+            "type": "string"
+        },
+        "webViewLink": {
+            "type": "string"
+        },
+        "iconLink": {
+            "type": "string"
+        },
+        "hasThumbnail": {
+            "type": "boolean"
+        },
+        "thumbnailVersion": {
+            "type": "string"
+        },
+        "viewedByMe": {
+            "type": "boolean"
+        },
+        "createdTime": {
+            "type": "string"
+        },
+        "modifiedTime": {
+            "type": "string"
+        },
+        "modifiedByMeTime": {
+            "type": "string"
+        },
+        "modifiedByMe": {
+            "type": "boolean"
+        },
+        "owners": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "kind": {
+                        "type": "string"
+                    },
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "photoLink": {
+                        "type": "string"
+                    },
+                    "me": {
+                        "type": "boolean"
+                    },
+                    "permissionId": {
+                        "type": "string"
+                    },
+                    "emailAddress": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "kind",
+                    "displayName",
+                    "photoLink",
+                    "me",
+                    "permissionId",
+                    "emailAddress"
+                ]
+            }
+        },
+        "lastModifyingUser": {
+            "type": "object",
+            "properties": {
+                "kind": {
+                    "type": "string"
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "photoLink": {
+                    "type": "string"
+                },
+                "me": {
+                    "type": "boolean"
+                },
+                "permissionId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "kind",
+                "displayName",
+                "photoLink",
+                "me",
+                "permissionId",
+                "emailAddress"
+            ]
+        },
+        "shared": {
+            "type": "boolean"
+        },
+        "ownedByMe": {
+            "type": "boolean"
+        },
+        "capabilities": {
+            "type": "object",
+            "properties": {
+                "canAcceptOwnership": {
+                    "type": "boolean"
+                },
+                "canAddChildren": {
+                    "type": "boolean"
+                },
+                "canAddMyDriveParent": {
+                    "type": "boolean"
+                },
+                "canChangeCopyRequiresWriterPermission": {
+                    "type": "boolean"
+                },
+                "canChangeSecurityUpdateEnabled": {
+                    "type": "boolean"
+                },
+                "canChangeViewersCanCopyContent": {
+                    "type": "boolean"
+                },
+                "canComment": {
+                    "type": "boolean"
+                },
+                "canCopy": {
+                    "type": "boolean"
+                },
+                "canDelete": {
+                    "type": "boolean"
+                },
+                "canDownload": {
+                    "type": "boolean"
+                },
+                "canEdit": {
+                    "type": "boolean"
+                },
+                "canListChildren": {
+                    "type": "boolean"
+                },
+                "canModifyContent": {
+                    "type": "boolean"
+                },
+                "canModifyContentRestriction": {
+                    "type": "boolean"
+                },
+                "canModifyEditorContentRestriction": {
+                    "type": "boolean"
+                },
+                "canModifyOwnerContentRestriction": {
+                    "type": "boolean"
+                },
+                "canModifyLabels": {
+                    "type": "boolean"
+                },
+                "canMoveChildrenWithinDrive": {
+                    "type": "boolean"
+                },
+                "canMoveItemIntoTeamDrive": {
+                    "type": "boolean"
+                },
+                "canMoveItemOutOfDrive": {
+                    "type": "boolean"
+                },
+                "canMoveItemWithinDrive": {
+                    "type": "boolean"
+                },
+                "canReadLabels": {
+                    "type": "boolean"
+                },
+                "canReadRevisions": {
+                    "type": "boolean"
+                },
+                "canRemoveChildren": {
+                    "type": "boolean"
+                },
+                "canRemoveContentRestriction": {
+                    "type": "boolean"
+                },
+                "canRemoveMyDriveParent": {
+                    "type": "boolean"
+                },
+                "canRename": {
+                    "type": "boolean"
+                },
+                "canShare": {
+                    "type": "boolean"
+                },
+                "canTrash": {
+                    "type": "boolean"
+                },
+                "canUntrash": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "canAddChildren",
+                "canChangeCopyRequiresWriterPermission",
+                "canChangeSecurityUpdateEnabled",
+                "canChangeViewersCanCopyContent",
+                "canComment",
+                "canCopy",
+                "canDelete",
+                "canDownload",
+                "canEdit",
+                "canListChildren",
+                "canModifyContent",
+                "canModifyContentRestriction",
+                "canModifyEditorContentRestriction",
+                "canModifyOwnerContentRestriction",
+                "canModifyLabels",
+                "canMoveChildrenWithinDrive",
+                "canMoveItemIntoTeamDrive",
+                "canMoveItemOutOfDrive",
+                "canMoveItemWithinDrive",
+                "canReadLabels",
+                "canReadRevisions",
+                "canRemoveChildren",
+                "canRemoveContentRestriction",
+                "canRename",
+                "canShare",
+                "canTrash",
+                "canUntrash"
+            ]
+        },
+        "viewersCanCopyContent": {
+            "type": "boolean"
+        },
+        "copyRequiresWriterPermission": {
+            "type": "boolean"
+        },
+        "writersCanShare": {
+            "type": "boolean"
+        },
+        "permissions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "kind": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "role": {
+                        "type": "string"
+                    },
+                    "emailAddress": {
+                        "type": "string"
+                    },
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "deleted": {
+                        "type": "boolean"
+                    },
+                    "pendingOwner": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "kind",
+                    "id",
+                    "type",
+                    "role"
+                ]
+            }
+        },
+        "permissionIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "originalFilename": {
+            "type": "string"
+        },
+        "fullFileExtension": {
+            "type": "string"
+        },
+        "fileExtension": {
+            "type": "string"
+        },
+        "md5Checksum": {
+            "type": "string"
+        },
+        "sha1Checksum": {
+            "type": "string"
+        },
+        "sha256Checksum": {
+            "type": "string"
+        },
+        "size": {
+            "type": "string"
+        },
+        "quotaBytesUsed": {
+            "type": "string"
+        },
+        "headRevisionId": {
+            "type": "string"
+        },
+        "isAppAuthorized": {
+            "type": "boolean"
+        },
+        "linkShareMetadata": {
+            "type": "object",
+            "properties": {
+                "securityUpdateEligible": {
+                    "type": "boolean"
+                },
+                "securityUpdateEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "securityUpdateEligible",
+                "securityUpdateEnabled"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/fileFolder/search.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/fileFolder/search.json
new file mode 100644
index 0000000000..50c9b96c3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/fileFolder/search.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/create.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/create.json
new file mode 100644
index 0000000000..257c64b3be
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/create.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "mimeType": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "name",
+        "mimeType"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/deleteFolder.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/deleteFolder.json
new file mode 100644
index 0000000000..d6a599936f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/deleteFolder.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "fileId": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "fileId",
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/share.json b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/share.json
new file mode 100644
index 0000000000..e83d29a938
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Drive/__schema__/v3.0.0/folder/share.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "role": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
index 7053c24165..f1d351f374 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as create from '../../../../v2/actions/drive/create.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -25,15 +23,6 @@ jest.mock('uuid', () => {
 });
 
 describe('test GoogleDriveV2: drive create', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			resource: 'drive',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
index 05b5002ab5..9382f426fd 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as deleteDrive from '../../../../v2/actions/drive/deleteDrive.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: drive deleteDrive', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			resource: 'drive',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
index 128b74a220..4e057aefa1 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as get from '../../../../v2/actions/drive/get.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: drive get', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			resource: 'drive',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
index ca8e6deb10..c6dd132a0e 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import * as list from '../../../../v2/actions/drive/list.operation';
 import * as transport from '../../../../v2/transport';
@@ -23,15 +22,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: drive list', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with limit', async () => {
 		const nodeParameters = {
 			resource: 'drive',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
index afa01998b8..4aa6a600a4 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as update from '../../../../v2/actions/drive/update.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: drive update', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			resource: 'drive',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
index 18812ba157..f1f30cd53f 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as copy from '../../../../v2/actions/file/copy.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file copy', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'copy',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
index 5fc45c8d98..248fe2edbd 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as createFromText from '../../../../v2/actions/file/createFromText.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file createFromText', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'createFromText',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
index 13fb7ae791..1b26d5a945 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as deleteFile from '../../../../v2/actions/file/deleteFile.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file deleteFile', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'deleteFile',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
index e7f4be6294..9defcefbb7 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as download from '../../../../v2/actions/file/download.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file download', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'deleteFile',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
index 03498e06ec..b5d09ea92e 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import * as move from '../../../../v2/actions/file/move.operation';
 import * as transport from '../../../../v2/transport';
@@ -21,15 +20,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file move', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'move',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
index e8ed98a124..0807f5dabf 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as share from '../../../../v2/actions/file/share.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file share', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'share',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
index a8dbfa5570..281513378b 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as update from '../../../../v2/actions/file/update.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: file update', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			operation: 'update',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
index fa39890cb7..c093f719bc 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import * as upload from '../../../../v2/actions/file/upload.operation';
 import * as utils from '../../../../v2/helpers/utils';
@@ -37,20 +36,10 @@ jest.mock('../../../../v2/helpers/utils', () => {
 });
 
 describe('test GoogleDriveV2: file upload', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
 	beforeEach(() => {
 		jest.clearAllMocks();
 	});
 
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-		jest.unmock('../../../../v2/helpers/utils');
-	});
-
 	it('should upload buffers', async () => {
 		const nodeParameters = {
 			name: 'newFile.txt',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
index 630bd9469d..f58171b42b 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import * as search from '../../../../v2/actions/fileFolder/search.operation';
 import * as transport from '../../../../v2/transport';
@@ -23,15 +22,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: fileFolder search', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('returnAll = false', async () => {
 		const nodeParameters = {
 			searchMethod: 'name',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
index 26855b6e5c..a0f3f19159 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as create from '../../../../v2/actions/folder/create.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: folder create', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			resource: 'folder',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
index ed486720f9..b040a3b033 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as deleteFolder from '../../../../v2/actions/folder/deleteFolder.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: folder deleteFolder', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with PATCH', async () => {
 		const nodeParameters = {
 			resource: 'folder',
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
index 4940b6b90a..8f1f2b0475 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
@@ -1,5 +1,3 @@
-import nock from 'nock';
-
 import * as share from '../../../../v2/actions/folder/share.operation';
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction, driveNode } from '../helpers';
@@ -15,15 +13,6 @@ jest.mock('../../../../v2/transport', () => {
 });
 
 describe('test GoogleDriveV2: folder share', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	it('should be called with', async () => {
 		const nodeParameters = {
 			resource: 'folder',
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index 672b7d1ada..e32fcaab58 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -82,6 +82,8 @@ export async function googleApiRequestAllItems(
 const isValidDate = (str: string) =>
 	moment(str, ['YYYY-MM-DD HH:mm:ss Z', moment.ISO_8601], true).isValid();
 
+const protoKeys = ['__proto__', 'prototype', 'constructor'];
+
 // Both functions below were taken from Stack Overflow jsonToDocument was fixed as it was unable to handle null values correctly
 // https://stackoverflow.com/questions/62246410/how-to-convert-a-firestore-document-to-plain-json-and-vice-versa
 // Great thanks to https://stackoverflow.com/users/3915246/mahindar
@@ -104,10 +106,11 @@ export function jsonToDocument(value: string | number | IDataObject | IDataObjec
 	} else if (value && value.constructor === Array) {
 		return { arrayValue: { values: value.map((v) => jsonToDocument(v)) } };
 	} else if (typeof value === 'object') {
-		const obj = {};
-		for (const o of Object.keys(value)) {
-			//@ts-ignore
-			obj[o] = jsonToDocument(value[o] as IDataObject);
+		const obj: IDataObject = {};
+		for (const key of Object.keys(value)) {
+			if (value.hasOwnProperty(key) && !protoKeys.includes(key)) {
+				obj[key] = jsonToDocument((value as IDataObject)[key] as IDataObject);
+			}
 		}
 		return { mapValue: { fields: obj } };
 	}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
index d7a3a40d61..faa33f71e2 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
@@ -17,7 +17,6 @@ import {
 	googleApiRequestAllItems,
 	jsonToDocument,
 } from './GenericFunctions';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleFirebaseCloudFirestore implements INodeType {
 	description: INodeTypeDescription = {
@@ -32,6 +31,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 		defaults: {
 			name: 'Google Cloud Firestore',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -120,7 +120,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const itemData = generatePairedItemData(items.length);
+
 		const returnData: INodeExecutionData[] = [];
 		let responseData;
 
@@ -135,7 +135,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 		if (nodeVersion >= 1.1) {
 			itemsLength = items.length;
 		} else {
-			fallbackPairedItems = generatePairedItemData(items.length);
+			fallbackPairedItems = [];
 		}
 
 		if (resource === 'document') {
@@ -171,10 +171,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 						.filter((el: IDataObject) => !!el);
 				}
 
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData },
-				);
+				const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 
 				returnData.push(...executionData);
 			} else if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/collection/getAll.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/collection/getAll.json
new file mode 100644
index 0000000000..869e147c21
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/collection/getAll.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "name"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/create.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/create.json
new file mode 100644
index 0000000000..8e33129296
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/create.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "_name": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        },
+        "_createTime": {
+            "type": "string"
+        },
+        "_updateTime": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/delete.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/delete.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/delete.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/get.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/get.json
new file mode 100644
index 0000000000..33d22b7911
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/get.json
@@ -0,0 +1,48 @@
+{
+    "type": "object",
+    "properties": {
+        "readTime": {
+            "type": "string"
+        },
+        "found": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "fields": {
+                    "type": "object",
+                    "properties": {
+                        "nome": {
+                            "type": "object",
+                            "properties": {
+                                "stringValue": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "stringValue"
+                            ]
+                        }
+                    }
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "updateTime": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "fields",
+                "createTime",
+                "updateTime",
+                "id"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/getAll.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/getAll.json
new file mode 100644
index 0000000000..8e33129296
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/getAll.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "_name": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        },
+        "_createTime": {
+            "type": "string"
+        },
+        "_updateTime": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/query.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/query.json
new file mode 100644
index 0000000000..00e682f931
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/query.json
@@ -0,0 +1,81 @@
+{
+    "type": "object",
+    "properties": {
+        "document": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "fields": {
+                    "type": "object",
+                    "properties": {
+                        "user_id": {
+                            "type": "object",
+                            "properties": {
+                                "referenceValue": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "referenceValue"
+                            ]
+                        },
+                        "deleted": {
+                            "type": "object",
+                            "properties": {
+                                "booleanValue": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "booleanValue"
+                            ]
+                        },
+                        "time_created": {
+                            "type": "object",
+                            "properties": {
+                                "timestampValue": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "timestampValue"
+                            ]
+                        },
+                        "word_count": {
+                            "type": "object",
+                            "properties": {
+                                "integerValue": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "integerValue"
+                            ]
+                        }
+                    }
+                },
+                "createTime": {
+                    "type": "string"
+                },
+                "updateTime": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "fields",
+                "createTime",
+                "updateTime",
+                "id"
+            ]
+        },
+        "readTime": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/upsert.json b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/upsert.json
new file mode 100644
index 0000000000..a703727ea3
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/__schema__/v1.1.0/document/upsert.json
@@ -0,0 +1,12 @@
+{
+    "type": "object",
+    "properties": {
+        "updateTime": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "updateTime",
+        "status"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
index 141fdb90e1..213115ef1d 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
@@ -25,6 +25,7 @@ export class GoogleFirebaseRealtimeDatabase implements INodeType {
 		defaults: {
 			name: 'Google Cloud Realtime Database',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index cb2593c83c..6846df9191 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -26,6 +26,7 @@ export class GSuiteAdmin implements INodeType {
 		defaults: {
 			name: 'Google Workspace Admin',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/create.json b/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/create.json
new file mode 100644
index 0000000000..78cc7ba1d7
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/create.json
@@ -0,0 +1,50 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "primaryEmail": {
+            "type": "string"
+        },
+        "name": {
+            "type": "object",
+            "properties": {
+                "givenName": {
+                    "type": "string"
+                },
+                "familyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "givenName",
+                "familyName"
+            ]
+        },
+        "isAdmin": {
+            "type": "boolean"
+        },
+        "isDelegatedAdmin": {
+            "type": "boolean"
+        },
+        "creationTime": {
+            "type": "string"
+        },
+        "customerId": {
+            "type": "string"
+        },
+        "orgUnitPath": {
+            "type": "string"
+        },
+        "isMailboxSetup": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/get.json b/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/get.json
new file mode 100644
index 0000000000..c40337c7e6
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/get.json
@@ -0,0 +1,116 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "primaryEmail": {
+            "type": "string"
+        },
+        "name": {
+            "type": "object",
+            "properties": {
+                "givenName": {
+                    "type": "string"
+                },
+                "familyName": {
+                    "type": "string"
+                },
+                "fullName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "givenName",
+                "familyName",
+                "fullName"
+            ]
+        },
+        "isAdmin": {
+            "type": "boolean"
+        },
+        "isDelegatedAdmin": {
+            "type": "boolean"
+        },
+        "lastLoginTime": {
+            "type": "string"
+        },
+        "creationTime": {
+            "type": "string"
+        },
+        "agreedToTerms": {
+            "type": "boolean"
+        },
+        "suspended": {
+            "type": "boolean"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "changePasswordAtNextLogin": {
+            "type": "boolean"
+        },
+        "ipWhitelisted": {
+            "type": "boolean"
+        },
+        "emails": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "address": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "address"
+                ]
+            }
+        },
+        "languages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "languageCode": {
+                        "type": "string"
+                    },
+                    "preference": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "languageCode",
+                    "preference"
+                ]
+            }
+        },
+        "customerId": {
+            "type": "string"
+        },
+        "orgUnitPath": {
+            "type": "string"
+        },
+        "isMailboxSetup": {
+            "type": "boolean"
+        },
+        "isEnrolledIn2Sv": {
+            "type": "boolean"
+        },
+        "isEnforcedIn2Sv": {
+            "type": "boolean"
+        },
+        "includeInGlobalAddressList": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..387d6a7ffe
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,163 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "primaryEmail": {
+            "type": "string"
+        },
+        "name": {
+            "type": "object",
+            "properties": {
+                "givenName": {
+                    "type": "string"
+                },
+                "familyName": {
+                    "type": "string"
+                },
+                "fullName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "givenName",
+                "familyName",
+                "fullName"
+            ]
+        },
+        "isAdmin": {
+            "type": "boolean"
+        },
+        "isDelegatedAdmin": {
+            "type": "boolean"
+        },
+        "lastLoginTime": {
+            "type": "string"
+        },
+        "creationTime": {
+            "type": "string"
+        },
+        "agreedToTerms": {
+            "type": "boolean"
+        },
+        "suspended": {
+            "type": "boolean"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "changePasswordAtNextLogin": {
+            "type": "boolean"
+        },
+        "ipWhitelisted": {
+            "type": "boolean"
+        },
+        "emails": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "address": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    },
+                    "type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "address"
+                ]
+            }
+        },
+        "languages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "languageCode": {
+                        "type": "string"
+                    },
+                    "preference": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "languageCode",
+                    "preference"
+                ]
+            }
+        },
+        "customerId": {
+            "type": "string"
+        },
+        "orgUnitPath": {
+            "type": "string"
+        },
+        "isMailboxSetup": {
+            "type": "boolean"
+        },
+        "isEnrolledIn2Sv": {
+            "type": "boolean"
+        },
+        "isEnforcedIn2Sv": {
+            "type": "boolean"
+        },
+        "includeInGlobalAddressList": {
+            "type": "boolean"
+        },
+        "thumbnailPhotoUrl": {
+            "type": "string"
+        },
+        "thumbnailPhotoEtag": {
+            "type": "string"
+        },
+        "recoveryEmail": {
+            "type": "string"
+        },
+        "recoveryPhone": {
+            "type": "string"
+        },
+        "aliases": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "organizations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "title": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    },
+                    "customType": {
+                        "type": "string"
+                    },
+                    "costCenter": {
+                        "type": "string"
+                    },
+                    "department": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "customType"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 6993ab1930..2169876d38 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -17,7 +17,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import MailComposer from 'nodemailer/lib/mail-composer';
 
 import type { IEmail } from '../../../utils/sendAndWait/interfaces';
-import { escapeHtml } from '../../../utils/utilities';
+import { createUtmCampaignLink, escapeHtml } from '../../../utils/utilities';
 import { getGoogleAccessToken } from '../GenericFunctions';
 
 export interface IAttachments {
@@ -433,9 +433,7 @@ export function prepareEmailBody(
 
 	if (appendAttribution) {
 		const attributionText = 'This email was sent automatically with ';
-		const link = `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
-			'n8n-nodes-base.gmail',
-		)}${instanceId ? '_' + instanceId : ''}`;
+		const link = createUtmCampaignLink('n8n-nodes-base.gmail', instanceId);
 		if (emailType === 'html') {
 			message = `
 			${message}
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index 878e9c0677..5983e1fee1 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -2,7 +2,10 @@
 	"node": "n8n-nodes-base.gmail",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -52,5 +55,5 @@
 			}
 		]
 	},
-	"alias": ["email", "human", "form", "wait"]
+	"alias": ["email", "human", "form", "wait", "hitl", "approval"]
 }
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/create.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/create.json
new file mode 100644
index 0000000000..ca46dd559a
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/create.json
@@ -0,0 +1,33 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "message": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "threadId": {
+                    "type": "string"
+                },
+                "labelIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "id",
+                "threadId",
+                "labelIds"
+            ]
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/get.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/get.json
new file mode 100644
index 0000000000..0f401bd3a3
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/get.json
@@ -0,0 +1,147 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "sizeEstimate": {
+            "type": "integer"
+        },
+        "headers": {
+            "type": "object",
+            "properties": {
+                "content-type": {
+                    "type": "string"
+                },
+                "subject": {
+                    "type": "string"
+                },
+                "message-id": {
+                    "type": "string"
+                },
+                "date": {
+                    "type": "string"
+                },
+                "mime-version": {
+                    "type": "string"
+                },
+                "from": {
+                    "type": "string"
+                },
+                "to": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content-type",
+                "message-id",
+                "date",
+                "mime-version",
+                "from"
+            ]
+        },
+        "text": {
+            "type": "string"
+        },
+        "textAsHtml": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "address",
+                            "name"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "html",
+                "text"
+            ]
+        },
+        "messageId": {
+            "type": "string"
+        },
+        "to": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "address",
+                            "name"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "html",
+                "text"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds",
+        "sizeEstimate",
+        "headers",
+        "date",
+        "from",
+        "messageId",
+        "html"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/getAll.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/getAll.json
new file mode 100644
index 0000000000..410ed1548d
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/draft/getAll.json
@@ -0,0 +1,151 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "sizeEstimate": {
+            "type": "integer"
+        },
+        "headers": {
+            "type": "object",
+            "properties": {
+                "mime-version": {
+                    "type": "string"
+                },
+                "date": {
+                    "type": "string"
+                },
+                "message-id": {
+                    "type": "string"
+                },
+                "subject": {
+                    "type": "string"
+                },
+                "from": {
+                    "type": "string"
+                },
+                "to": {
+                    "type": "string"
+                },
+                "content-type": {
+                    "type": "string"
+                },
+                "received": {
+                    "type": "string"
+                },
+                "content-transfer-encoding": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "date",
+                "message-id",
+                "from"
+            ]
+        },
+        "text": {
+            "type": "string"
+        },
+        "textAsHtml": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "to": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "address",
+                            "name"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "html",
+                "text"
+            ]
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "address",
+                            "name"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "html",
+                "text"
+            ]
+        },
+        "messageId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds",
+        "sizeEstimate",
+        "headers",
+        "html",
+        "date",
+        "from",
+        "messageId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/create.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/create.json
new file mode 100644
index 0000000000..9feadfc661
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/create.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "messageListVisibility": {
+            "type": "string"
+        },
+        "labelListVisibility": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/get.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/get.json
new file mode 100644
index 0000000000..4a6d183951
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/get.json
@@ -0,0 +1,41 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "messagesTotal": {
+            "type": "integer"
+        },
+        "messagesUnread": {
+            "type": "integer"
+        },
+        "threadsTotal": {
+            "type": "integer"
+        },
+        "threadsUnread": {
+            "type": "integer"
+        },
+        "messageListVisibility": {
+            "type": "string"
+        },
+        "labelListVisibility": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "type",
+        "messagesTotal",
+        "messagesUnread",
+        "threadsTotal",
+        "threadsUnread"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/getAll.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/getAll.json
new file mode 100644
index 0000000000..391af97cf3
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/label/getAll.json
@@ -0,0 +1,25 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "messageListVisibility": {
+            "type": "string"
+        },
+        "labelListVisibility": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "type"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/addLabels.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/addLabels.json
new file mode 100644
index 0000000000..323b3628bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/addLabels.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/delete.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/delete.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/get.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/get.json
new file mode 100644
index 0000000000..2f25dca168
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/get.json
@@ -0,0 +1,170 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "sizeEstimate": {
+            "type": "integer"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "headers": {
+            "type": "object",
+            "properties": {
+                "delivered-to": {
+                    "type": "string"
+                },
+                "received": {
+                    "type": "string"
+                },
+                "x-google-smtp-source": {
+                    "type": "string"
+                },
+                "x-received": {
+                    "type": "string"
+                },
+                "arc-seal": {
+                    "type": "string"
+                },
+                "arc-message-signature": {
+                    "type": "string"
+                },
+                "arc-authentication-results": {
+                    "type": "string"
+                },
+                "return-path": {
+                    "type": "string"
+                },
+                "received-spf": {
+                    "type": "string"
+                },
+                "authentication-results": {
+                    "type": "string"
+                },
+                "dkim-signature": {
+                    "type": "string"
+                },
+                "content-type": {
+                    "type": "string"
+                },
+                "date": {
+                    "type": "string"
+                },
+                "mime-version": {
+                    "type": "string"
+                },
+                "to": {
+                    "type": "string"
+                },
+                "subject": {
+                    "type": "string"
+                },
+                "message-id": {
+                    "type": "string"
+                },
+                "from": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content-type",
+                "date",
+                "mime-version",
+                "subject",
+                "message-id",
+                "from"
+            ]
+        },
+        "text": {
+            "type": "string"
+        },
+        "textAsHtml": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "to": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "address",
+                            "name"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "html",
+                "text"
+            ]
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "address": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "address",
+                            "name"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "html",
+                "text"
+            ]
+        },
+        "messageId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/getAll.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/getAll.json
new file mode 100644
index 0000000000..6151c55ce0
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/getAll.json
@@ -0,0 +1,66 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "sizeEstimate": {
+            "type": "integer"
+        },
+        "snippet": {
+            "type": "string"
+        },
+        "payload": {
+            "type": "object",
+            "properties": {
+                "mimeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "mimeType"
+            ]
+        },
+        "historyId": {
+            "type": "string"
+        },
+        "internalDate": {
+            "type": "string"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "Subject": {
+            "type": "string"
+        },
+        "From": {
+            "type": "string"
+        },
+        "To": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "sizeEstimate"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/markAsRead.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/markAsRead.json
new file mode 100644
index 0000000000..6a422c6d2e
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/markAsRead.json
@@ -0,0 +1,21 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "id",
+        "threadId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/markAsUnread.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/markAsUnread.json
new file mode 100644
index 0000000000..c2befb668c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/markAsUnread.json
@@ -0,0 +1,34 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "snippet": {
+            "type": "string"
+        },
+        "sizeEstimate": {
+            "type": "integer"
+        },
+        "historyId": {
+            "type": "string"
+        },
+        "internalDate": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/removeLabels.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/removeLabels.json
new file mode 100644
index 0000000000..323b3628bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/removeLabels.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/reply.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/reply.json
new file mode 100644
index 0000000000..3bfc0ad85c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/reply.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/send.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/send.json
new file mode 100644
index 0000000000..323b3628bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/send.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/sendAndWait.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/sendAndWait.json
new file mode 100644
index 0000000000..ef2c004121
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/message/sendAndWait.json
@@ -0,0 +1,13 @@
+{
+    "type": "object",
+    "properties": {
+        "data": {
+            "type": "object",
+            "properties": {
+                "approved": {
+                    "type": "boolean"
+                }
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/addLabels.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/addLabels.json
new file mode 100644
index 0000000000..e5507b39bf
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/addLabels.json
@@ -0,0 +1,33 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "messages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "threadId": {
+                        "type": "string"
+                    },
+                    "labelIds": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "threadId",
+                    "labelIds"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/get.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/get.json
new file mode 100644
index 0000000000..5b0d1009fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/get.json
@@ -0,0 +1,86 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "historyId": {
+            "type": "string"
+        },
+        "messages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "threadId": {
+                        "type": "string"
+                    },
+                    "snippet": {
+                        "type": "string"
+                    },
+                    "payload": {
+                        "type": "object",
+                        "properties": {
+                            "mimeType": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "mimeType"
+                        ]
+                    },
+                    "sizeEstimate": {
+                        "type": "integer"
+                    },
+                    "historyId": {
+                        "type": "string"
+                    },
+                    "internalDate": {
+                        "type": "string"
+                    },
+                    "labels": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "name"
+                            ]
+                        }
+                    },
+                    "To": {
+                        "type": "string"
+                    },
+                    "Subject": {
+                        "type": "string"
+                    },
+                    "From": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "threadId",
+                    "snippet",
+                    "payload",
+                    "sizeEstimate",
+                    "historyId",
+                    "internalDate",
+                    "To",
+                    "From"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/getAll.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/getAll.json
new file mode 100644
index 0000000000..f72b88b953
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/getAll.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "snippet": {
+            "type": "string"
+        },
+        "historyId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "snippet",
+        "historyId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/removeLabels.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/removeLabels.json
new file mode 100644
index 0000000000..9cd91b3b27
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/removeLabels.json
@@ -0,0 +1,36 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "messages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "threadId": {
+                        "type": "string"
+                    },
+                    "labelIds": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "threadId"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "messages"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/reply.json b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/reply.json
new file mode 100644
index 0000000000..323b3628bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/__schema__/v2.1.0/thread/reply.json
@@ -0,0 +1,22 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "threadId": {
+            "type": "string"
+        },
+        "labelIds": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "id",
+        "threadId",
+        "labelIds"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
index 9ab54ece28..9136284351 100644
--- a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
@@ -42,8 +42,6 @@ describe('GmailTrigger', () => {
 	}
 
 	beforeAll(() => {
-		nock.disableNetConnect();
-
 		jest.spyOn(mailparser, 'simpleParser').mockResolvedValue({
 			headers: new Map([['headerKey', 'headerValue']]),
 			attachments: [],
@@ -63,10 +61,6 @@ describe('GmailTrigger', () => {
 		});
 	});
 
-	afterAll(() => {
-		nock.restore();
-	});
-
 	it('should return incoming emails', async () => {
 		const messageListResponse: MessageListResponse = {
 			messages: [createListMessage({ id: '1' }), createListMessage({ id: '2' })],
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
index b14fe8132c..4185d3ca41 100644
--- a/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
@@ -14,13 +14,6 @@ describe('Test Gmail Node v2', () => {
 		jest
 			.useFakeTimers({ doNotFake: ['setImmediate', 'nextTick'] })
 			.setSystemTime(new Date('2024-12-16 12:34:56.789Z'));
-
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
 	});
 
 	describe('Messages', () => {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
index ded6db9e08..7c55c11eff 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -6,20 +6,17 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import {
-	NodeConnectionType,
-	NodeOperationError,
-	SEND_AND_WAIT_OPERATION,
-	WAIT_INDEFINITELY,
-} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
 import { draftFields, draftOperations } from './DraftDescription';
 import { labelFields, labelOperations } from './LabelDescription';
 import { getGmailAliases, getLabels, getThreadMessages } from './loadOptions';
 import { messageFields, messageOperations } from './MessageDescription';
 import { threadFields, threadOperations } from './ThreadDescription';
+import { sendAndWaitWebhooksDescription } from '../../../../utils/sendAndWait/descriptions';
 import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
 import {
+	configureWaitTillDate,
 	createEmail,
 	getSendAndWaitProperties,
 	sendAndWaitWebhook,
@@ -72,26 +69,7 @@ const versionDescription: INodeTypeDescription = {
 			},
 		},
 	],
-	webhooks: [
-		{
-			name: 'default',
-			httpMethod: 'GET',
-			responseMode: 'onReceived',
-			responseData: '',
-			path: '={{ $nodeId }}',
-			restartWebhook: true,
-			isFullPath: true,
-		},
-		{
-			name: 'default',
-			httpMethod: 'POST',
-			responseMode: 'onReceived',
-			responseData: '',
-			path: '={{ $nodeId }}',
-			restartWebhook: true,
-			isFullPath: true,
-		},
-	],
+	webhooks: sendAndWaitWebhooksDescription,
 	properties: [
 		{
 			displayName: 'Authentication',
@@ -204,7 +182,9 @@ export class GmailV2 implements INodeType {
 				raw: await encodeEmail(email),
 			});
 
-			await this.putExecutionToWait(WAIT_INDEFINITELY);
+			const waitTill = configureWaitTillDate(this);
+
+			await this.putExecutionToWait(waitTill);
 			return [this.getInputData()];
 		}
 
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index dcec9f093a..cfdad869ed 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -30,6 +30,7 @@ export class GooglePerspective implements INodeType {
 		defaults: {
 			name: 'Google Perspective',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index b23183c29b..88dd6622b2 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -120,6 +120,9 @@ export class GoogleSheetsTrigger implements INodeType {
 				default: { mode: 'list', value: '' },
 				// default: '', //empty string set to progresivly reveal fields
 				required: true,
+				typeOptions: {
+					loadOptionsDependsOn: ['documentId.value'],
+				},
 				modes: [
 					{
 						displayName: 'From List',
@@ -530,6 +533,11 @@ export class GoogleSheetsTrigger implements INodeType {
 					(options.dateTimeRenderOption as string) || 'FORMATTED_STRING',
 				);
 
+				if (Array.isArray(sheetData) && sheetData.length !== 0) {
+					const zeroBasedKeyRow = keyRow - 1;
+					sheetData.splice(zeroBasedKeyRow, 1); // Remove key row
+				}
+
 				if (this.getMode() === 'manual') {
 					if (Array.isArray(sheetData)) {
 						const returnData = arrayOfArraysToJson(sheetData, columns);
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/GoogleSheetsTrigger.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/GoogleSheetsTrigger.test.ts
new file mode 100644
index 0000000000..0ff72143ee
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Sheet/test/GoogleSheetsTrigger.test.ts
@@ -0,0 +1,53 @@
+import { mockDeep } from 'jest-mock-extended';
+import nock from 'nock';
+
+import { testPollingTriggerNode } from '@test/nodes/TriggerHelpers';
+
+import { GoogleSheetsTrigger } from '../GoogleSheetsTrigger.node';
+
+describe('GoogleSheetsTrigger', () => {
+	const baseUrl = 'https://sheets.googleapis.com';
+
+	describe('rowAdded event', () => {
+		it('should return rows without header', async () => {
+			const scope = nock(baseUrl);
+			scope
+				.get('/v4/spreadsheets/testDocumentId')
+				.query({ fields: 'sheets.properties' })
+				.reply(200, {
+					sheets: [{ properties: { sheetId: 1, title: 'testSheetName' } }],
+				});
+			scope
+				.get((uri) => uri.startsWith('/v4/spreadsheets/testDocumentId/values/testSheetName!A1:ZZZ'))
+				.times(2)
+				.reply(200, {
+					values: [
+						['name', 'count'],
+						['apple', 14],
+						['banana', 12],
+					],
+				});
+
+			const { response } = await testPollingTriggerNode(GoogleSheetsTrigger, {
+				credential: mockDeep(),
+				mode: 'manual',
+				node: {
+					parameters: {
+						documentId: 'testDocumentId',
+						sheetName: 1,
+						event: 'rowAdded',
+						options: {
+							dataLocationOnSheet: null,
+						},
+					},
+				},
+			});
+
+			scope.done();
+
+			expect(response).toEqual([
+				[{ json: { count: 14, name: 'apple' } }, { json: { count: 12, name: 'banana' } }],
+			]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/resourceMapping.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/resourceMapping.test.ts
new file mode 100644
index 0000000000..1ca732e446
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/resourceMapping.test.ts
@@ -0,0 +1,113 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { ILoadOptionsFunctions, INode } from 'n8n-workflow';
+
+import { getMappingColumns } from '../../../v2/methods/resourceMapping';
+
+jest.mock('../../../v2/helpers/GoogleSheets.utils');
+
+const mockGoogleSheetInstance = {
+	spreadsheetGetSheets: jest.fn(),
+	spreadsheetGetSheet: jest.fn(),
+	getData: jest.fn(),
+	testFilter: jest.fn(),
+};
+
+jest.mock('../../../v2/helpers/GoogleSheet', () => ({
+	GoogleSheet: jest.fn().mockImplementation(() => mockGoogleSheetInstance),
+}));
+
+describe('Google Sheets, getMappingColumns', () => {
+	let loadOptionsFunctions: MockProxy<ILoadOptionsFunctions>;
+
+	beforeEach(() => {
+		loadOptionsFunctions = mock<ILoadOptionsFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should map columns and add row number for update operation', async () => {
+		loadOptionsFunctions.getNode.mockReturnValue({} as INode);
+		loadOptionsFunctions.getNodeParameter
+			.mockReturnValueOnce({ mode: 'id', value: 'spreadsheetId' }) // documentId
+			.mockReturnValueOnce({ mode: 'name', value: 'Sheet1' }) // sheetName
+			.mockReturnValueOnce({ mode: 'name' }) // sheetName mode
+			.mockReturnValueOnce({}) // options.locationDefine.values
+			.mockReturnValueOnce('update'); // operation
+
+		mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValueOnce({
+			title: 'Sheet1',
+			sheetId: 1,
+		});
+		mockGoogleSheetInstance.getData.mockResolvedValueOnce([['id', 'name', 'email']]);
+		mockGoogleSheetInstance.testFilter.mockReturnValueOnce(['id', 'name', 'email']);
+
+		const result = await getMappingColumns.call(loadOptionsFunctions);
+
+		expect(result.fields).toHaveLength(4);
+		expect(result.fields).toEqual([
+			{
+				canBeUsedToMatch: true,
+				defaultMatch: true,
+				display: true,
+				displayName: 'id',
+				id: 'id',
+				required: false,
+				type: 'string',
+			},
+			{
+				canBeUsedToMatch: true,
+				defaultMatch: false,
+				display: true,
+				displayName: 'name',
+				id: 'name',
+				required: false,
+				type: 'string',
+			},
+			{
+				canBeUsedToMatch: true,
+				defaultMatch: false,
+				display: true,
+				displayName: 'email',
+				id: 'email',
+				required: false,
+				type: 'string',
+			},
+			{
+				canBeUsedToMatch: true,
+				defaultMatch: false,
+				display: true,
+				displayName: 'row_number',
+				id: 'row_number',
+				readOnly: true,
+				removed: true,
+				required: false,
+				type: 'string',
+			},
+		]);
+	});
+
+	it('should map columns and add row number for appendOrUpdate operation', async () => {
+		loadOptionsFunctions.getNode.mockReturnValue({} as INode);
+		loadOptionsFunctions.getNodeParameter
+			.mockReturnValueOnce({ mode: 'id', value: 'spreadsheetId' }) // documentId
+			.mockReturnValueOnce({ mode: 'name', value: 'Sheet1' }) // sheetName
+			.mockReturnValueOnce({ mode: 'name' }) // sheetName mode
+			.mockReturnValueOnce({ headerRow: 10 }) // options.locationDefine.values
+			.mockReturnValueOnce('appendOrUpdate'); // operation
+
+		mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValueOnce({
+			title: 'Sheet1',
+			sheetId: 1,
+		});
+		mockGoogleSheetInstance.getData.mockResolvedValueOnce([['id', 'name', 'email']]);
+		mockGoogleSheetInstance.testFilter.mockReturnValueOnce(['id', 'name', 'email']);
+
+		const result = await getMappingColumns.call(loadOptionsFunctions);
+
+		expect(result.fields).toHaveLength(3);
+		expect(mockGoogleSheetInstance.getData).toHaveBeenCalledWith('Sheet1!10:10', 'FORMATTED_VALUE');
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
index 4c3f9861be..4be13410dc 100644
--- a/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
@@ -458,6 +458,27 @@ describe('Test Google Sheets, checkForSchemaChanges', () => {
 			] as ResourceMapperField[]),
 		).toThrow("Column names were updated after the node's setup");
 	});
+
+	it('should filter out empty columns  without throwing an error', async () => {
+		const node: INode = {
+			id: '1',
+			name: 'Google Sheets',
+			typeVersion: 4.4,
+			type: 'n8n-nodes-base.googleSheets',
+			position: [60, 760],
+			parameters: {
+				operation: 'append',
+			},
+		};
+
+		expect(() =>
+			checkForSchemaChanges(node, ['', '', 'id', 'name', 'data'], [
+				{ id: 'id' },
+				{ id: 'name' },
+				{ id: 'data' },
+			] as ResourceMapperField[]),
+		).not.toThrow();
+	});
 });
 
 describe('Test Google Sheets, getSpreadsheetId', () => {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
index 6b218c1d6a..dfb7da8c79 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
@@ -23,7 +23,6 @@ import type {
 } from './GoogleSheet';
 import { GoogleSheet } from './GoogleSheet';
 import { versionDescription } from './versionDescription';
-import { generatePairedItemData } from '../../../../utils/utilities';
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export class GoogleSheetsV1 implements INodeType {
@@ -294,12 +293,9 @@ export class GoogleSheetsV1 implements INodeType {
 						returnData = [];
 					}
 
-					const pairedItem = generatePairedItemData(items.length);
-
 					const lookupOutput = returnData.map((item) => {
 						return {
 							json: item,
-							pairedItem,
 						};
 					});
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
index 4d5479795c..680da7c62e 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
-import { generatePairedItemData, wrapData } from '../../../../../../utils/utilities';
+import { wrapData } from '../../../../../../utils/utilities';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
@@ -166,10 +166,7 @@ export async function execute(
 		await sheet.spreadsheetBatchUpdate(requests);
 	}
 
-	const itemData = generatePairedItemData(this.getInputData().length);
-	const returnData = this.helpers.constructExecutionMetaData(wrapData({ success: true }), {
-		itemData,
-	});
+	const returnData = wrapData({ success: true });
 
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
index c717e5c8b6..e5b8c8ef55 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
@@ -105,11 +105,11 @@ export function addRowNumber(data: SheetRangeData, headerRow: number) {
 
 export function trimToFirstEmptyRow(data: SheetRangeData, includesRowNumber = true) {
 	const baseLength = includesRowNumber ? 1 : 0;
-	const emtyRowIndex = data.findIndex((row) => row.slice(baseLength).every((cell) => cell === ''));
-	if (emtyRowIndex === -1) {
+	const emptyRowIndex = data.findIndex((row) => row.slice(baseLength).every((cell) => cell === ''));
+	if (emptyRowIndex === -1) {
 		return data;
 	}
-	return data.slice(0, emtyRowIndex);
+	return data.slice(0, emptyRowIndex);
 }
 
 export function removeEmptyRows(data: SheetRangeData, includesRowNumber = true) {
@@ -343,8 +343,10 @@ export function checkForSchemaChanges(
 	schema: ResourceMapperField[],
 ) {
 	const updatedColumnNames: Array<{ oldName: string; newName: string }> = [];
+	// RMC filters out empty columns so do the same here
+	columnNames = columnNames.filter((col) => col !== '');
 
-	//if sheet does not contain ROW_NUMBER ignore it as data come from read rows operation
+	// if sheet does not contain ROW_NUMBER ignore it as data come from read rows operation
 	const schemaColumns = columnNames.includes(ROW_NUMBER)
 		? schema.map((s) => s.id)
 		: schema.filter((s) => s.id !== ROW_NUMBER).map((s) => s.id);
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
index 664a44d094..8268d54fbf 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
@@ -31,7 +31,23 @@ export async function getMappingColumns(
 		sheetMode,
 		sheetWithinDocument,
 	);
-	const sheetData = await sheet.getData(`${sheetName}!1:1`, 'FORMATTED_VALUE');
+
+	const locationDefine = this.getNodeParameter(
+		'options.locationDefine.values',
+		0,
+		{},
+	) as IDataObject;
+
+	let columnNamesRow = 1;
+
+	if (locationDefine.headerRow) {
+		columnNamesRow = locationDefine.headerRow as number;
+	}
+
+	const sheetData = await sheet.getData(
+		`${sheetName}!${columnNamesRow}:${columnNamesRow}`,
+		'FORMATTED_VALUE',
+	);
 
 	const columns = sheet.testFilter(sheetData || [], 0, 0).filter((col) => col !== '');
 
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index 64a260564d..4e58864900 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -23,6 +23,7 @@ export class GoogleSlides implements INodeType {
 		defaults: {
 			name: 'Google Slides',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/page/get.json b/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/page/get.json
new file mode 100644
index 0000000000..4381d853ea
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/page/get.json
@@ -0,0 +1,514 @@
+{
+	"type": "object",
+	"properties": {
+		"objectId": {
+			"type": "string"
+		},
+		"pageElements": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"objectId": {
+						"type": "string"
+					},
+					"size": {
+						"type": "object",
+						"properties": {
+							"width": {
+								"type": "object",
+								"properties": {
+									"magnitude": {
+										"type": "integer"
+									},
+									"unit": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"magnitude",
+									"unit"
+								]
+							},
+							"height": {
+								"type": "object",
+								"properties": {
+									"magnitude": {
+										"type": "integer"
+									},
+									"unit": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"magnitude",
+									"unit"
+								]
+							}
+						},
+						"required": [
+							"width",
+							"height"
+						]
+					},
+					"transform": {
+						"type": "object",
+						"properties": {
+							"scaleX": {
+								"type": "number"
+							},
+							"scaleY": {
+								"type": "number"
+							},
+							"unit": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"scaleX",
+							"scaleY",
+							"unit"
+						]
+					},
+					"shape": {
+						"type": "object",
+						"properties": {
+							"shapeType": {
+								"type": "string"
+							},
+							"text": {
+								"type": "object",
+								"properties": {
+									"textElements": {
+										"type": "array",
+										"items": {
+											"type": "object",
+											"properties": {
+												"endIndex": {
+													"type": "integer"
+												},
+												"paragraphMarker": {
+													"type": "object",
+													"properties": {
+														"style": {
+															"type": "object",
+															"properties": {
+																"direction": {
+																	"type": "string"
+																}
+															},
+															"required": [
+																"direction"
+															]
+														}
+													},
+													"required": [
+														"style"
+													]
+												},
+												"textRun": {
+													"type": "object",
+													"properties": {
+														"content": {
+															"type": "string"
+														}
+													},
+													"required": [
+														"content",
+														"style"
+													]
+												}
+											},
+											"required": [
+												"endIndex"
+											]
+										}
+									}
+								},
+								"required": [
+									"textElements"
+								]
+							},
+							"shapeProperties": {
+								"type": "object",
+								"properties": {
+									"shapeBackgroundFill": {
+										"type": "object",
+										"properties": {
+											"propertyState": {
+												"type": "string"
+											}
+										}
+									},
+									"outline": {
+										"type": "object",
+										"properties": {
+											"propertyState": {
+												"type": "string"
+											}
+										}
+									},
+									"shadow": {
+										"type": "object",
+										"properties": {
+											"propertyState": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"propertyState"
+										]
+									},
+									"autofit": {
+										"type": "object",
+										"properties": {
+											"autofitType": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"fontScale"
+										]
+									}
+								},
+								"required": [
+									"shapeBackgroundFill",
+									"outline",
+									"shadow",
+									"autofit"
+								]
+							},
+							"placeholder": {
+								"type": "object",
+								"properties": {
+									"type": {
+										"type": "string"
+									},
+									"parentObjectId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"type",
+									"parentObjectId"
+								]
+							}
+						},
+						"required": [
+							"shapeType",
+							"shapeProperties"
+						]
+					}
+				},
+				"required": [
+					"objectId",
+					"size",
+					"transform"
+				]
+			}
+		},
+		"slideProperties": {
+			"type": "object",
+			"properties": {
+				"layoutObjectId": {
+					"type": "string"
+				},
+				"masterObjectId": {
+					"type": "string"
+				},
+				"notesPage": {
+					"type": "object",
+					"properties": {
+						"objectId": {
+							"type": "string"
+						},
+						"pageType": {
+							"type": "string"
+						},
+						"pageElements": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"objectId": {
+										"type": "string"
+									},
+									"size": {
+										"type": "object",
+										"properties": {
+											"width": {
+												"type": "object",
+												"properties": {
+													"magnitude": {
+														"type": "integer"
+													},
+													"unit": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"magnitude",
+													"unit"
+												]
+											},
+											"height": {
+												"type": "object",
+												"properties": {
+													"magnitude": {
+														"type": "integer"
+													},
+													"unit": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"magnitude",
+													"unit"
+												]
+											}
+										},
+										"required": [
+											"width",
+											"height"
+										]
+									},
+									"transform": {
+										"type": "object",
+										"properties": {
+											"scaleX": {
+												"type": "number"
+											},
+											"scaleY": {
+												"type": "number"
+											},
+											"translateY": {
+												"type": "integer"
+											},
+											"unit": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"scaleX",
+											"scaleY",
+											"translateX",
+											"translateY",
+											"unit"
+										]
+									},
+									"shape": {
+										"type": "object",
+										"properties": {
+											"shapeProperties": {
+												"type": "object",
+												"properties": {
+													"outline": {
+														"type": "object",
+														"properties": {
+															"propertyState": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"propertyState"
+														]
+													},
+													"shapeBackgroundFill": {
+														"type": "object",
+														"properties": {
+															"propertyState": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"propertyState"
+														]
+													},
+													"shadow": {
+														"type": "object",
+														"properties": {
+															"propertyState": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"propertyState"
+														]
+													},
+													"autofit": {
+														"type": "object",
+														"properties": {
+															"fontScale": {
+																"type": "integer"
+															}
+														},
+														"required": [
+															"fontScale"
+														]
+													}
+												},
+												"required": [
+													"outline"
+												]
+											},
+											"placeholder": {
+												"type": "object",
+												"properties": {
+													"type": {
+														"type": "string"
+													},
+													"parentObjectId": {
+														"type": "string"
+													},
+													"index": {
+														"type": "integer"
+													}
+												},
+												"required": [
+													"type",
+													"parentObjectId"
+												]
+											},
+											"shapeType": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"shapeProperties",
+											"placeholder"
+										]
+									}
+								},
+								"required": [
+									"objectId",
+									"size",
+									"transform",
+									"shape"
+								]
+							}
+						},
+						"pageProperties": {
+							"type": "object",
+							"properties": {
+								"pageBackgroundFill": {
+									"type": "object",
+									"properties": {
+										"propertyState": {
+											"type": "string"
+										}
+									},
+									"required": [
+										"propertyState"
+									]
+								}
+							},
+							"required": [
+								"pageBackgroundFill"
+							]
+						},
+						"notesProperties": {
+							"type": "object",
+							"properties": {
+								"speakerNotesObjectId": {
+									"type": "string"
+								}
+							},
+							"required": [
+								"speakerNotesObjectId"
+							]
+						}
+					},
+					"required": [
+						"objectId",
+						"pageType",
+						"pageElements",
+						"pageProperties",
+						"notesProperties"
+					]
+				},
+				"isSkipped": {
+					"type": "boolean"
+				}
+			},
+			"required": [
+				"layoutObjectId",
+				"masterObjectId",
+				"notesPage"
+			]
+		},
+		"revisionId": {
+			"type": "string"
+		},
+		"pageProperties": {
+			"type": "object",
+			"properties": {
+				"pageBackgroundFill": {
+					"type": "object",
+					"properties": {
+						"stretchedPictureFill": {
+							"type": "object",
+							"properties": {
+								"contentUrl": {
+									"type": "string"
+								},
+								"size": {
+									"type": "object",
+									"properties": {
+										"width": {
+											"type": "object",
+											"properties": {
+												"magnitude": {
+													"type": "integer"
+												},
+												"unit": {
+													"type": "string"
+												}
+											},
+											"required": [
+												"magnitude",
+												"unit"
+											]
+										},
+										"height": {
+											"type": "object",
+											"properties": {
+												"magnitude": {
+													"type": "integer"
+												},
+												"unit": {
+													"type": "string"
+												}
+											},
+											"required": [
+												"magnitude",
+												"unit"
+											]
+										}
+									},
+									"required": [
+										"width",
+										"height"
+									]
+								}
+							},
+							"required": [
+								"contentUrl",
+								"size"
+							]
+						}
+					}
+				}
+			},
+			"required": [
+				"pageBackgroundFill"
+			]
+		}
+	},
+	"required": [
+		"objectId",
+		"pageElements",
+		"slideProperties",
+		"revisionId",
+		"pageProperties"
+	]
+}
diff --git a/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/presentation/getSlides.json b/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/presentation/getSlides.json
new file mode 100644
index 0000000000..bdcfc8166f
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/presentation/getSlides.json
@@ -0,0 +1,644 @@
+{
+    "type": "object",
+    "properties": {
+        "objectId": {
+            "type": "string"
+        },
+        "pageElements": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "objectId": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "object",
+                        "properties": {
+                            "width": {
+                                "type": "object",
+                                "properties": {
+                                    "magnitude": {
+                                        "type": "integer"
+                                    },
+                                    "unit": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "magnitude",
+                                    "unit"
+                                ]
+                            },
+                            "height": {
+                                "type": "object",
+                                "properties": {
+                                    "magnitude": {
+                                        "type": "integer"
+                                    },
+                                    "unit": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "magnitude",
+                                    "unit"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "width",
+                            "height"
+                        ]
+                    },
+                    "transform": {
+                        "type": "object",
+                        "properties": {
+                            "scaleX": {
+                                "type": "number"
+                            },
+                            "scaleY": {
+                                "type": "number"
+                            },
+                            "unit": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "scaleX",
+                            "scaleY",
+                            "translateX",
+                            "unit"
+                        ]
+                    },
+                    "shape": {
+                        "type": "object",
+                        "properties": {
+                            "shapeType": {
+                                "type": "string"
+                            },
+                            "shapeProperties": {
+                                "type": "object",
+                                "properties": {
+                                    "shapeBackgroundFill": {
+                                        "type": "object",
+                                        "properties": {
+                                            "solidFill": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "color": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "themeColor": {
+                                                                "type": "string"
+                                                            }
+                                                        }
+                                                    },
+                                                    "alpha": {
+                                                        "type": "integer"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "color",
+                                                    "alpha"
+                                                ]
+                                            }
+                                        }
+                                    },
+                                    "outline": {
+                                        "type": "object",
+                                        "properties": {
+                                            "outlineFill": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "solidFill": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "color": {
+                                                                "type": "object",
+                                                                "properties": {
+                                                                    "themeColor": {
+                                                                        "type": "string"
+                                                                    }
+                                                                }
+                                                            },
+                                                            "alpha": {
+                                                                "type": "integer"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "color",
+                                                            "alpha"
+                                                        ]
+                                                    }
+                                                },
+                                                "required": [
+                                                    "solidFill"
+                                                ]
+                                            },
+                                            "weight": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "magnitude": {
+                                                        "type": "integer"
+                                                    },
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "magnitude",
+                                                    "unit"
+                                                ]
+                                            },
+                                            "dashStyle": {
+                                                "type": "string"
+                                            }
+                                        }
+                                    },
+                                    "shadow": {
+                                        "type": "object",
+                                        "properties": {
+                                            "propertyState": {
+                                                "type": "string"
+                                            },
+                                            "type": {
+                                                "type": "string"
+                                            },
+                                            "transform": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "scaleX": {
+                                                        "type": "integer"
+                                                    },
+                                                    "scaleY": {
+                                                        "type": "integer"
+                                                    },
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "scaleX",
+                                                    "scaleY",
+                                                    "unit"
+                                                ]
+                                            },
+                                            "alignment": {
+                                                "type": "string"
+                                            },
+                                            "blurRadius": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "unit"
+                                                ]
+                                            },
+                                            "rotateWithShape": {
+                                                "type": "boolean"
+                                            }
+                                        },
+                                        "required": [
+                                            "propertyState"
+                                        ]
+                                    },
+                                    "autofit": {
+                                        "type": "object",
+                                        "properties": {
+                                            "autofitType": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "fontScale"
+                                        ]
+                                    },
+                                    "contentAlignment": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "shapeBackgroundFill",
+                                    "outline",
+                                    "shadow",
+                                    "autofit"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "shapeType",
+                            "shapeProperties"
+                        ]
+                    },
+                    "image": {
+                        "type": "object",
+                        "properties": {
+                            "contentUrl": {
+                                "type": "string"
+                            },
+                            "imageProperties": {
+                                "type": "object",
+                                "properties": {
+                                    "outline": {
+                                        "type": "object",
+                                        "properties": {
+                                            "outlineFill": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "solidFill": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "color": {
+                                                                "type": "object",
+                                                                "properties": {
+                                                                    "themeColor": {
+                                                                        "type": "string"
+                                                                    }
+                                                                },
+                                                                "required": [
+                                                                    "themeColor"
+                                                                ]
+                                                            },
+                                                            "alpha": {
+                                                                "type": "integer"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "color",
+                                                            "alpha"
+                                                        ]
+                                                    }
+                                                },
+                                                "required": [
+                                                    "solidFill"
+                                                ]
+                                            },
+                                            "weight": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "magnitude": {
+                                                        "type": "integer"
+                                                    },
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "magnitude",
+                                                    "unit"
+                                                ]
+                                            },
+                                            "dashStyle": {
+                                                "type": "string"
+                                            },
+                                            "propertyState": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "outlineFill",
+                                            "weight",
+                                            "dashStyle",
+                                            "propertyState"
+                                        ]
+                                    },
+                                    "shadow": {
+                                        "type": "object",
+                                        "properties": {
+                                            "type": {
+                                                "type": "string"
+                                            },
+                                            "transform": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "scaleX": {
+                                                        "type": "integer"
+                                                    },
+                                                    "scaleY": {
+                                                        "type": "integer"
+                                                    },
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "scaleX",
+                                                    "scaleY",
+                                                    "unit"
+                                                ]
+                                            },
+                                            "alignment": {
+                                                "type": "string"
+                                            },
+                                            "blurRadius": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "unit"
+                                                ]
+                                            },
+                                            "alpha": {
+                                                "type": "integer"
+                                            },
+                                            "rotateWithShape": {
+                                                "type": "boolean"
+                                            },
+                                            "propertyState": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "type",
+                                            "transform",
+                                            "alignment",
+                                            "blurRadius",
+                                            "color",
+                                            "alpha",
+                                            "rotateWithShape",
+                                            "propertyState"
+                                        ]
+                                    }
+                                },
+                                "required": [
+                                    "outline",
+                                    "shadow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "contentUrl",
+                            "imageProperties"
+                        ]
+                    }
+                },
+                "required": [
+                    "objectId",
+                    "size",
+                    "transform"
+                ]
+            }
+        },
+        "slideProperties": {
+            "type": "object",
+            "properties": {
+                "layoutObjectId": {
+                    "type": "string"
+                },
+                "masterObjectId": {
+                    "type": "string"
+                },
+                "notesPage": {
+                    "type": "object",
+                    "properties": {
+                        "objectId": {
+                            "type": "string"
+                        },
+                        "pageType": {
+                            "type": "string"
+                        },
+                        "pageElements": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "objectId": {
+                                        "type": "string"
+                                    },
+                                    "size": {
+                                        "type": "object",
+                                        "properties": {
+                                            "width": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "magnitude": {
+                                                        "type": "integer"
+                                                    },
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "magnitude",
+                                                    "unit"
+                                                ]
+                                            },
+                                            "height": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "magnitude": {
+                                                        "type": "integer"
+                                                    },
+                                                    "unit": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "magnitude",
+                                                    "unit"
+                                                ]
+                                            }
+                                        },
+                                        "required": [
+                                            "width",
+                                            "height"
+                                        ]
+                                    },
+                                    "transform": {
+                                        "type": "object",
+                                        "properties": {
+                                            "scaleX": {
+                                                "type": "number"
+                                            },
+                                            "scaleY": {
+                                                "type": "number"
+                                            },
+                                            "translateX": {
+                                                "type": "integer"
+                                            },
+                                            "translateY": {
+                                                "type": "integer"
+                                            },
+                                            "unit": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "scaleX",
+                                            "scaleY",
+                                            "translateX",
+                                            "translateY",
+                                            "unit"
+                                        ]
+                                    },
+                                    "shape": {
+                                        "type": "object",
+                                        "properties": {
+                                            "shapeProperties": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "outline": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "propertyState": {
+                                                                "type": "string"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "propertyState"
+                                                        ]
+                                                    },
+                                                    "shapeBackgroundFill": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "propertyState": {
+                                                                "type": "string"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "propertyState"
+                                                        ]
+                                                    },
+                                                    "shadow": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "propertyState": {
+                                                                "type": "string"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "propertyState"
+                                                        ]
+                                                    },
+                                                    "autofit": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "fontScale": {
+                                                                "type": "integer"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "fontScale"
+                                                        ]
+                                                    }
+                                                },
+                                                "required": [
+                                                    "outline"
+                                                ]
+                                            },
+                                            "placeholder": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "type": {
+                                                        "type": "string"
+                                                    },
+                                                    "parentObjectId": {
+                                                        "type": "string"
+                                                    },
+                                                    "index": {
+                                                        "type": "integer"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "type",
+                                                    "parentObjectId"
+                                                ]
+                                            },
+                                            "shapeType": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "shapeProperties",
+                                            "placeholder"
+                                        ]
+                                    }
+                                },
+                                "required": [
+                                    "objectId",
+                                    "size",
+                                    "transform",
+                                    "shape"
+                                ]
+                            }
+                        },
+                        "pageProperties": {
+                            "type": "object",
+                            "properties": {
+                                "pageBackgroundFill": {
+                                    "type": "object",
+                                    "properties": {
+                                        "propertyState": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "propertyState"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "pageBackgroundFill"
+                            ]
+                        },
+                        "notesProperties": {
+                            "type": "object",
+                            "properties": {
+                                "speakerNotesObjectId": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "speakerNotesObjectId"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "objectId",
+                        "pageType",
+                        "pageElements",
+                        "pageProperties",
+                        "notesProperties"
+                    ]
+                }
+            },
+            "required": [
+                "layoutObjectId",
+                "masterObjectId",
+                "notesPage"
+            ]
+        },
+        "pageProperties": {
+            "type": "object",
+            "properties": {
+                "pageBackgroundFill": {
+                    "type": "object",
+                    "properties": {
+                        "propertyState": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "propertyState"
+                    ]
+                }
+            },
+            "required": [
+                "pageBackgroundFill"
+            ]
+        }
+    },
+    "required": [
+        "objectId",
+        "pageElements",
+        "slideProperties",
+        "pageProperties"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/presentation/replaceText.json b/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/presentation/replaceText.json
new file mode 100644
index 0000000000..af4f135eab
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Slides/__schema__/v2.0.0/presentation/replaceText.json
@@ -0,0 +1,46 @@
+{
+    "type": "object",
+    "properties": {
+        "presentationId": {
+            "type": "string"
+        },
+        "replies": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "replaceAllText": {
+                        "type": "object",
+                        "properties": {
+                            "occurrencesChanged": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "occurrencesChanged"
+                        ]
+                    }
+                },
+                "required": [
+                    "replaceAllText"
+                ]
+            }
+        },
+        "writeControl": {
+            "type": "object",
+            "properties": {
+                "requiredRevisionId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "requiredRevisionId"
+            ]
+        }
+    },
+    "required": [
+        "presentationId",
+        "replies",
+        "writeControl"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index e053b752bd..8dcda42105 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -25,6 +25,7 @@ export class GoogleTasks implements INodeType {
 		defaults: {
 			name: 'Google Tasks',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/create.json b/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/create.json
new file mode 100644
index 0000000000..1d8fc5722c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/create.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "position": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "webViewLink": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/getAll.json b/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/getAll.json
new file mode 100644
index 0000000000..4c2b3ad12d
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/getAll.json
@@ -0,0 +1,72 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "position": {
+            "type": "string"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "due": {
+            "type": "string"
+        },
+        "links": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "link": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "type",
+                    "description",
+                    "link"
+                ]
+            }
+        },
+        "webViewLink": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "kind",
+        "id",
+        "etag",
+        "title",
+        "updated",
+        "selfLink",
+        "position",
+        "status",
+        "links",
+        "webViewLink"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/update.json b/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/update.json
new file mode 100644
index 0000000000..1a1e93cef7
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Task/__schema__/v1.0.0/task/update.json
@@ -0,0 +1,41 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "selfLink": {
+            "type": "string"
+        },
+        "position": {
+            "type": "string"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "due": {
+            "type": "string"
+        },
+        "webViewLink": {
+            "type": "string"
+        },
+        "completed": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
index d694d09981..b10353bd79 100644
--- a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
@@ -29,6 +29,7 @@ export class GoogleTranslate implements INodeType {
 		defaults: {
 			name: 'Google Translate',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/Translate/__schema__/v2.0.0/language/translate.json b/packages/nodes-base/nodes/Google/Translate/__schema__/v2.0.0/language/translate.json
new file mode 100644
index 0000000000..e5a1bdb3b8
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Translate/__schema__/v2.0.0/language/translate.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "translatedText": {
+            "type": "string"
+        },
+        "detectedSourceLanguage": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "translatedText",
+        "detectedSourceLanguage"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 07f1b351b6..9d76aa1ce6 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -35,6 +35,7 @@ export class YouTube implements INodeType {
 		defaults: {
 			name: 'YouTube',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/channel/get.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/channel/get.json
new file mode 100644
index 0000000000..1243210ce3
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/channel/get.json
@@ -0,0 +1,260 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "privacyStatus": {
+                    "type": "string"
+                },
+                "isLinked": {
+                    "type": "boolean"
+                },
+                "longUploadsStatus": {
+                    "type": "string"
+                },
+                "madeForKids": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "privacyStatus",
+                "isLinked",
+                "longUploadsStatus"
+            ]
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "customUrl": {
+                    "type": "string"
+                },
+                "publishedAt": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high"
+                    ]
+                },
+                "localized": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title",
+                        "description"
+                    ]
+                },
+                "country": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "title",
+                "description",
+                "customUrl",
+                "publishedAt",
+                "thumbnails",
+                "localized"
+            ]
+        },
+        "contentDetails": {
+            "type": "object",
+            "properties": {
+                "relatedPlaylists": {
+                    "type": "object",
+                    "properties": {
+                        "likes": {
+                            "type": "string"
+                        },
+                        "uploads": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "likes",
+                        "uploads"
+                    ]
+                }
+            },
+            "required": [
+                "relatedPlaylists"
+            ]
+        },
+        "statistics": {
+            "type": "object",
+            "properties": {
+                "viewCount": {
+                    "type": "string"
+                },
+                "subscriberCount": {
+                    "type": "string"
+                },
+                "hiddenSubscriberCount": {
+                    "type": "boolean"
+                },
+                "videoCount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "viewCount",
+                "subscriberCount",
+                "hiddenSubscriberCount",
+                "videoCount"
+            ]
+        },
+        "topicDetails": {
+            "type": "object",
+            "properties": {
+                "topicIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "topicCategories": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "topicIds",
+                "topicCategories"
+            ]
+        },
+        "brandingSettings": {
+            "type": "object",
+            "properties": {
+                "channel": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        },
+                        "keywords": {
+                            "type": "string"
+                        },
+                        "unsubscribedTrailer": {
+                            "type": "string"
+                        },
+                        "country": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title"
+                    ]
+                },
+                "image": {
+                    "type": "object",
+                    "properties": {
+                        "bannerExternalUrl": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "bannerExternalUrl"
+                    ]
+                }
+            },
+            "required": [
+                "channel"
+            ]
+        }
+    },
+    "required": [
+        "kind",
+        "etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/channel/getAll.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/channel/getAll.json
new file mode 100644
index 0000000000..1bdca2d8c4
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/channel/getAll.json
@@ -0,0 +1,223 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "customUrl": {
+                    "type": "string"
+                },
+                "publishedAt": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high"
+                    ]
+                },
+                "localized": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title",
+                        "description"
+                    ]
+                },
+                "country": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "title",
+                "description",
+                "customUrl",
+                "publishedAt",
+                "thumbnails",
+                "localized"
+            ]
+        },
+        "contentDetails": {
+            "type": "object",
+            "properties": {
+                "relatedPlaylists": {
+                    "type": "object",
+                    "properties": {
+                        "likes": {
+                            "type": "string"
+                        },
+                        "uploads": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "likes",
+                        "uploads"
+                    ]
+                }
+            },
+            "required": [
+                "relatedPlaylists"
+            ]
+        },
+        "statistics": {
+            "type": "object",
+            "properties": {
+                "viewCount": {
+                    "type": "string"
+                },
+                "subscriberCount": {
+                    "type": "string"
+                },
+                "hiddenSubscriberCount": {
+                    "type": "boolean"
+                },
+                "videoCount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "viewCount",
+                "subscriberCount",
+                "hiddenSubscriberCount",
+                "videoCount"
+            ]
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "privacyStatus": {
+                    "type": "string"
+                },
+                "isLinked": {
+                    "type": "boolean"
+                },
+                "longUploadsStatus": {
+                    "type": "string"
+                },
+                "madeForKids": {
+                    "type": "boolean"
+                },
+                "isChannelMonetizationEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "privacyStatus",
+                "isLinked",
+                "longUploadsStatus"
+            ]
+        },
+        "brandingSettings": {
+            "type": "object",
+            "properties": {
+                "channel": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        },
+                        "country": {
+                            "type": "string"
+                        },
+                        "keywords": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title"
+                    ]
+                }
+            },
+            "required": [
+                "channel"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlist/get.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlist/get.json
new file mode 100644
index 0000000000..e89ffa1200
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlist/get.json
@@ -0,0 +1,203 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "publishedAt": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "standard": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "maxres": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high",
+                        "standard",
+                        "maxres"
+                    ]
+                },
+                "channelTitle": {
+                    "type": "string"
+                },
+                "localized": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title",
+                        "description"
+                    ]
+                }
+            },
+            "required": [
+                "publishedAt",
+                "channelId",
+                "title",
+                "description",
+                "thumbnails",
+                "channelTitle",
+                "localized"
+            ]
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "privacyStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "privacyStatus"
+            ]
+        },
+        "contentDetails": {
+            "type": "object",
+            "properties": {
+                "itemCount": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "itemCount"
+            ]
+        },
+        "player": {
+            "type": "object",
+            "properties": {
+                "embedHtml": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "embedHtml"
+            ]
+        }
+    },
+    "required": [
+        "kind",
+        "etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlist/getAll.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlist/getAll.json
new file mode 100644
index 0000000000..046a0b4328
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlist/getAll.json
@@ -0,0 +1,202 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "publishedAt": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "standard": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "maxres": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high",
+                        "standard"
+                    ]
+                },
+                "channelTitle": {
+                    "type": "string"
+                },
+                "localized": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title",
+                        "description"
+                    ]
+                }
+            },
+            "required": [
+                "publishedAt",
+                "channelId",
+                "title",
+                "description",
+                "thumbnails",
+                "channelTitle",
+                "localized"
+            ]
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "privacyStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "privacyStatus"
+            ]
+        },
+        "contentDetails": {
+            "type": "object",
+            "properties": {
+                "itemCount": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "itemCount"
+            ]
+        },
+        "player": {
+            "type": "object",
+            "properties": {
+                "embedHtml": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "embedHtml"
+            ]
+        }
+    },
+    "required": [
+        "kind",
+        "etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlistItem/getAll.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlistItem/getAll.json
new file mode 100644
index 0000000000..b0af06dbd1
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/playlistItem/getAll.json
@@ -0,0 +1,210 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "publishedAt": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "standard": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "maxres": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high"
+                    ]
+                },
+                "channelTitle": {
+                    "type": "string"
+                },
+                "playlistId": {
+                    "type": "string"
+                },
+                "position": {
+                    "type": "integer"
+                },
+                "resourceId": {
+                    "type": "object",
+                    "properties": {
+                        "kind": {
+                            "type": "string"
+                        },
+                        "videoId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "kind",
+                        "videoId"
+                    ]
+                },
+                "videoOwnerChannelTitle": {
+                    "type": "string"
+                },
+                "videoOwnerChannelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "publishedAt",
+                "channelId",
+                "title",
+                "description",
+                "thumbnails",
+                "channelTitle",
+                "playlistId",
+                "position",
+                "resourceId",
+                "videoOwnerChannelTitle",
+                "videoOwnerChannelId"
+            ]
+        },
+        "contentDetails": {
+            "type": "object",
+            "properties": {
+                "videoId": {
+                    "type": "string"
+                },
+                "videoPublishedAt": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "videoId",
+                "videoPublishedAt"
+            ]
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "privacyStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "privacyStatus"
+            ]
+        }
+    },
+    "required": [
+        "kind",
+        "etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/get.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/get.json
new file mode 100644
index 0000000000..8f6a9c105c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/get.json
@@ -0,0 +1,295 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "publishedAt": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "standard": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "maxres": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high"
+                    ]
+                },
+                "channelTitle": {
+                    "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "categoryId": {
+                    "type": "string"
+                },
+                "liveBroadcastContent": {
+                    "type": "string"
+                },
+                "localized": {
+                    "type": "object",
+                    "properties": {
+                        "title": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "title",
+                        "description"
+                    ]
+                },
+                "defaultAudioLanguage": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "publishedAt",
+                "channelId",
+                "title",
+                "description",
+                "thumbnails",
+                "channelTitle",
+                "categoryId",
+                "liveBroadcastContent",
+                "localized"
+            ]
+        },
+        "contentDetails": {
+            "type": "object",
+            "properties": {
+                "duration": {
+                    "type": "string"
+                },
+                "dimension": {
+                    "type": "string"
+                },
+                "definition": {
+                    "type": "string"
+                },
+                "caption": {
+                    "type": "string"
+                },
+                "licensedContent": {
+                    "type": "boolean"
+                },
+                "projection": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "duration",
+                "dimension",
+                "definition",
+                "caption",
+                "licensedContent",
+                "contentRating",
+                "projection"
+            ]
+        },
+        "status": {
+            "type": "object",
+            "properties": {
+                "uploadStatus": {
+                    "type": "string"
+                },
+                "privacyStatus": {
+                    "type": "string"
+                },
+                "license": {
+                    "type": "string"
+                },
+                "embeddable": {
+                    "type": "boolean"
+                },
+                "publicStatsViewable": {
+                    "type": "boolean"
+                },
+                "madeForKids": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "uploadStatus",
+                "privacyStatus",
+                "license",
+                "embeddable",
+                "publicStatsViewable",
+                "madeForKids"
+            ]
+        },
+        "statistics": {
+            "type": "object",
+            "properties": {
+                "viewCount": {
+                    "type": "string"
+                },
+                "likeCount": {
+                    "type": "string"
+                },
+                "favoriteCount": {
+                    "type": "string"
+                },
+                "commentCount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "viewCount",
+                "likeCount",
+                "favoriteCount"
+            ]
+        },
+        "player": {
+            "type": "object",
+            "properties": {
+                "embedHtml": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "embedHtml"
+            ]
+        },
+        "topicDetails": {
+            "type": "object",
+            "properties": {
+                "topicCategories": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "topicCategories"
+            ]
+        }
+    },
+    "required": [
+        "kind",
+        "etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/getAll.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/getAll.json
new file mode 100644
index 0000000000..bb4bf6c573
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/getAll.json
@@ -0,0 +1,129 @@
+{
+    "type": "object",
+    "properties": {
+        "kind": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "object",
+            "properties": {
+                "kind": {
+                    "type": "string"
+                },
+                "videoId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "kind",
+                "videoId"
+            ]
+        },
+        "snippet": {
+            "type": "object",
+            "properties": {
+                "publishedAt": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "thumbnails": {
+                    "type": "object",
+                    "properties": {
+                        "default": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "medium": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "high": {
+                            "type": "object",
+                            "properties": {
+                                "url": {
+                                    "type": "string"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "url",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "default",
+                        "medium",
+                        "high"
+                    ]
+                },
+                "channelTitle": {
+                    "type": "string"
+                },
+                "liveBroadcastContent": {
+                    "type": "string"
+                },
+                "publishTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "publishedAt",
+                "channelId",
+                "title",
+                "description",
+                "thumbnails",
+                "channelTitle",
+                "liveBroadcastContent",
+                "publishTime"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/upload.json b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/upload.json
new file mode 100644
index 0000000000..a239010c45
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/__schema__/v1.0.0/video/upload.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "uploadId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index aba203c5de..e8e0b64d30 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -22,6 +22,7 @@ export class Gotify implements INodeType {
 		defaults: {
 			name: 'Gotify',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Grafana/Grafana.node.ts b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
index 28bd734229..0149f9755e 100644
--- a/packages/nodes-base/nodes/Grafana/Grafana.node.ts
+++ b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
@@ -41,6 +41,7 @@ export class Grafana implements INodeType {
 		defaults: {
 			name: 'Grafana',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Grafana/__schema__/v1.0.0/dashboard/get.json b/packages/nodes-base/nodes/Grafana/__schema__/v1.0.0/dashboard/get.json
new file mode 100644
index 0000000000..406ac268ba
--- /dev/null
+++ b/packages/nodes-base/nodes/Grafana/__schema__/v1.0.0/dashboard/get.json
@@ -0,0 +1,918 @@
+{
+	"type": "object",
+	"properties": {
+		"meta": {
+			"type": "object",
+			"properties": {
+				"type": {
+					"type": "string"
+				},
+				"canSave": {
+					"type": "boolean"
+				},
+				"canEdit": {
+					"type": "boolean"
+				},
+				"canAdmin": {
+					"type": "boolean"
+				},
+				"canStar": {
+					"type": "boolean"
+				},
+				"canDelete": {
+					"type": "boolean"
+				},
+				"slug": {
+					"type": "string"
+				},
+				"url": {
+					"type": "string"
+				},
+				"expires": {
+					"type": "string"
+				},
+				"created": {
+					"type": "string"
+				},
+				"updated": {
+					"type": "string"
+				},
+				"updatedBy": {
+					"type": "string"
+				},
+				"createdBy": {
+					"type": "string"
+				},
+				"version": {
+					"type": "integer"
+				},
+				"hasAcl": {
+					"type": "boolean"
+				},
+				"isFolder": {
+					"type": "boolean"
+				},
+				"folderId": {
+					"type": "integer"
+				},
+				"folderUid": {
+					"type": "string"
+				},
+				"folderTitle": {
+					"type": "string"
+				},
+				"folderUrl": {
+					"type": "string"
+				},
+				"provisioned": {
+					"type": "boolean"
+				},
+				"provisionedExternalId": {
+					"type": "string"
+				},
+				"annotationsPermissions": {
+					"type": "object",
+					"properties": {
+						"dashboard": {
+							"type": "object",
+							"properties": {
+								"canAdd": {
+									"type": "boolean"
+								},
+								"canEdit": {
+									"type": "boolean"
+								},
+								"canDelete": {
+									"type": "boolean"
+								}
+							},
+							"required": [
+								"canAdd",
+								"canEdit",
+								"canDelete"
+							]
+						},
+						"organization": {
+							"type": "object",
+							"properties": {
+								"canAdd": {
+									"type": "boolean"
+								},
+								"canEdit": {
+									"type": "boolean"
+								},
+								"canDelete": {
+									"type": "boolean"
+								}
+							},
+							"required": [
+								"canAdd",
+								"canEdit",
+								"canDelete"
+							]
+						}
+					},
+					"required": [
+						"dashboard",
+						"organization"
+					]
+				}
+			},
+			"required": [
+				"type",
+				"canSave",
+				"canEdit",
+				"canAdmin",
+				"canStar",
+				"canDelete",
+				"slug",
+				"url",
+				"expires",
+				"created",
+				"updated",
+				"updatedBy",
+				"createdBy",
+				"version",
+				"hasAcl",
+				"isFolder",
+				"folderId",
+				"folderUid",
+				"folderTitle",
+				"folderUrl",
+				"provisioned",
+				"provisionedExternalId",
+				"annotationsPermissions"
+			]
+		},
+		"dashboard": {
+			"type": "object",
+			"properties": {
+				"annotations": {
+					"type": "object",
+					"properties": {
+						"list": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"builtIn": {
+										"type": "integer"
+									},
+									"datasource": {
+										"type": "object",
+										"properties": {
+											"type": {
+												"type": "string"
+											},
+											"uid": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"type",
+											"uid"
+										]
+									},
+									"enable": {
+										"type": "boolean"
+									},
+									"hide": {
+										"type": "boolean"
+									},
+									"iconColor": {
+										"type": "string"
+									},
+									"name": {
+										"type": "string"
+									},
+									"target": {
+										"type": "object",
+										"properties": {
+											"limit": {
+												"type": "integer"
+											},
+											"matchAny": {
+												"type": "boolean"
+											},
+											"type": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"limit",
+											"matchAny",
+											"tags",
+											"type"
+										]
+									},
+									"type": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"builtIn",
+									"datasource",
+									"enable",
+									"hide",
+									"iconColor",
+									"name",
+									"target",
+									"type"
+								]
+							}
+						}
+					},
+					"required": [
+						"list"
+					]
+				},
+				"editable": {
+					"type": "boolean"
+				},
+				"fiscalYearStartMonth": {
+					"type": "integer"
+				},
+				"graphTooltip": {
+					"type": "integer"
+				},
+				"id": {
+					"type": "integer"
+				},
+				"links": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"asDropdown": {
+								"type": "boolean"
+							},
+							"icon": {
+								"type": "string"
+							},
+							"includeVars": {
+								"type": "boolean"
+							},
+							"keepTime": {
+								"type": "boolean"
+							},
+							"targetBlank": {
+								"type": "boolean"
+							},
+							"title": {
+								"type": "string"
+							},
+							"tooltip": {
+								"type": "string"
+							},
+							"type": {
+								"type": "string"
+							},
+							"url": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"asDropdown",
+							"icon",
+							"includeVars",
+							"keepTime",
+							"tags",
+							"targetBlank",
+							"title",
+							"tooltip",
+							"type",
+							"url"
+						]
+					}
+				},
+				"panels": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"fieldConfig": {
+								"type": "object",
+								"properties": {
+									"defaults": {
+										"type": "object",
+										"properties": {
+											"color": {
+												"type": "object",
+												"properties": {
+													"mode": {
+														"type": "string"
+													},
+													"fixedColor": {
+														"type": "string"
+													}
+												},
+												"required": [
+													"mode"
+												]
+											},
+											"custom": {
+												"type": "object",
+												"properties": {
+													"axisCenteredZero": {
+														"type": "boolean"
+													},
+													"axisColorMode": {
+														"type": "string"
+													},
+													"axisLabel": {
+														"type": "string"
+													},
+													"axisPlacement": {
+														"type": "string"
+													},
+													"barAlignment": {
+														"type": "integer"
+													},
+													"drawStyle": {
+														"type": "string"
+													},
+													"fillOpacity": {
+														"type": "integer"
+													},
+													"gradientMode": {
+														"type": "string"
+													},
+													"hideFrom": {
+														"type": "object",
+														"properties": {
+															"legend": {
+																"type": "boolean"
+															},
+															"tooltip": {
+																"type": "boolean"
+															},
+															"viz": {
+																"type": "boolean"
+															}
+														},
+														"required": [
+															"legend",
+															"tooltip",
+															"viz"
+														]
+													},
+													"lineInterpolation": {
+														"type": "string"
+													},
+													"lineWidth": {
+														"type": "integer"
+													},
+													"pointSize": {
+														"type": "integer"
+													},
+													"scaleDistribution": {
+														"type": "object",
+														"properties": {
+															"type": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"type"
+														]
+													},
+													"showPoints": {
+														"type": "string"
+													},
+													"spanNulls": {
+														"type": "boolean"
+													},
+													"stacking": {
+														"type": "object",
+														"properties": {
+															"group": {
+																"type": "string"
+															},
+															"mode": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"group",
+															"mode"
+														]
+													},
+													"thresholdsStyle": {
+														"type": "object",
+														"properties": {
+															"mode": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"mode"
+														]
+													},
+													"axisBorderShow": {
+														"type": "boolean"
+													},
+													"axisGridShow": {
+														"type": "boolean"
+													},
+													"barWidthFactor": {
+														"type": "number"
+													},
+													"insertNulls": {
+														"type": "boolean"
+													},
+													"lineStyle": {
+														"type": "object",
+														"properties": {
+															"fill": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"fill"
+														]
+													}
+												},
+												"required": [
+													"axisCenteredZero",
+													"axisColorMode",
+													"axisLabel",
+													"axisPlacement",
+													"barAlignment",
+													"drawStyle",
+													"fillOpacity",
+													"gradientMode",
+													"hideFrom",
+													"lineInterpolation",
+													"lineWidth",
+													"pointSize",
+													"scaleDistribution",
+													"showPoints",
+													"spanNulls",
+													"stacking",
+													"thresholdsStyle"
+												]
+											},
+											"thresholds": {
+												"type": "object",
+												"properties": {
+													"mode": {
+														"type": "string"
+													},
+													"steps": {
+														"type": "array",
+														"items": {
+															"type": "object",
+															"properties": {
+																"color": {
+																	"type": "string"
+																}
+															},
+															"required": [
+																"color"
+															]
+														}
+													}
+												},
+												"required": [
+													"mode",
+													"steps"
+												]
+											},
+											"unit": {
+												"type": "string"
+											},
+											"min": {
+												"type": "integer"
+											}
+										},
+										"required": [
+											"color",
+											"custom",
+											"mappings",
+											"thresholds"
+										]
+									},
+									"overrides": {
+										"type": "array",
+										"items": {
+											"type": "object",
+											"properties": {
+												"matcher": {
+													"type": "object",
+													"properties": {
+														"id": {
+															"type": "string"
+														},
+														"options": {
+															"type": "string"
+														}
+													},
+													"required": [
+														"id",
+														"options"
+													]
+												},
+												"properties": {
+													"type": "array",
+													"items": {
+														"type": "object",
+														"properties": {
+															"id": {
+																"type": "string"
+															}
+														},
+														"required": [
+															"id",
+															"value"
+														]
+													}
+												}
+											},
+											"required": [
+												"matcher",
+												"properties"
+											]
+										}
+									}
+								},
+								"required": [
+									"defaults",
+									"overrides"
+								]
+							},
+							"gridPos": {
+								"type": "object",
+								"properties": {
+									"h": {
+										"type": "integer"
+									},
+									"w": {
+										"type": "integer"
+									},
+									"x": {
+										"type": "integer"
+									},
+									"y": {
+										"type": "integer"
+									}
+								},
+								"required": [
+									"h",
+									"w",
+									"x",
+									"y"
+								]
+							},
+							"id": {
+								"type": "integer"
+							},
+							"options": {
+								"type": "object",
+								"properties": {
+									"legend": {
+										"type": "object",
+										"properties": {
+											"calcs": {
+												"type": "array",
+												"items": {
+													"type": "string"
+												}
+											},
+											"displayMode": {
+												"type": "string"
+											},
+											"placement": {
+												"type": "string"
+											},
+											"showLegend": {
+												"type": "boolean"
+											}
+										},
+										"required": [
+											"calcs",
+											"displayMode",
+											"placement",
+											"showLegend"
+										]
+									},
+									"tooltip": {
+										"type": "object",
+										"properties": {
+											"mode": {
+												"type": "string"
+											},
+											"sort": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"mode",
+											"sort"
+										]
+									}
+								},
+								"required": [
+									"legend",
+									"tooltip"
+								]
+							},
+							"title": {
+								"type": "string"
+							},
+							"type": {
+								"type": "string"
+							},
+							"datasource": {
+								"type": "object",
+								"properties": {
+									"type": {
+										"type": "string"
+									},
+									"uid": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"type",
+									"uid"
+								]
+							},
+							"pluginVersion": {
+								"type": "string"
+							},
+							"targets": {
+								"type": "array",
+								"items": {
+									"type": "object",
+									"properties": {
+										"datasource": {
+											"type": "object",
+											"properties": {
+												"type": {
+													"type": "string"
+												},
+												"uid": {
+													"type": "string"
+												}
+											},
+											"required": [
+												"type",
+												"uid"
+											]
+										},
+										"disableTextWrap": {
+											"type": "boolean"
+										},
+										"editorMode": {
+											"type": "string"
+										},
+										"expr": {
+											"type": "string"
+										},
+										"fullMetaSearch": {
+											"type": "boolean"
+										},
+										"includeNullMetadata": {
+											"type": "boolean"
+										},
+										"instant": {
+											"type": "boolean"
+										},
+										"legendFormat": {
+											"type": "string"
+										},
+										"range": {
+											"type": "boolean"
+										},
+										"refId": {
+											"type": "string"
+										},
+										"useBackend": {
+											"type": "boolean"
+										},
+										"hide": {
+											"type": "boolean"
+										},
+										"format": {
+											"type": "string"
+										},
+										"interval": {
+											"type": "string"
+										},
+										"intervalFactor": {
+											"type": "integer"
+										}
+									},
+									"required": [
+										"datasource",
+										"editorMode",
+										"refId"
+									]
+								}
+							},
+							"transparent": {
+								"type": "boolean"
+							},
+							"description": {
+								"type": "string"
+							},
+							"interval": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"gridPos",
+							"id",
+							"title",
+							"type"
+						]
+					}
+				},
+				"schemaVersion": {
+					"type": "integer"
+				},
+				"tags": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				"templating": {
+					"type": "object",
+					"properties": {
+						"list": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"current": {
+										"type": "object",
+										"properties": {
+											"selected": {
+												"type": "boolean"
+											}
+										},
+										"required": [
+											"selected",
+											"text",
+											"value"
+										]
+									},
+									"hide": {
+										"type": "integer"
+									},
+									"includeAll": {
+										"type": "boolean"
+									},
+									"label": {
+										"type": "string"
+									},
+									"multi": {
+										"type": "boolean"
+									},
+									"name": {
+										"type": "string"
+									},
+									"options": {
+										"type": "array",
+										"items": {
+											"type": "object",
+											"properties": {
+												"selected": {
+													"type": "boolean"
+												},
+												"text": {
+													"type": "string"
+												},
+												"value": {
+													"type": "string"
+												}
+											},
+											"required": [
+												"selected",
+												"text",
+												"value"
+											]
+										}
+									},
+									"query": {
+										"type": "string"
+									},
+									"queryValue": {
+										"type": "string"
+									},
+									"skipUrlSync": {
+										"type": "boolean"
+									},
+									"type": {
+										"type": "string"
+									},
+									"datasource": {
+										"type": "object",
+										"properties": {
+											"type": {
+												"type": "string"
+											},
+											"uid": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"type",
+											"uid"
+										]
+									},
+									"definition": {
+										"type": "string"
+									},
+									"refresh": {
+										"type": "integer"
+									},
+									"regex": {
+										"type": "string"
+									},
+									"sort": {
+										"type": "integer"
+									},
+									"description": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"current",
+									"hide",
+									"includeAll",
+									"multi",
+									"name",
+									"options",
+									"query",
+									"skipUrlSync",
+									"type"
+								]
+							}
+						}
+					},
+					"required": [
+						"list"
+					]
+				},
+				"time": {
+					"type": "object",
+					"properties": {
+						"from": {
+							"type": "string"
+						},
+						"to": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"from",
+						"to"
+					]
+				},
+				"timezone": {
+					"type": "string"
+				},
+				"title": {
+					"type": "string"
+				},
+				"uid": {
+					"type": "string"
+				},
+				"version": {
+					"type": "integer"
+				},
+				"weekStart": {
+					"type": "string"
+				},
+				"preload": {
+					"type": "boolean"
+				}
+			},
+			"required": [
+				"annotations",
+				"editable",
+				"fiscalYearStartMonth",
+				"graphTooltip",
+				"id",
+				"links",
+				"panels",
+				"schemaVersion",
+				"tags",
+				"templating",
+				"time",
+				"timepicker",
+				"timezone",
+				"title",
+				"uid",
+				"version",
+				"weekStart"
+			]
+		}
+	},
+	"required": [
+		"meta",
+		"dashboard"
+	]
+}
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index 07d07011b4..04daed0f27 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -19,11 +19,12 @@ export class GraphQL implements INodeType {
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
 		icon: 'file:graphql.png',
 		group: ['input'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Makes a GraphQL request and returns the received data',
 		defaults: {
 			name: 'GraphQL',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -186,25 +187,57 @@ export class GraphQL implements INodeType {
 				displayOptions: {
 					show: {
 						requestMethod: ['POST'],
+						'@version': [1],
 					},
 				},
 				default: 'graphql',
 				description: 'The format for the query payload',
 			},
+			{
+				displayName: 'Request Format',
+				name: 'requestFormat',
+				type: 'options',
+				required: true,
+				options: [
+					{
+						name: 'JSON (Recommended)',
+						value: 'json',
+						description:
+							'JSON object with query, variables, and operationName properties. The standard and most widely supported format for GraphQL requests.',
+					},
+					{
+						name: 'GraphQL (Raw)',
+						value: 'graphql',
+						description:
+							'Raw GraphQL query string. Not all servers support this format. Use JSON for better compatibility.',
+					},
+				],
+				displayOptions: {
+					show: {
+						requestMethod: ['POST'],
+						'@version': [{ _cnd: { gte: 1.1 } }],
+					},
+				},
+				default: 'json',
+				description: 'The request format for the query payload',
+			},
 			{
 				displayName: 'Query',
 				name: 'query',
-				type: 'json',
+				type: 'string',
 				default: '',
 				description: 'GraphQL query',
 				required: true,
+				typeOptions: {
+					rows: 6,
+				},
 			},
 			{
 				displayName: 'Variables',
 				name: 'variables',
 				type: 'json',
 				default: '',
-				description: 'Query variables',
+				description: 'Query variables as JSON object',
 				displayOptions: {
 					show: {
 						requestFormat: ['json'],
@@ -350,11 +383,7 @@ export class GraphQL implements INodeType {
 					'POST',
 				) as IHttpRequestMethods;
 				const endpoint = this.getNodeParameter('endpoint', itemIndex, '') as string;
-				const requestFormat = this.getNodeParameter(
-					'requestFormat',
-					itemIndex,
-					'graphql',
-				) as string;
+				const requestFormat = this.getNodeParameter('requestFormat', itemIndex, 'json') as string;
 				const responseFormat = this.getNodeParameter('responseFormat', 0) as string;
 				const { parameter }: { parameter?: Array<{ name: string; value: string }> } =
 					this.getNodeParameter('headerParametersUi', itemIndex, {}) as IDataObject;
@@ -450,7 +479,7 @@ export class GraphQL implements INodeType {
 						...requestOptions.body,
 						query: gqlQuery,
 						variables: parsedVariables,
-						operationName: this.getNodeParameter('operationName', itemIndex) as string,
+						operationName: this.getNodeParameter('operationName', itemIndex, '') as string,
 					};
 
 					if (jsonBody.operationName === '') {
diff --git a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
index 2b6014fcd4..563c5b31f9 100644
--- a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
+++ b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
@@ -17,7 +17,6 @@ describe('GraphQL Node', () => {
 
 	beforeAll(async () => {
 		await initBinaryDataService();
-		nock.disableNetConnect();
 
 		nock(baseUrl)
 			.matchHeader('accept', 'application/json')
@@ -71,10 +70,6 @@ describe('GraphQL Node', () => {
 			});
 	});
 
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(workflowTests);
 
 	for (const workflow of workflowTests) {
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index 189c880f16..b528275a67 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -43,6 +43,7 @@ export class Grist implements INodeType {
 		defaults: {
 			name: 'Grist',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/HackerNews/__schema__/v1.0.0/all/getAll.json b/packages/nodes-base/nodes/HackerNews/__schema__/v1.0.0/all/getAll.json
new file mode 100644
index 0000000000..e6b27f6e47
--- /dev/null
+++ b/packages/nodes-base/nodes/HackerNews/__schema__/v1.0.0/all/getAll.json
@@ -0,0 +1,122 @@
+{
+    "type": "object",
+    "properties": {
+        "_highlightResult": {
+            "type": "object",
+            "properties": {
+                "author": {
+                    "type": "object",
+                    "properties": {
+                        "matchLevel": {
+                            "type": "string"
+                        },
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "matchLevel",
+                        "matchedWords",
+                        "value"
+                    ]
+                },
+                "title": {
+                    "type": "object",
+                    "properties": {
+                        "matchLevel": {
+                            "type": "string"
+                        },
+                        "matchedWords": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "matchLevel",
+                        "matchedWords",
+                        "value"
+                    ]
+                },
+                "url": {
+                    "type": "object",
+                    "properties": {
+                        "matchLevel": {
+                            "type": "string"
+                        },
+                        "matchedWords": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "matchLevel",
+                        "matchedWords",
+                        "value"
+                    ]
+                }
+            },
+            "required": [
+                "author"
+            ]
+        },
+        "_tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "author": {
+            "type": "string"
+        },
+        "children": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "created_at_i": {
+            "type": "integer"
+        },
+        "num_comments": {
+            "type": "integer"
+        },
+        "objectID": {
+            "type": "string"
+        },
+        "story_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "_highlightResult",
+        "_tags",
+        "author",
+        "created_at",
+        "created_at_i",
+        "objectID",
+        "story_id",
+        "updated_at"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HackerNews/__schema__/v1.0.0/article/get.json b/packages/nodes-base/nodes/HackerNews/__schema__/v1.0.0/article/get.json
new file mode 100644
index 0000000000..82ab15ff76
--- /dev/null
+++ b/packages/nodes-base/nodes/HackerNews/__schema__/v1.0.0/article/get.json
@@ -0,0 +1,40 @@
+{
+    "type": "object",
+    "properties": {
+        "author": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "created_at_i": {
+            "type": "integer"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "options": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "author",
+        "created_at",
+        "created_at_i",
+        "id",
+        "options",
+        "parent_id",
+        "points",
+        "story_id",
+        "text",
+        "title",
+        "type",
+        "url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
index 137eda57c9..f28c0f212b 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
@@ -46,6 +46,7 @@ export class HaloPSA implements INodeType {
 		defaults: {
 			name: 'HaloPSA',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/HaloPSA/__schema__/v1.0.0/ticket/getAll.json b/packages/nodes-base/nodes/HaloPSA/__schema__/v1.0.0/ticket/getAll.json
new file mode 100644
index 0000000000..f16bec91d9
--- /dev/null
+++ b/packages/nodes-base/nodes/HaloPSA/__schema__/v1.0.0/ticket/getAll.json
@@ -0,0 +1,295 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "dateoccurred": {
+            "type": "string"
+        },
+        "summary": {
+            "type": "string"
+        },
+        "details": {
+            "type": "string"
+        },
+        "status_id": {
+            "type": "integer"
+        },
+        "tickettype_id": {
+            "type": "integer"
+        },
+        "sla_id": {
+            "type": "integer"
+        },
+        "priority_id": {
+            "type": "integer"
+        },
+        "client_id": {
+            "type": "integer"
+        },
+        "client_name": {
+            "type": "string"
+        },
+        "site_id": {
+            "type": "integer"
+        },
+        "site_name": {
+            "type": "string"
+        },
+        "user_id": {
+            "type": "integer"
+        },
+        "user_name": {
+            "type": "string"
+        },
+        "team": {
+            "type": "string"
+        },
+        "agent_id": {
+            "type": "integer"
+        },
+        "category_1": {
+            "type": "string"
+        },
+        "category_2": {
+            "type": "string"
+        },
+        "category_3": {
+            "type": "string"
+        },
+        "category_4": {
+            "type": "string"
+        },
+        "estimatedays": {
+            "type": "integer"
+        },
+        "child_count": {
+            "type": "integer"
+        },
+        "attachment_count": {
+            "type": "integer"
+        },
+        "flagged": {
+            "type": "boolean"
+        },
+        "read": {
+            "type": "boolean"
+        },
+        "enduserstatus": {
+            "type": "integer"
+        },
+        "onhold": {
+            "type": "boolean"
+        },
+        "respondbydate": {
+            "type": "string"
+        },
+        "responsedate": {
+            "type": "string"
+        },
+        "slaresponsestate": {
+            "type": "string"
+        },
+        "fixbydate": {
+            "type": "string"
+        },
+        "dateassigned": {
+            "type": "string"
+        },
+        "excludefromsla": {
+            "type": "boolean"
+        },
+        "site_timezone": {
+            "type": "string"
+        },
+        "lastactiondate": {
+            "type": "string"
+        },
+        "last_update": {
+            "type": "string"
+        },
+        "organisation_id": {
+            "type": "integer"
+        },
+        "department_id": {
+            "type": "integer"
+        },
+        "reportedby": {
+            "type": "string"
+        },
+        "user_email": {
+            "type": "string"
+        },
+        "emailtolist": {
+            "type": "string"
+        },
+        "matched_kb_id": {
+            "type": "integer"
+        },
+        "product_id": {
+            "type": "integer"
+        },
+        "release_id": {
+            "type": "integer"
+        },
+        "release2_id": {
+            "type": "integer"
+        },
+        "release3_id": {
+            "type": "integer"
+        },
+        "lastincomingemail": {
+            "type": "string"
+        },
+        "workflow_id": {
+            "type": "integer"
+        },
+        "workflow_step": {
+            "type": "integer"
+        },
+        "workflow_seq": {
+            "type": "integer"
+        },
+        "pipeline_stage_id": {
+            "type": "integer"
+        },
+        "is_vip": {
+            "type": "boolean"
+        },
+        "isimportantcontact": {
+            "type": "boolean"
+        },
+        "inactive": {
+            "type": "boolean"
+        },
+        "impact": {
+            "type": "integer"
+        },
+        "urgency": {
+            "type": "integer"
+        },
+        "starttime": {
+            "type": "string"
+        },
+        "starttimeslot": {
+            "type": "integer"
+        },
+        "targetdate": {
+            "type": "string"
+        },
+        "targettime": {
+            "type": "string"
+        },
+        "targettimeslot": {
+            "type": "integer"
+        },
+        "deadlinedate": {
+            "type": "string"
+        },
+        "oppcompanyname": {
+            "type": "string"
+        },
+        "oppvalueadjusted": {
+            "type": "integer"
+        },
+        "cost": {
+            "type": "integer"
+        },
+        "quantity": {
+            "type": "integer"
+        },
+        "userdef1": {
+            "type": "string"
+        },
+        "userdef2": {
+            "type": "string"
+        },
+        "userdef3": {
+            "type": "string"
+        },
+        "userdef4": {
+            "type": "string"
+        },
+        "userdef5": {
+            "type": "string"
+        },
+        "source": {
+            "type": "integer"
+        },
+        "release_important": {
+            "type": "boolean"
+        },
+        "releasenotegroup_id": {
+            "type": "integer"
+        },
+        "supplier_status": {
+            "type": "integer"
+        },
+        "appointment_type": {
+            "type": "integer"
+        },
+        "section_timezone": {
+            "type": "string"
+        },
+        "projectinternaltask": {
+            "type": "boolean"
+        },
+        "impactlevel": {
+            "type": "integer"
+        },
+        "guid": {
+            "type": "string"
+        },
+        "reviewed": {
+            "type": "boolean"
+        },
+        "merged_into_id": {
+            "type": "integer"
+        },
+        "table": {
+            "type": "integer"
+        },
+        "use": {
+            "type": "string"
+        },
+        "maximumRestrictedPriority": {
+            "type": "integer"
+        },
+        "idsummary": {
+            "type": "string"
+        },
+        "ticketage": {
+            "type": "number"
+        },
+        "useful_count": {
+            "type": "integer"
+        },
+        "notuseful_count": {
+            "type": "integer"
+        },
+        "updateservicestatus": {
+            "type": "boolean"
+        },
+        "servicestatusnote": {
+            "type": "string"
+        },
+        "itil_requesttype_id": {
+            "type": "integer"
+        },
+        "ticket_tags": {
+            "type": "string"
+        },
+        "invoiceseperatelyoverride": {
+            "type": "boolean"
+        },
+        "purchaseordernumber": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "agent_id",
+        "targetdate"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HaloPSA/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/HaloPSA/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..3d85c0abb0
--- /dev/null
+++ b/packages/nodes-base/nodes/HaloPSA/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,30 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "site_id": {
+            "type": "integer"
+        },
+        "surname": {
+            "type": "string"
+        },
+        "emailaddress": {
+            "type": "string"
+        },
+        "inactive": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "site_id",
+        "surname",
+        "inactive"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 1b239ff853..8bf17d84ba 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -35,6 +35,7 @@ export class Harvest implements INodeType {
 		defaults: {
 			name: 'Harvest',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/invoice/getAll.json b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/invoice/getAll.json
new file mode 100644
index 0000000000..cfae979f04
--- /dev/null
+++ b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/invoice/getAll.json
@@ -0,0 +1,168 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "integer"
+		},
+		"client_key": {
+			"type": "string"
+		},
+		"number": {
+			"type": "string"
+		},
+		"purchase_order": {
+			"type": "string"
+		},
+		"tax2": {
+			"type": "null"
+		},
+		"tax2_amount": {
+			"type": "integer"
+		},
+		"discount_amount": {
+			"type": "integer"
+		},
+		"subject": {
+			"type": "string"
+		},
+		"notes": {
+			"type": "string"
+		},
+		"state": {
+			"type": "string"
+		},
+		"issue_date": {
+			"type": "string"
+		},
+		"due_date": {
+			"type": "string"
+		},
+		"payment_term": {
+			"type": "string"
+		},
+		"closed_at": {
+			"type": "null"
+		},
+		"created_at": {
+			"type": "string"
+		},
+		"updated_at": {
+			"type": "string"
+		},
+		"currency": {
+			"type": "string"
+		},
+		"payment_options": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"client": {
+			"type": "object",
+			"properties": {
+				"id": {
+					"type": "integer"
+				},
+				"name": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"id",
+				"name"
+			]
+		},
+		"estimate": {
+			"type": "null"
+		},
+		"retainer": {
+			"type": "null"
+		},
+		"creator": {
+			"type": "object",
+			"properties": {
+				"id": {
+					"type": "integer"
+				},
+				"name": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"id",
+				"name"
+			]
+		},
+		"line_items": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer"
+					},
+					"kind": {
+						"type": "string"
+					},
+					"description": {
+						"type": "string"
+					},
+					"taxed": {
+						"type": "boolean"
+					},
+					"taxed2": {
+						"type": "boolean"
+					}
+				},
+				"required": [
+					"id",
+					"kind",
+					"description",
+					"quantity",
+					"unit_price",
+					"amount",
+					"taxed",
+					"taxed2",
+					"project"
+				]
+			}
+		}
+	},
+	"required": [
+		"id",
+		"client_key",
+		"number",
+		"purchase_order",
+		"amount",
+		"due_amount",
+		"tax",
+		"tax_amount",
+		"tax2",
+		"tax2_amount",
+		"discount",
+		"discount_amount",
+		"subject",
+		"notes",
+		"state",
+		"period_start",
+		"period_end",
+		"issue_date",
+		"due_date",
+		"payment_term",
+		"sent_at",
+		"paid_at",
+		"closed_at",
+		"recurring_invoice_id",
+		"created_at",
+		"updated_at",
+		"paid_date",
+		"currency",
+		"payment_options",
+		"client",
+		"estimate",
+		"retainer",
+		"creator",
+		"line_items"
+	]
+}
diff --git a/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/project/getAll.json b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/project/getAll.json
new file mode 100644
index 0000000000..79af39b491
--- /dev/null
+++ b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/project/getAll.json
@@ -0,0 +1,92 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "is_active": {
+            "type": "boolean"
+        },
+        "is_billable": {
+            "type": "boolean"
+        },
+        "is_fixed_fee": {
+            "type": "boolean"
+        },
+        "bill_by": {
+            "type": "string"
+        },
+        "budget_by": {
+            "type": "string"
+        },
+        "budget_is_monthly": {
+            "type": "boolean"
+        },
+        "notify_when_over_budget": {
+            "type": "boolean"
+        },
+        "over_budget_notification_percentage": {
+            "type": "integer"
+        },
+        "show_budget_to_all": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "cost_budget_include_expenses": {
+            "type": "boolean"
+        },
+        "client": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "currency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "currency"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "code",
+        "is_active",
+        "is_billable",
+        "is_fixed_fee",
+        "bill_by",
+        "budget",
+        "budget_by",
+        "budget_is_monthly",
+        "notify_when_over_budget",
+        "over_budget_notification_percentage",
+        "show_budget_to_all",
+        "created_at",
+        "updated_at",
+        "starts_on",
+        "ends_on",
+        "over_budget_notification_date",
+        "notes",
+        "cost_budget",
+        "cost_budget_include_expenses",
+        "hourly_rate",
+        "fee",
+        "client"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/timeEntry/getAll.json b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/timeEntry/getAll.json
new file mode 100644
index 0000000000..9762247746
--- /dev/null
+++ b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/timeEntry/getAll.json
@@ -0,0 +1,195 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "spent_date": {
+            "type": "string"
+        },
+        "is_locked": {
+            "type": "boolean"
+        },
+        "is_closed": {
+            "type": "boolean"
+        },
+        "is_billed": {
+            "type": "boolean"
+        },
+        "ended_time": {
+            "type": "null"
+        },
+        "is_running": {
+            "type": "boolean"
+        },
+        "billable": {
+            "type": "boolean"
+        },
+        "budgeted": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "client": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "currency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "currency"
+            ]
+        },
+        "project": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "code"
+            ]
+        },
+        "task": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "user_assignment": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "is_project_manager": {
+                    "type": "boolean"
+                },
+                "is_active": {
+                    "type": "boolean"
+                },
+                "use_default_rates": {
+                    "type": "boolean"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "is_project_manager",
+                "is_active",
+                "use_default_rates",
+                "budget",
+                "created_at",
+                "updated_at",
+                "hourly_rate"
+            ]
+        },
+        "task_assignment": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "billable": {
+                    "type": "boolean"
+                },
+                "is_active": {
+                    "type": "boolean"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "billable",
+                "is_active",
+                "created_at",
+                "updated_at",
+                "hourly_rate",
+                "budget"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "spent_date",
+        "hours",
+        "hours_without_timer",
+        "rounded_hours",
+        "notes",
+        "is_locked",
+        "locked_reason",
+        "is_closed",
+        "is_billed",
+        "timer_started_at",
+        "started_time",
+        "ended_time",
+        "is_running",
+        "billable",
+        "budgeted",
+        "billable_rate",
+        "cost_rate",
+        "created_at",
+        "updated_at",
+        "user",
+        "client",
+        "project",
+        "task",
+        "user_assignment",
+        "task_assignment",
+        "invoice",
+        "external_reference"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..3e7788edd9
--- /dev/null
+++ b/packages/nodes-base/nodes/Harvest/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,90 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "last_name": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "telephone": {
+            "type": "string"
+        },
+        "timezone": {
+            "type": "string"
+        },
+        "weekly_capacity": {
+            "type": "integer"
+        },
+        "has_access_to_all_future_projects": {
+            "type": "boolean"
+        },
+        "is_contractor": {
+            "type": "boolean"
+        },
+        "is_active": {
+            "type": "boolean"
+        },
+        "calendar_integration_enabled": {
+            "type": "boolean"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "can_create_projects": {
+            "type": "boolean"
+        },
+        "roles": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "access_roles": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "permissions_claims": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "avatar_url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "first_name",
+        "last_name",
+        "email",
+        "telephone",
+        "timezone",
+        "weekly_capacity",
+        "has_access_to_all_future_projects",
+        "is_contractor",
+        "is_active",
+        "calendar_integration_enabled",
+        "calendar_integration_source",
+        "created_at",
+        "updated_at",
+        "can_create_projects",
+        "default_hourly_rate",
+        "roles",
+        "access_roles",
+        "permissions_claims",
+        "avatar_url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index 6fae6b0ba0..08bc71e198 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -33,6 +33,7 @@ export class HelpScout implements INodeType {
 		defaults: {
 			name: 'HelpScout',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/HelpScout/__schema__/v1.0.0/conversation/getAll.json b/packages/nodes-base/nodes/HelpScout/__schema__/v1.0.0/conversation/getAll.json
new file mode 100644
index 0000000000..0b52943b71
--- /dev/null
+++ b/packages/nodes-base/nodes/HelpScout/__schema__/v1.0.0/conversation/getAll.json
@@ -0,0 +1,331 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "number": {
+            "type": "integer"
+        },
+        "threads": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "folderId": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "preview": {
+            "type": "string"
+        },
+        "mailboxId": {
+            "type": "integer"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "first": {
+                    "type": "string"
+                },
+                "last": {
+                    "type": "string"
+                },
+                "photoUrl": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "type",
+                "first",
+                "last",
+                "email"
+            ]
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "closedBy": {
+            "type": "integer"
+        },
+        "closedByUser": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "first": {
+                    "type": "string"
+                },
+                "last": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "type",
+                "first",
+                "last",
+                "email"
+            ]
+        },
+        "userUpdatedAt": {
+            "type": "string"
+        },
+        "customerWaitingSince": {
+            "type": "object",
+            "properties": {
+                "time": {
+                    "type": "string"
+                },
+                "friendly": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "time",
+                "friendly"
+            ]
+        },
+        "source": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "via": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "via"
+            ]
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "tag": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "color",
+                    "tag"
+                ]
+            }
+        },
+        "cc": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "primaryCustomer": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "first": {
+                    "type": "string"
+                },
+                "last": {
+                    "type": "string"
+                },
+                "photoUrl": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "type",
+                "first",
+                "last",
+                "photoUrl",
+                "email"
+            ]
+        },
+        "customFields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "text": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "value",
+                    "text"
+                ]
+            }
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                },
+                "mailbox": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                },
+                "primaryCustomer": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                },
+                "createdByCustomer": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                },
+                "closedBy": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                },
+                "threads": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                },
+                "web": {
+                    "type": "object",
+                    "properties": {
+                        "href": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "href"
+                    ]
+                }
+            },
+            "required": [
+                "self",
+                "mailbox",
+                "primaryCustomer",
+                "closedBy",
+                "threads",
+                "web"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "number",
+        "threads",
+        "type",
+        "folderId",
+        "status",
+        "state",
+        "preview",
+        "mailboxId",
+        "createdBy",
+        "createdAt",
+        "closedBy",
+        "closedByUser",
+        "userUpdatedAt",
+        "customerWaitingSince",
+        "source",
+        "tags",
+        "cc",
+        "bcc",
+        "primaryCustomer",
+        "customFields",
+        "_embedded",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v1.0.0/contact/lookup.json b/packages/nodes-base/nodes/HighLevel/__schema__/v1.0.0/contact/lookup.json
new file mode 100644
index 0000000000..9d11f5ae98
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v1.0.0/contact/lookup.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "dateAdded": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "locationId": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "firstNameLowerCase": {
+            "type": "string"
+        },
+        "fullNameLowerCase": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "lastNameLowerCase": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "emailLowerCase": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "country": {
+            "type": "string"
+        },
+        "source": {
+            "type": "string"
+        },
+        "timezone": {
+            "type": "string"
+        },
+        "fingerprint": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "customField": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "assignedTo": {
+            "type": "string"
+        },
+        "address1": {
+            "type": "string"
+        },
+        "city": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "postalCode": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/create.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/create.json
new file mode 100644
index 0000000000..e32af9488d
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/create.json
@@ -0,0 +1,96 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "dateAdded": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "locationId": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "firstNameLowerCase": {
+            "type": "string"
+        },
+        "fullNameLowerCase": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "lastNameLowerCase": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "emailLowerCase": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "country": {
+            "type": "string"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "source": {
+                    "type": "string"
+                },
+                "channel": {
+                    "type": "string"
+                },
+                "sourceId": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "source",
+                "channel",
+                "sourceId",
+                "timestamp"
+            ]
+        },
+        "dateUpdated": {
+            "type": "string"
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "customFields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/get.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/get.json
new file mode 100644
index 0000000000..70670b64dc
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/get.json
@@ -0,0 +1,124 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "dateAdded": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "locationId": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "firstNameLowerCase": {
+            "type": "string"
+        },
+        "fullNameLowerCase": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "lastNameLowerCase": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "emailLowerCase": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "country": {
+            "type": "string"
+        },
+        "attributionSource": {
+            "type": "object",
+            "properties": {
+                "sessionSource": {
+                    "type": "string"
+                },
+                "medium": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "sessionSource",
+                "medium"
+            ]
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "source": {
+                    "type": "string"
+                },
+                "channel": {
+                    "type": "string"
+                },
+                "sourceId": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "source",
+                "channel",
+                "sourceId",
+                "timestamp"
+            ]
+        },
+        "dateUpdated": {
+            "type": "string"
+        },
+        "customFields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "additionalPhones": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "phone": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "phone",
+                    "phoneLabel"
+                ]
+            }
+        },
+        "state": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/getAll.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/getAll.json
new file mode 100644
index 0000000000..2a9ed74679
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/getAll.json
@@ -0,0 +1,80 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "locationId": {
+            "type": "string"
+        },
+        "contactName": {
+            "type": "string"
+        },
+        "dnd": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "string"
+        },
+        "dateAdded": {
+            "type": "string"
+        },
+        "dateUpdated": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "country": {
+            "type": "string"
+        },
+        "website": {
+            "type": "null"
+        },
+        "attributions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "utmSessionSource": {
+                        "type": "string"
+                    },
+                    "isFirst": {
+                        "type": "boolean"
+                    },
+                    "medium": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "utmSessionSource",
+                    "medium"
+                ]
+            }
+        },
+        "customFields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/update.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/update.json
new file mode 100644
index 0000000000..3ed4765866
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/contact/update.json
@@ -0,0 +1,118 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "additionalPhones": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "phoneLabel": {
+                        "type": "null"
+                    },
+                    "phone": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "phoneLabel",
+                    "phone"
+                ]
+            }
+        },
+        "dateAdded": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "locationId": {
+            "type": "string"
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "firstNameLowerCase": {
+            "type": "string"
+        },
+        "fullNameLowerCase": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "lastNameLowerCase": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "country": {
+            "type": "string"
+        },
+        "dnd": {
+            "type": "boolean"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "source": {
+                    "type": "string"
+                },
+                "channel": {
+                    "type": "string"
+                },
+                "sourceId": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "source",
+                "channel",
+                "sourceId",
+                "timestamp"
+            ]
+        },
+        "emailLowerCase": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "dateUpdated": {
+            "type": "string"
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "customFields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/create.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/create.json
new file mode 100644
index 0000000000..eac740f5f5
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/create.json
@@ -0,0 +1,136 @@
+{
+    "type": "object",
+    "properties": {
+        "opportunity": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "monetaryValue": {
+                    "type": "integer"
+                },
+                "pipelineId": {
+                    "type": "string"
+                },
+                "pipelineStageId": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "lastStatusChangeAt": {
+                    "type": "string"
+                },
+                "lastStageChangeAt": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "contactId": {
+                    "type": "string"
+                },
+                "isAttribute": {
+                    "type": "boolean"
+                },
+                "internalSource": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "apiVersion": {
+                            "type": "string"
+                        },
+                        "channel": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "type",
+                        "id",
+                        "apiVersion",
+                        "channel",
+                        "source"
+                    ]
+                },
+                "locationId": {
+                    "type": "string"
+                },
+                "lastActionDate": {
+                    "type": "string"
+                },
+                "followers": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "contact": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "tags": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "phone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "name",
+                        "tags",
+                        "followers"
+                    ]
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "monetaryValue",
+                "pipelineId",
+                "pipelineStageId",
+                "status",
+                "lastStatusChangeAt",
+                "lastStageChangeAt",
+                "createdAt",
+                "updatedAt",
+                "contactId",
+                "isAttribute",
+                "internalSource",
+                "locationId",
+                "lastActionDate",
+                "followers",
+                "contact"
+            ]
+        },
+        "traceId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/get.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/get.json
new file mode 100644
index 0000000000..e82e93cc4c
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/get.json
@@ -0,0 +1,149 @@
+{
+    "type": "object",
+    "properties": {
+        "opportunity": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "pipelineId": {
+                    "type": "string"
+                },
+                "pipelineStageId": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "lastStatusChangeAt": {
+                    "type": "string"
+                },
+                "lastStageChangeAt": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "contactId": {
+                    "type": "string"
+                },
+                "isAttribute": {
+                    "type": "boolean"
+                },
+                "internalSource": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "apiVersion": {
+                            "type": "string"
+                        },
+                        "channel": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "type",
+                        "id",
+                        "apiVersion",
+                        "channel",
+                        "source"
+                    ]
+                },
+                "locationId": {
+                    "type": "string"
+                },
+                "lastActionDate": {
+                    "type": "string"
+                },
+                "followers": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "contact": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "phone": {
+                            "type": "string"
+                        },
+                        "tags": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "assignedTo": {
+                            "type": "string"
+                        },
+                        "followers": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "name",
+                        "tags",
+                        "followers"
+                    ]
+                },
+                "indexVersion": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "monetaryValue",
+                "pipelineId",
+                "pipelineStageId",
+                "status",
+                "lastStatusChangeAt",
+                "lastStageChangeAt",
+                "createdAt",
+                "updatedAt",
+                "contactId",
+                "isAttribute",
+                "internalSource",
+                "locationId",
+                "lastActionDate",
+                "followers",
+                "contact"
+            ]
+        },
+        "traceId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "opportunity",
+        "traceId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/getAll.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/getAll.json
new file mode 100644
index 0000000000..1a95fe08e1
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/getAll.json
@@ -0,0 +1,183 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "pipelineId": {
+            "type": "string"
+        },
+        "pipelineStageId": {
+            "type": "string"
+        },
+        "pipelineStageUId": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "lastStatusChangeAt": {
+            "type": "string"
+        },
+        "lastStageChangeAt": {
+            "type": "string"
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "indexVersion": {
+            "type": "integer"
+        },
+        "contactId": {
+            "type": "string"
+        },
+        "locationId": {
+            "type": "string"
+        },
+        "customFields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "fieldValueString": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "fieldValueDate": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "type"
+                ]
+            }
+        },
+        "followers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "relations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "associationId": {
+                        "type": "string"
+                    },
+                    "relationId": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    },
+                    "objectKey": {
+                        "type": "string"
+                    },
+                    "recordId": {
+                        "type": "string"
+                    },
+                    "tags": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "associationId",
+                    "relationId",
+                    "primary",
+                    "objectKey",
+                    "recordId",
+                    "fullName",
+                    "contactName",
+                    "companyName",
+                    "email",
+                    "phone",
+                    "tags",
+                    "attributed"
+                ]
+            }
+        },
+        "contact": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "tags"
+            ]
+        },
+        "attributions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "utmSessionSource": {
+                        "type": "string"
+                    },
+                    "isFirst": {
+                        "type": "boolean"
+                    },
+                    "medium": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "medium"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "monetaryValue",
+        "pipelineId",
+        "pipelineStageId",
+        "pipelineStageUId",
+        "assignedTo",
+        "status",
+        "source",
+        "lastStatusChangeAt",
+        "lastStageChangeAt",
+        "createdAt",
+        "updatedAt",
+        "contactId",
+        "locationId",
+        "customFields",
+        "lostReasonId",
+        "followers",
+        "relations",
+        "contact",
+        "sort",
+        "attributions"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/update.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/update.json
new file mode 100644
index 0000000000..386b77a39f
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/opportunity/update.json
@@ -0,0 +1,156 @@
+{
+    "type": "object",
+    "properties": {
+        "opportunity": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "monetaryValue": {
+                    "type": "integer"
+                },
+                "pipelineId": {
+                    "type": "string"
+                },
+                "pipelineStageId": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "source": {
+                    "type": "string"
+                },
+                "lastStatusChangeAt": {
+                    "type": "string"
+                },
+                "lastStageChangeAt": {
+                    "type": "string"
+                },
+                "createdAt": {
+                    "type": "string"
+                },
+                "updatedAt": {
+                    "type": "string"
+                },
+                "contactId": {
+                    "type": "string"
+                },
+                "isAttribute": {
+                    "type": "boolean"
+                },
+                "internalSource": {
+                    "type": "object",
+                    "properties": {
+                        "type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "apiVersion": {
+                            "type": "string"
+                        },
+                        "channel": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "type",
+                        "id"
+                    ]
+                },
+                "locationId": {
+                    "type": "string"
+                },
+                "lastActionDate": {
+                    "type": "string"
+                },
+                "followers": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "contact": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "phone": {
+                            "type": "string"
+                        },
+                        "tags": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "name",
+                        "email",
+                        "phone",
+                        "tags",
+                        "followers"
+                    ]
+                },
+                "customFields": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "fieldValue"
+                        ]
+                    }
+                },
+                "indexVersion": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "monetaryValue",
+                "pipelineId",
+                "pipelineStageId",
+                "status",
+                "lastStatusChangeAt",
+                "lastStageChangeAt",
+                "createdAt",
+                "updatedAt",
+                "contactId",
+                "isAttribute",
+                "internalSource",
+                "locationId",
+                "lastActionDate",
+                "followers",
+                "contact"
+            ]
+        },
+        "traceId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/task/create.json b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/task/create.json
new file mode 100644
index 0000000000..bb3b60915a
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/__schema__/v2.0.0/task/create.json
@@ -0,0 +1,46 @@
+{
+    "type": "object",
+    "properties": {
+        "task": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "title": {
+                    "type": "string"
+                },
+                "dueDate": {
+                    "type": "string"
+                },
+                "completed": {
+                    "type": "boolean"
+                },
+                "contactId": {
+                    "type": "string"
+                },
+                "businessId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "title",
+                "dueDate",
+                "completed",
+                "contactId"
+            ]
+        },
+        "traceId": {
+            "type": "string"
+        },
+        "contactId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "task",
+        "traceId",
+        "contactId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts b/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
index be9ee5d4f7..16fcad3250 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
@@ -62,6 +62,7 @@ const versionDescription: INodeTypeDescription = {
 	defaults: {
 		name: 'HighLevel',
 	},
+	usableAsTool: true,
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
 	credentials: [
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index b68a857ce8..cd9c6a4c6a 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -38,6 +38,7 @@ export class HomeAssistant implements INodeType {
 		defaults: {
 			name: 'Home Assistant',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/get.json b/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/get.json
new file mode 100644
index 0000000000..f28ca78451
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/get.json
@@ -0,0 +1,61 @@
+{
+    "type": "object",
+    "properties": {
+        "entity_id": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "friendly_name": {
+                    "type": "string"
+                },
+                "state_class": {
+                    "type": "string"
+                },
+                "unit_of_measurement": {
+                    "type": "string"
+                },
+                "device_class": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "friendly_name"
+            ]
+        },
+        "last_changed": {
+            "type": "string"
+        },
+        "last_reported": {
+            "type": "string"
+        },
+        "last_updated": {
+            "type": "string"
+        },
+        "context": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "parent_id",
+                "user_id"
+            ]
+        }
+    },
+    "required": [
+        "entity_id",
+        "state",
+        "attributes",
+        "last_changed",
+        "last_updated",
+        "context"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/getAll.json b/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/getAll.json
new file mode 100644
index 0000000000..e68f67946d
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/getAll.json
@@ -0,0 +1,86 @@
+{
+    "type": "object",
+    "properties": {
+        "entity_id": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "editable": {
+                    "type": "boolean"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "device_trackers": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "user_id": {
+                    "type": "string"
+                },
+                "friendly_name": {
+                    "type": "string"
+                },
+                "latitude": {
+                    "type": "number"
+                },
+                "longitude": {
+                    "type": "number"
+                },
+                "gps_accuracy": {
+                    "type": "integer"
+                },
+                "source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "friendly_name"
+            ]
+        },
+        "last_changed": {
+            "type": "string"
+        },
+        "last_reported": {
+            "type": "string"
+        },
+        "last_updated": {
+            "type": "string"
+        },
+        "context": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "parent_id": {
+                    "type": "null"
+                },
+                "user_id": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "id",
+                "parent_id",
+                "user_id"
+            ]
+        }
+    },
+    "required": [
+        "entity_id",
+        "state",
+        "attributes",
+        "last_changed",
+        "last_reported",
+        "last_updated",
+        "context"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/upsert.json b/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/upsert.json
new file mode 100644
index 0000000000..5db40462d6
--- /dev/null
+++ b/packages/nodes-base/nodes/HomeAssistant/__schema__/v1.0.0/state/upsert.json
@@ -0,0 +1,48 @@
+{
+	"type": "object",
+	"properties": {
+		"entity_id": {
+			"type": "string"
+		},
+		"state": {
+			"type": "string"
+		},
+		"last_changed": {
+			"type": "string"
+		},
+		"last_reported": {
+			"type": "string"
+		},
+		"last_updated": {
+			"type": "string"
+		},
+		"context": {
+			"type": "object",
+			"properties": {
+				"id": {
+					"type": "string"
+				},
+				"parent_id": {
+					"type": "null"
+				},
+				"user_id": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"id",
+				"parent_id",
+				"user_id"
+			]
+		}
+	},
+	"required": [
+		"entity_id",
+		"state",
+		"attributes",
+		"last_changed",
+		"last_reported",
+		"last_updated",
+		"context"
+	]
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
index 76e242adfd..286ce435b5 100644
--- a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
@@ -176,6 +176,9 @@ export const getOAuth2AdditionalParameters = (nodeCredentialType: string) => {
 		mauticOAuth2Api: {
 			includeCredentialsOnRefreshOnBody: true,
 		},
+		microsoftAzureMonitorOAuth2Api: {
+			tokenExpiredStatusCode: 403,
+		},
 		microsoftDynamicsOAuth2Api: {
 			property: 'id_token',
 		},
diff --git a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
index d22169e50d..f7822250bf 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
@@ -17,8 +17,6 @@ describe('Test Binary Data Download', () => {
 	beforeAll(async () => {
 		await initBinaryDataService();
 
-		nock.disableNetConnect();
-
 		nock(baseUrl)
 			.persist()
 			.get('/path/to/image.png')
@@ -33,11 +31,6 @@ describe('Test Binary Data Download', () => {
 			'content-disposition': 'attachment; filename="testing.jpg"',
 		});
 	});
-
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
index d5488c6f2e..d98a76029b 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
@@ -21,18 +21,11 @@ describe('Test Response Encoding', () => {
 	beforeAll(async () => {
 		await initBinaryDataService();
 
-		nock.disableNetConnect();
-
 		nock(baseUrl)
 			.persist()
 			.get('/index.html')
 			.reply(200, payload, { 'content-type': 'text/plain; charset=latin1' });
 	});
-
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
index 5d3a67dde9..0237a98836 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
@@ -21,18 +21,11 @@ describe('Test Quoted Response Encoding', () => {
 	beforeAll(async () => {
 		await initBinaryDataService();
 
-		nock.disableNetConnect();
-
 		nock(baseUrl)
 			.persist()
 			.get('/index.html')
 			.reply(200, payload, { 'content-type': 'text/plain; charset="latin1"' });
 	});
-
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
index 6e49794df3..d25dd15f8f 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
@@ -17,7 +17,6 @@ describe('Test HTTP Request Node', () => {
 
 	beforeAll(async () => {
 		await initBinaryDataService();
-		nock.disableNetConnect();
 
 		function getPaginationReturnData(this: nock.ReplyFnContext, limit = 10, skip = 0) {
 			const nextUrl = `${baseUrl}/users?skip=${skip + limit}&limit=${limit}`;
@@ -192,11 +191,6 @@ describe('Test HTTP Request Node', () => {
 				return getPaginationReturnData.call(this, limit, skip);
 			});
 	});
-
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
index af54f6c267..03e41b5b7d 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.pagination.json
@@ -1266,7 +1266,7 @@
 						"next-url": "https://dummyjson.com/users?skip=4&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1277,7 +1277,7 @@
 						"next-url": "https://dummyjson.com/users?skip=8&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1288,7 +1288,7 @@
 						"next-url": "https://dummyjson.com/users?skip=12&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1299,7 +1299,7 @@
 						"next-url": "https://dummyjson.com/users?skip=16&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1310,7 +1310,7 @@
 						"next-url": "https://dummyjson.com/users?skip=20&limit=4"
 					},
 					"statusCode": 404,
-					"statusMessage": null
+					"statusMessage": "Not Found"
 				}
 			}
 		],
@@ -1532,7 +1532,7 @@
 						"next-url": "https://dummyjson.com/users?skip=4&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1543,7 +1543,7 @@
 						"next-url": "https://dummyjson.com/users?skip=8&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1554,7 +1554,7 @@
 						"next-url": "https://dummyjson.com/users?skip=12&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1565,7 +1565,7 @@
 						"next-url": "https://dummyjson.com/users?skip=16&limit=4"
 					},
 					"statusCode": 200,
-					"statusMessage": null
+					"statusMessage": "OK"
 				}
 			},
 			{
@@ -1576,7 +1576,7 @@
 						"next-url": "https://dummyjson.com/users?skip=20&limit=4"
 					},
 					"statusCode": 404,
-					"statusMessage": null
+					"statusMessage": "Not Found"
 				}
 			}
 		],
diff --git a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
index 94d7bc67cf..bcc9601938 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
@@ -38,7 +38,6 @@ import {
 	validateCredentials,
 } from './GenericFunctions';
 import { ticketFields, ticketOperations } from './TicketDescription';
-import { generatePairedItemData } from '../../../utils/utilities';
 
 export class HubspotV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -52,6 +51,7 @@ export class HubspotV2 implements INodeType {
 			defaults: {
 				name: 'HubSpot',
 			},
+			usableAsTool: true,
 			inputs: [NodeConnectionType.Main],
 			outputs: [NodeConnectionType.Main],
 			credentials: [
@@ -1184,12 +1184,7 @@ export class HubspotV2 implements INodeType {
 					);
 				}
 
-				const itemData = generatePairedItemData(items.length);
-
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData },
-				);
+				const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/create.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/create.json
new file mode 100644
index 0000000000..c3b224b98c
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/create.json
@@ -0,0 +1,596 @@
+{
+    "type": "object",
+    "properties": {
+        "portalId": {
+            "type": "integer"
+        },
+        "companyId": {
+            "type": "integer"
+        },
+        "isDeleted": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "hs_object_source_id": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "hs_lastmodifieddate": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "name": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "hs_object_id": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "hs_pipeline": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "createdate": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "hs_object_source": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "lifecyclestage": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "hs_object_source_label": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid",
+                                    "requestId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                }
+            },
+            "required": [
+                "hs_object_source_id",
+                "hs_lastmodifieddate",
+                "hs_object_id",
+                "hs_pipeline",
+                "createdate",
+                "hs_object_source",
+                "lifecyclestage",
+                "hs_object_source_label"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/getAll.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/getAll.json
new file mode 100644
index 0000000000..06f50aeb41
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/getAll.json
@@ -0,0 +1,95 @@
+{
+    "type": "object",
+    "properties": {
+        "portalId": {
+            "type": "integer"
+        },
+        "companyId": {
+            "type": "integer"
+        },
+        "isDeleted": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "updatedByUserId": {
+                                        "type": "integer"
+                                    },
+                                    "useTimestampAsPersistenceTimestamp": {
+                                        "type": "boolean"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "source",
+                                    "sourceVid"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                }
+            }
+        },
+        "stateChanges": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "changeFlag": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "changeFlag",
+                    "timestamp"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/searchByDomain.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/searchByDomain.json
new file mode 100644
index 0000000000..5203bbb4a9
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/searchByDomain.json
@@ -0,0 +1,109 @@
+{
+    "type": "object",
+    "properties": {
+        "portalId": {
+            "type": "integer"
+        },
+        "companyId": {
+            "type": "integer"
+        },
+        "isDeleted": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "domain": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "sourceVid": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "requestId": {
+                                        "type": "string"
+                                    },
+                                    "useTimestampAsPersistenceTimestamp": {
+                                        "type": "boolean"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "source",
+                                    "sourceVid"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                }
+            }
+        },
+        "additionalDomains": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "domain": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "source": {
+                        "type": "string"
+                    },
+                    "sourceId": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "domain",
+                    "timestamp",
+                    "source",
+                    "sourceId"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/update.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/update.json
new file mode 100644
index 0000000000..2586924e86
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/company/update.json
@@ -0,0 +1,545 @@
+{
+	"type": "object",
+	"properties": {
+		"portalId": {
+			"type": "integer"
+		},
+		"companyId": {
+			"type": "integer"
+		},
+		"isDeleted": {
+			"type": "boolean"
+		},
+		"properties": {
+			"type": "object",
+			"properties": {
+				"hs_object_source_id": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									},
+									"requestId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"hs_lastmodifieddate": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"source": {
+										"type": "string"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"requestId": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"hs_pipeline": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									},
+									"requestId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"hs_object_id": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									},
+									"requestId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"createdate": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									},
+									"requestId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"hs_object_source": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									},
+									"requestId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"lifecyclestage": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"requestId": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				},
+				"hs_object_source_label": {
+					"type": "object",
+					"properties": {
+						"value": {
+							"type": "string"
+						},
+						"timestamp": {
+							"type": "integer"
+						},
+						"source": {
+							"type": "string"
+						},
+						"sourceId": {
+							"type": "string"
+						},
+						"updatedByUserId": {
+							"type": "null"
+						},
+						"versions": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"name": {
+										"type": "string"
+									},
+									"value": {
+										"type": "string"
+									},
+									"timestamp": {
+										"type": "integer"
+									},
+									"sourceId": {
+										"type": "string"
+									},
+									"source": {
+										"type": "string"
+									},
+									"useTimestampAsPersistenceTimestamp": {
+										"type": "boolean"
+									},
+									"requestId": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"name",
+									"value",
+									"timestamp",
+									"sourceId",
+									"source",
+									"sourceVid"
+								]
+							}
+						}
+					},
+					"required": [
+						"value",
+						"timestamp",
+						"source",
+						"sourceId",
+						"updatedByUserId",
+						"versions"
+					]
+				}
+			},
+			"required": [
+				"hs_object_source_id",
+				"hs_lastmodifieddate",
+				"hs_pipeline",
+				"hs_object_id",
+				"createdate",
+				"hs_object_source",
+				"lifecyclestage",
+				"hs_object_source_label"
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/get.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/get.json
new file mode 100644
index 0000000000..e734775d76
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/get.json
@@ -0,0 +1,431 @@
+{
+    "type": "object",
+    "properties": {
+        "vid": {
+            "type": "integer"
+        },
+        "canonical-vid": {
+            "type": "integer"
+        },
+        "portal-id": {
+            "type": "integer"
+        },
+        "is-contact": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "hs_is_contact": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "source-type": {
+                                        "type": "string"
+                                    },
+                                    "source-id": {
+                                        "type": "null"
+                                    },
+                                    "source-label": {
+                                        "type": "null"
+                                    },
+                                    "updated-by-user-id": {
+                                        "type": "null"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "selected": {
+                                        "type": "boolean"
+                                    },
+                                    "data-sensitivity": {
+                                        "type": "null"
+                                    },
+                                    "is-encrypted": {
+                                        "type": "null"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "source-type",
+                                    "source-id",
+                                    "source-label",
+                                    "updated-by-user-id",
+                                    "timestamp",
+                                    "selected",
+                                    "data-sensitivity",
+                                    "is-encrypted"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "lastmodifieddate": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "source-type": {
+                                        "type": "string"
+                                    },
+                                    "source-label": {
+                                        "type": "null"
+                                    },
+                                    "updated-by-user-id": {
+                                        "type": "null"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "selected": {
+                                        "type": "boolean"
+                                    },
+                                    "data-sensitivity": {
+                                        "type": "null"
+                                    },
+                                    "is-encrypted": {
+                                        "type": "null"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "source-type",
+                                    "source-id",
+                                    "source-label",
+                                    "updated-by-user-id",
+                                    "timestamp",
+                                    "selected",
+                                    "data-sensitivity",
+                                    "is-encrypted"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "ip_country_code": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "source-type": {
+                                        "type": "string"
+                                    },
+                                    "source-id": {
+                                        "type": "string"
+                                    },
+                                    "source-label": {
+                                        "type": "null"
+                                    },
+                                    "updated-by-user-id": {
+                                        "type": "null"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "selected": {
+                                        "type": "boolean"
+                                    },
+                                    "data-sensitivity": {
+                                        "type": "null"
+                                    },
+                                    "is-encrypted": {
+                                        "type": "null"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "source-type",
+                                    "source-id",
+                                    "source-label",
+                                    "updated-by-user-id",
+                                    "timestamp",
+                                    "selected",
+                                    "data-sensitivity",
+                                    "is-encrypted"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "versions"
+                    ]
+                },
+                "ip_country": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "source-type": {
+                                        "type": "string"
+                                    },
+                                    "source-id": {
+                                        "type": "string"
+                                    },
+                                    "source-label": {
+                                        "type": "null"
+                                    },
+                                    "updated-by-user-id": {
+                                        "type": "null"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "selected": {
+                                        "type": "boolean"
+                                    },
+                                    "data-sensitivity": {
+                                        "type": "null"
+                                    },
+                                    "is-encrypted": {
+                                        "type": "null"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "source-type",
+                                    "source-id",
+                                    "source-label",
+                                    "updated-by-user-id",
+                                    "timestamp",
+                                    "selected",
+                                    "data-sensitivity",
+                                    "is-encrypted"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "versions"
+                    ]
+                },
+                "hs_ip_timezone": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "source-type": {
+                                        "type": "string"
+                                    },
+                                    "source-id": {
+                                        "type": "string"
+                                    },
+                                    "source-label": {
+                                        "type": "null"
+                                    },
+                                    "updated-by-user-id": {
+                                        "type": "null"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "selected": {
+                                        "type": "boolean"
+                                    },
+                                    "data-sensitivity": {
+                                        "type": "null"
+                                    },
+                                    "is-encrypted": {
+                                        "type": "null"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "source-type",
+                                    "source-id",
+                                    "source-label",
+                                    "updated-by-user-id",
+                                    "timestamp",
+                                    "selected",
+                                    "data-sensitivity",
+                                    "is-encrypted"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "versions"
+                    ]
+                }
+            },
+            "required": [
+                "hs_is_contact"
+            ]
+        },
+        "form-submissions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "conversion-id": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "form-id": {
+                        "type": "string"
+                    },
+                    "portal-id": {
+                        "type": "integer"
+                    },
+                    "page-url": {
+                        "type": "string"
+                    },
+                    "page-title": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "form-type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "conversion-id",
+                    "timestamp",
+                    "form-id",
+                    "portal-id",
+                    "page-url",
+                    "page-title",
+                    "title",
+                    "form-type",
+                    "meta-data"
+                ]
+            }
+        },
+        "list-memberships": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "static-list-id": {
+                        "type": "integer"
+                    },
+                    "internal-list-id": {
+                        "type": "integer"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "vid": {
+                        "type": "integer"
+                    },
+                    "is-member": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "static-list-id",
+                    "internal-list-id",
+                    "timestamp",
+                    "vid",
+                    "is-member"
+                ]
+            }
+        },
+        "identity-profiles": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "vid": {
+                        "type": "integer"
+                    },
+                    "saved-at-timestamp": {
+                        "type": "integer"
+                    },
+                    "deleted-changed-timestamp": {
+                        "type": "integer"
+                    },
+                    "identities": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "timestamp": {
+                                    "type": "integer"
+                                },
+                                "is-primary": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "value",
+                                "timestamp"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "vid",
+                    "saved-at-timestamp",
+                    "deleted-changed-timestamp",
+                    "identities"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/getAll.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/getAll.json
new file mode 100644
index 0000000000..4ed8d4f9e3
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/getAll.json
@@ -0,0 +1,308 @@
+{
+    "type": "object",
+    "properties": {
+        "vid": {
+            "type": "integer"
+        },
+        "canonical-vid": {
+            "type": "integer"
+        },
+        "merged-vids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "portal-id": {
+            "type": "integer"
+        },
+        "is-contact": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "lastmodifieddate": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "firstname": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "lastname": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                }
+            },
+            "required": [
+                "lastmodifieddate"
+            ]
+        },
+        "form-submissions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "conversion-id": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "form-id": {
+                        "type": "string"
+                    },
+                    "portal-id": {
+                        "type": "integer"
+                    },
+                    "page-url": {
+                        "type": "string"
+                    },
+                    "page-title": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "form-type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "conversion-id",
+                    "timestamp",
+                    "form-id",
+                    "portal-id",
+                    "title",
+                    "form-type",
+                    "meta-data"
+                ]
+            }
+        },
+        "identity-profiles": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "vid": {
+                        "type": "integer"
+                    },
+                    "saved-at-timestamp": {
+                        "type": "integer"
+                    },
+                    "deleted-changed-timestamp": {
+                        "type": "integer"
+                    },
+                    "identities": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "timestamp": {
+                                    "type": "integer"
+                                },
+                                "is-primary": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "value",
+                                "timestamp"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "vid",
+                    "saved-at-timestamp",
+                    "deleted-changed-timestamp",
+                    "identities"
+                ]
+            }
+        },
+        "merge-audits": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "canonical-vid": {
+                        "type": "integer"
+                    },
+                    "primary-vid-to-merge": {
+                        "type": "integer"
+                    },
+                    "vid-to-merge": {
+                        "type": "integer"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "entity-id": {
+                        "type": "string"
+                    },
+                    "user-id": {
+                        "type": "integer"
+                    },
+                    "num-properties-moved": {
+                        "type": "integer"
+                    },
+                    "merged_from_email": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "source-type": {
+                                "type": "string"
+                            },
+                            "source-id": {
+                                "type": "string"
+                            },
+                            "source-label": {
+                                "type": "null"
+                            },
+                            "source-vids": {
+                                "type": "array",
+                                "items": {
+                                    "type": "integer"
+                                }
+                            },
+                            "updated-by-user-id": {
+                                "type": "null"
+                            },
+                            "timestamp": {
+                                "type": "integer"
+                            },
+                            "selected": {
+                                "type": "boolean"
+                            },
+                            "data-sensitivity": {
+                                "type": "null"
+                            },
+                            "is-encrypted": {
+                                "type": "null"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "source-type",
+                            "source-id",
+                            "source-label",
+                            "updated-by-user-id",
+                            "timestamp",
+                            "selected",
+                            "data-sensitivity",
+                            "is-encrypted"
+                        ]
+                    },
+                    "merged_to_email": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "source-type": {
+                                "type": "string"
+                            },
+                            "source-id": {
+                                "type": "string"
+                            },
+                            "source-label": {
+                                "type": "null"
+                            },
+                            "updated-by-user-id": {
+                                "type": "null"
+                            },
+                            "timestamp": {
+                                "type": "integer"
+                            },
+                            "selected": {
+                                "type": "boolean"
+                            },
+                            "data-sensitivity": {
+                                "type": "null"
+                            },
+                            "is-encrypted": {
+                                "type": "null"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "source-type",
+                            "source-id",
+                            "source-label",
+                            "updated-by-user-id",
+                            "timestamp",
+                            "selected",
+                            "data-sensitivity",
+                            "is-encrypted"
+                        ]
+                    },
+                    "first-name": {
+                        "type": "string"
+                    },
+                    "last-name": {
+                        "type": "string"
+                    },
+                    "is-reverted": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "canonical-vid",
+                    "primary-vid-to-merge",
+                    "vid-to-merge",
+                    "timestamp",
+                    "entity-id",
+                    "user-id",
+                    "num-properties-moved",
+                    "first-name"
+                ]
+            }
+        },
+        "addedAt": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "vid",
+        "canonical-vid",
+        "merged-vids",
+        "portal-id",
+        "is-contact",
+        "properties",
+        "form-submissions",
+        "identity-profiles",
+        "merge-audits",
+        "addedAt"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/getRecentlyCreatedUpdated.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/getRecentlyCreatedUpdated.json
new file mode 100644
index 0000000000..f40c03bbd1
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/getRecentlyCreatedUpdated.json
@@ -0,0 +1,320 @@
+{
+    "type": "object",
+    "properties": {
+        "vid": {
+            "type": "integer"
+        },
+        "canonical-vid": {
+            "type": "integer"
+        },
+        "merged-vids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "portal-id": {
+            "type": "integer"
+        },
+        "is-contact": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "firstname": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "lastmodifieddate": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "createdate": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "lastname": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "company": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                }
+            },
+            "required": [
+                "lastmodifieddate",
+                "createdate"
+            ]
+        },
+        "form-submissions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "conversion-id": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "form-id": {
+                        "type": "string"
+                    },
+                    "portal-id": {
+                        "type": "integer"
+                    },
+                    "page-url": {
+                        "type": "string"
+                    },
+                    "page-title": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "form-type": {
+                        "type": "string"
+                    },
+                    "contact-associated-by": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "conversion-id",
+                    "timestamp",
+                    "form-id",
+                    "portal-id",
+                    "title",
+                    "form-type",
+                    "meta-data"
+                ]
+            }
+        },
+        "identity-profiles": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "vid": {
+                        "type": "integer"
+                    },
+                    "saved-at-timestamp": {
+                        "type": "integer"
+                    },
+                    "deleted-changed-timestamp": {
+                        "type": "integer"
+                    },
+                    "identities": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "timestamp": {
+                                    "type": "integer"
+                                },
+                                "is-primary": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "value",
+                                "timestamp"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "vid",
+                    "saved-at-timestamp",
+                    "deleted-changed-timestamp",
+                    "identities"
+                ]
+            }
+        },
+        "merge-audits": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "canonical-vid": {
+                        "type": "integer"
+                    },
+                    "primary-vid-to-merge": {
+                        "type": "integer"
+                    },
+                    "vid-to-merge": {
+                        "type": "integer"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "entity-id": {
+                        "type": "string"
+                    },
+                    "user-id": {
+                        "type": "integer"
+                    },
+                    "num-properties-moved": {
+                        "type": "integer"
+                    },
+                    "merged_to_email": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "source-type": {
+                                "type": "string"
+                            },
+                            "source-label": {
+                                "type": "null"
+                            },
+                            "timestamp": {
+                                "type": "integer"
+                            },
+                            "selected": {
+                                "type": "boolean"
+                            },
+                            "data-sensitivity": {
+                                "type": "null"
+                            },
+                            "is-encrypted": {
+                                "type": "null"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "source-type",
+                            "source-id",
+                            "source-label",
+                            "updated-by-user-id",
+                            "timestamp",
+                            "selected",
+                            "data-sensitivity",
+                            "is-encrypted"
+                        ]
+                    },
+                    "merged_from_email": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "source-type": {
+                                "type": "string"
+                            },
+                            "source-label": {
+                                "type": "null"
+                            },
+                            "timestamp": {
+                                "type": "integer"
+                            },
+                            "selected": {
+                                "type": "boolean"
+                            },
+                            "data-sensitivity": {
+                                "type": "null"
+                            },
+                            "is-encrypted": {
+                                "type": "null"
+                            },
+                            "source-vids": {
+                                "type": "array",
+                                "items": {
+                                    "type": "integer"
+                                }
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "source-type",
+                            "source-id",
+                            "source-label",
+                            "updated-by-user-id",
+                            "timestamp",
+                            "selected",
+                            "data-sensitivity",
+                            "is-encrypted"
+                        ]
+                    },
+                    "first-name": {
+                        "type": "string"
+                    },
+                    "last-name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "canonical-vid",
+                    "primary-vid-to-merge",
+                    "vid-to-merge",
+                    "timestamp",
+                    "entity-id",
+                    "num-properties-moved",
+                    "merged_to_email"
+                ]
+            }
+        },
+        "addedAt": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "vid",
+        "canonical-vid",
+        "merged-vids",
+        "portal-id",
+        "is-contact",
+        "properties",
+        "identity-profiles",
+        "merge-audits",
+        "addedAt"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/search.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/search.json
new file mode 100644
index 0000000000..ca85b2a40d
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/search.json
@@ -0,0 +1,43 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "createdate": {
+                    "type": "string"
+                },
+                "hs_object_id": {
+                    "type": "string"
+                },
+                "lastmodifieddate": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdate",
+                "hs_object_id",
+                "lastmodifieddate"
+            ]
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "properties",
+        "createdAt",
+        "updatedAt",
+        "archived"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/upsert.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/upsert.json
new file mode 100644
index 0000000000..9b07c7b8ae
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contact/upsert.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "vid": {
+            "type": "integer"
+        },
+        "isNew": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contactList/add.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contactList/add.json
new file mode 100644
index 0000000000..a19166e716
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/contactList/add.json
@@ -0,0 +1,35 @@
+{
+    "type": "object",
+    "properties": {
+        "updated": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "discarded": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "invalidVids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "invalidEmails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    },
+    "required": [
+        "updated",
+        "discarded",
+        "invalidVids",
+        "invalidEmails"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/deal/getAll.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/deal/getAll.json
new file mode 100644
index 0000000000..25248a2408
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/deal/getAll.json
@@ -0,0 +1,155 @@
+{
+    "type": "object",
+    "properties": {
+        "portalId": {
+            "type": "integer"
+        },
+        "dealId": {
+            "type": "integer"
+        },
+        "isDeleted": {
+            "type": "boolean"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "dealname": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "sourceMetadata": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "source",
+                                    "sourceVid"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                },
+                "dealstage": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "sourceMetadata": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "source",
+                                    "sourceVid"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "value",
+                        "timestamp",
+                        "source",
+                        "sourceId",
+                        "updatedByUserId",
+                        "versions"
+                    ]
+                }
+            }
+        },
+        "stateChanges": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "changeFlag": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "changeFlag",
+                    "timestamp"
+                ]
+            }
+        }
+    },
+    "required": [
+        "portalId",
+        "dealId",
+        "isDeleted",
+        "associations",
+        "properties",
+        "stateChanges"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/deal/search.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/deal/search.json
new file mode 100644
index 0000000000..af98ede29b
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/deal/search.json
@@ -0,0 +1,43 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "createdate": {
+                    "type": "string"
+                },
+                "hs_lastmodifieddate": {
+                    "type": "string"
+                },
+                "hs_object_id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdate",
+                "hs_lastmodifieddate",
+                "hs_object_id"
+            ]
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "properties",
+        "createdAt",
+        "updatedAt",
+        "archived"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/create.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/create.json
new file mode 100644
index 0000000000..41acf16ae2
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/create.json
@@ -0,0 +1,108 @@
+{
+    "type": "object",
+    "properties": {
+        "engagement": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "portalId": {
+                    "type": "integer"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "createdAt": {
+                    "type": "integer"
+                },
+                "lastUpdated": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "integer"
+                },
+                "bodyPreview": {
+                    "type": "string"
+                },
+                "bodyPreviewIsTruncated": {
+                    "type": "boolean"
+                },
+                "bodyPreviewHtml": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "portalId",
+                "active",
+                "createdAt",
+                "lastUpdated",
+                "type",
+                "timestamp",
+                "allAccessibleTeamIds",
+                "queueMembershipIds"
+            ]
+        },
+        "associations": {
+            "type": "object",
+            "properties": {
+                "contactIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "companyIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "dealIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ownerIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ticketIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "required": [
+                "contactIds",
+                "companyIds",
+                "dealIds",
+                "ownerIds",
+                "workflowIds",
+                "ticketIds",
+                "contentIds",
+                "quoteIds",
+                "marketingEventIds",
+                "partnerClientIds",
+                "orderIds",
+                "cartIds"
+            ]
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "status": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/get.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/get.json
new file mode 100644
index 0000000000..86a0cf13ff
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/get.json
@@ -0,0 +1,260 @@
+{
+    "type": "object",
+    "properties": {
+        "engagement": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "portalId": {
+                    "type": "integer"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "createdAt": {
+                    "type": "integer"
+                },
+                "lastUpdated": {
+                    "type": "integer"
+                },
+                "createdBy": {
+                    "type": "integer"
+                },
+                "modifiedBy": {
+                    "type": "integer"
+                },
+                "ownerId": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uid": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "integer"
+                },
+                "source": {
+                    "type": "string"
+                },
+                "allAccessibleTeamIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "bodyPreview": {
+                    "type": "string"
+                },
+                "queueMembershipIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "bodyPreviewIsTruncated": {
+                    "type": "boolean"
+                },
+                "bodyPreviewHtml": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "portalId",
+                "active",
+                "createdAt",
+                "lastUpdated",
+                "type",
+                "timestamp",
+                "allAccessibleTeamIds",
+                "queueMembershipIds"
+            ]
+        },
+        "associations": {
+            "type": "object",
+            "properties": {
+                "contactIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "companyIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "dealIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ownerIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ticketIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "required": [
+                "contactIds",
+                "companyIds",
+                "dealIds",
+                "ownerIds",
+                "workflowIds",
+                "ticketIds",
+                "contentIds",
+                "quoteIds",
+                "marketingEventIds",
+                "partnerClientIds",
+                "orderIds",
+                "cartIds"
+            ]
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "body": {
+                    "type": "string"
+                },
+                "to": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "raw": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            },
+                            "firstName": {
+                                "type": "string"
+                            },
+                            "lastName": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "email"
+                        ]
+                    }
+                },
+                "cc": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "raw": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            },
+                            "firstName": {
+                                "type": "string"
+                            },
+                            "lastName": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "raw",
+                            "email",
+                            "firstName",
+                            "lastName"
+                        ]
+                    }
+                },
+                "html": {
+                    "type": "string"
+                },
+                "ownerIdsFrom": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ownerIdsTo": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "status": {
+                    "type": "string"
+                },
+                "subject": {
+                    "type": "string"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "raw": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "firstName": {
+                            "type": "string"
+                        },
+                        "lastName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "email"
+                    ]
+                },
+                "sender": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "email"
+                    ]
+                },
+                "text": {
+                    "type": "string"
+                },
+                "messageId": {
+                    "type": "string"
+                },
+                "loggedFrom": {
+                    "type": "string"
+                },
+                "mediaProcessingStatus": {
+                    "type": "string"
+                },
+                "attachedVideoOpened": {
+                    "type": "boolean"
+                },
+                "attachedVideoWatched": {
+                    "type": "boolean"
+                }
+            }
+        }
+    },
+    "required": [
+        "engagement",
+        "associations",
+        "attachments",
+        "metadata"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/getAll.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/getAll.json
new file mode 100644
index 0000000000..24784b1022
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/engagement/getAll.json
@@ -0,0 +1,207 @@
+{
+    "type": "object",
+    "properties": {
+        "engagement": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "portalId": {
+                    "type": "integer"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "createdAt": {
+                    "type": "integer"
+                },
+                "lastUpdated": {
+                    "type": "integer"
+                },
+                "createdBy": {
+                    "type": "integer"
+                },
+                "modifiedBy": {
+                    "type": "integer"
+                },
+                "ownerId": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "integer"
+                },
+                "source": {
+                    "type": "string"
+                },
+                "allAccessibleTeamIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "bodyPreview": {
+                    "type": "string"
+                },
+                "queueMembershipIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "bodyPreviewIsTruncated": {
+                    "type": "boolean"
+                },
+                "bodyPreviewHtml": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "portalId",
+                "active",
+                "createdAt",
+                "lastUpdated",
+                "type",
+                "timestamp",
+                "allAccessibleTeamIds",
+                "queueMembershipIds"
+            ]
+        },
+        "associations": {
+            "type": "object",
+            "properties": {
+                "contactIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "companyIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "dealIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ownerIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "ticketIds": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "required": [
+                "contactIds",
+                "companyIds",
+                "dealIds",
+                "ownerIds",
+                "workflowIds",
+                "ticketIds",
+                "contentIds",
+                "quoteIds",
+                "marketingEventIds",
+                "partnerClientIds",
+                "orderIds",
+                "cartIds"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "body": {
+                    "type": "string"
+                },
+                "status": {
+                    "type": "string"
+                },
+                "forObjectType": {
+                    "type": "string"
+                },
+                "subject": {
+                    "type": "string"
+                },
+                "taskType": {
+                    "type": "string"
+                },
+                "sendDefaultReminder": {
+                    "type": "boolean"
+                },
+                "priority": {
+                    "type": "string"
+                },
+                "isAllDay": {
+                    "type": "boolean"
+                }
+            }
+        },
+        "scheduledTasks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "engagementId": {
+                        "type": "integer"
+                    },
+                    "portalId": {
+                        "type": "integer"
+                    },
+                    "engagementType": {
+                        "type": "string"
+                    },
+                    "taskType": {
+                        "type": "string"
+                    },
+                    "timestamp": {
+                        "type": "integer"
+                    },
+                    "uuid": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "engagementId",
+                    "portalId",
+                    "engagementType",
+                    "taskType",
+                    "timestamp",
+                    "uuid"
+                ]
+            }
+        }
+    },
+    "required": [
+        "engagement",
+        "associations",
+        "attachments",
+        "metadata"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/ticket/get.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/ticket/get.json
new file mode 100644
index 0000000000..cd43e2ea01
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/ticket/get.json
@@ -0,0 +1,335 @@
+{
+    "type": "object",
+    "properties": {
+        "portalId": {
+            "type": "integer"
+        },
+        "objectType": {
+            "type": "string"
+        },
+        "objectId": {
+            "type": "integer"
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "hs_email_subject": {
+                    "type": "object",
+                    "properties": {
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "persistenceTimestamp": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid"
+                                ]
+                            }
+                        },
+                        "value": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "isEncrypted": {
+                            "type": "null"
+                        },
+                        "sensitivityLevel": {
+                            "type": "string"
+                        },
+                        "persistenceTimestamp": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "versions",
+                        "value",
+                        "source",
+                        "timestamp",
+                        "sourceId",
+                        "updatedByUserId",
+                        "isEncrypted",
+                        "sensitivityLevel",
+                        "persistenceTimestamp"
+                    ]
+                },
+                "support_form_message": {
+                    "type": "object",
+                    "properties": {
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "sourceLabel": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "persistenceTimestamp": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "sourceLabel",
+                                    "source",
+                                    "sourceVid",
+                                    "persistenceTimestamp"
+                                ]
+                            }
+                        },
+                        "value": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "isEncrypted": {
+                            "type": "null"
+                        },
+                        "sensitivityLevel": {
+                            "type": "string"
+                        },
+                        "persistenceTimestamp": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "versions",
+                        "value",
+                        "source",
+                        "timestamp",
+                        "sourceId",
+                        "updatedByUserId",
+                        "isEncrypted",
+                        "sensitivityLevel",
+                        "persistenceTimestamp"
+                    ]
+                },
+                "support_form_subject": {
+                    "type": "object",
+                    "properties": {
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "sourceLabel": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "persistenceTimestamp": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "source",
+                                    "sourceVid"
+                                ]
+                            }
+                        },
+                        "value": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "isEncrypted": {
+                            "type": "null"
+                        },
+                        "sensitivityLevel": {
+                            "type": "string"
+                        },
+                        "persistenceTimestamp": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "versions",
+                        "value",
+                        "source",
+                        "timestamp",
+                        "sourceId",
+                        "updatedByUserId",
+                        "isEncrypted",
+                        "sensitivityLevel",
+                        "persistenceTimestamp"
+                    ]
+                },
+                "support_form_topic": {
+                    "type": "object",
+                    "properties": {
+                        "versions": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "timestamp": {
+                                        "type": "integer"
+                                    },
+                                    "sourceId": {
+                                        "type": "string"
+                                    },
+                                    "sourceLabel": {
+                                        "type": "string"
+                                    },
+                                    "source": {
+                                        "type": "string"
+                                    },
+                                    "persistenceTimestamp": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "name",
+                                    "value",
+                                    "timestamp",
+                                    "sourceId",
+                                    "sourceLabel",
+                                    "source",
+                                    "sourceVid",
+                                    "persistenceTimestamp"
+                                ]
+                            }
+                        },
+                        "value": {
+                            "type": "string"
+                        },
+                        "source": {
+                            "type": "string"
+                        },
+                        "timestamp": {
+                            "type": "integer"
+                        },
+                        "sourceId": {
+                            "type": "string"
+                        },
+                        "updatedByUserId": {
+                            "type": "null"
+                        },
+                        "isEncrypted": {
+                            "type": "null"
+                        },
+                        "sensitivityLevel": {
+                            "type": "string"
+                        },
+                        "persistenceTimestamp": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "versions",
+                        "value",
+                        "source",
+                        "timestamp",
+                        "sourceId",
+                        "updatedByUserId",
+                        "isEncrypted",
+                        "sensitivityLevel",
+                        "persistenceTimestamp"
+                    ]
+                }
+            }
+        },
+        "isDeleted": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "portalId",
+        "objectType",
+        "objectId",
+        "properties",
+        "isDeleted"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/ticket/getAll.json b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/ticket/getAll.json
new file mode 100644
index 0000000000..c0fac888ba
--- /dev/null
+++ b/packages/nodes-base/nodes/Hubspot/__schema__/v2.1.0/ticket/getAll.json
@@ -0,0 +1,24 @@
+{
+    "type": "object",
+    "properties": {
+        "portalId": {
+            "type": "integer"
+        },
+        "objectType": {
+            "type": "string"
+        },
+        "objectId": {
+            "type": "integer"
+        },
+        "isDeleted": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "portalId",
+        "objectType",
+        "objectId",
+        "properties",
+        "isDeleted"
+    ]
+}
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
index 78d8fe20dd..ce9273c03b 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
@@ -23,6 +23,7 @@ export class HumanticAi implements INodeType {
 		defaults: {
 			name: 'Humantic AI',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index c1cda5a715..feb0fb4413 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -22,6 +22,7 @@ export class Hunter implements INodeType {
 		defaults: {
 			name: 'Hunter',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
index 65a238c735..353c0f278c 100644
--- a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
+++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
@@ -43,7 +43,6 @@ describe('Execute iCalendar Node', () => {
 			},
 		},
 	];
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 26f71620c5..860b587144 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -31,6 +31,7 @@ export class Intercom implements INodeType {
 		defaults: {
 			name: 'Intercom',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index 2b771c545f..0e306a1eae 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -39,6 +39,7 @@ export class InvoiceNinja implements INodeType {
 		defaults: {
 			name: 'Invoice Ninja',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/InvoiceNinja/__schema__/v2.0.0/invoice/getAll.json b/packages/nodes-base/nodes/InvoiceNinja/__schema__/v2.0.0/invoice/getAll.json
new file mode 100644
index 0000000000..05bb71a595
--- /dev/null
+++ b/packages/nodes-base/nodes/InvoiceNinja/__schema__/v2.0.0/invoice/getAll.json
@@ -0,0 +1,410 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "user_id": {
+            "type": "string"
+        },
+        "project_id": {
+            "type": "string"
+        },
+        "assigned_user_id": {
+            "type": "string"
+        },
+        "balance": {
+            "type": "integer"
+        },
+        "client_id": {
+            "type": "string"
+        },
+        "vendor_id": {
+            "type": "string"
+        },
+        "status_id": {
+            "type": "string"
+        },
+        "design_id": {
+            "type": "string"
+        },
+        "recurring_id": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "integer"
+        },
+        "updated_at": {
+            "type": "integer"
+        },
+        "archived_at": {
+            "type": "integer"
+        },
+        "is_deleted": {
+            "type": "boolean"
+        },
+        "number": {
+            "type": "string"
+        },
+        "discount": {
+            "type": "integer"
+        },
+        "po_number": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "last_sent_date": {
+            "type": "string"
+        },
+        "next_send_date": {
+            "type": "string"
+        },
+        "due_date": {
+            "type": "string"
+        },
+        "terms": {
+            "type": "string"
+        },
+        "public_notes": {
+            "type": "string"
+        },
+        "private_notes": {
+            "type": "string"
+        },
+        "uses_inclusive_taxes": {
+            "type": "boolean"
+        },
+        "tax_name1": {
+            "type": "string"
+        },
+        "tax_name2": {
+            "type": "string"
+        },
+        "tax_rate2": {
+            "type": "integer"
+        },
+        "tax_name3": {
+            "type": "string"
+        },
+        "tax_rate3": {
+            "type": "integer"
+        },
+        "is_amount_discount": {
+            "type": "boolean"
+        },
+        "footer": {
+            "type": "string"
+        },
+        "partial": {
+            "type": "integer"
+        },
+        "partial_due_date": {
+            "type": "string"
+        },
+        "custom_value1": {
+            "type": "string"
+        },
+        "custom_value2": {
+            "type": "string"
+        },
+        "custom_value3": {
+            "type": "string"
+        },
+        "custom_value4": {
+            "type": "string"
+        },
+        "has_tasks": {
+            "type": "boolean"
+        },
+        "has_expenses": {
+            "type": "boolean"
+        },
+        "custom_surcharge1": {
+            "type": "integer"
+        },
+        "custom_surcharge2": {
+            "type": "integer"
+        },
+        "custom_surcharge3": {
+            "type": "integer"
+        },
+        "custom_surcharge4": {
+            "type": "integer"
+        },
+        "exchange_rate": {
+            "type": "integer"
+        },
+        "custom_surcharge_tax1": {
+            "type": "boolean"
+        },
+        "custom_surcharge_tax2": {
+            "type": "boolean"
+        },
+        "custom_surcharge_tax3": {
+            "type": "boolean"
+        },
+        "custom_surcharge_tax4": {
+            "type": "boolean"
+        },
+        "line_items": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "notes": {
+                        "type": "string"
+                    },
+                    "product_key": {
+                        "type": "string"
+                    },
+                    "tax_rate1": {
+                        "type": "integer"
+                    },
+                    "tax_rate2": {
+                        "type": "integer"
+                    },
+                    "tax_name1": {
+                        "type": "string"
+                    },
+                    "tax_name2": {
+                        "type": "string"
+                    },
+                    "type_id": {
+                        "type": "string"
+                    },
+                    "tax_id": {
+                        "type": "string"
+                    },
+                    "product_cost": {
+                        "type": "integer"
+                    },
+                    "discount": {
+                        "type": "integer"
+                    },
+                    "is_amount_discount": {
+                        "type": "boolean"
+                    },
+                    "tax_name3": {
+                        "type": "string"
+                    },
+                    "tax_rate3": {
+                        "type": "integer"
+                    },
+                    "sort_id": {
+                        "type": "string"
+                    },
+                    "tax_amount": {
+                        "type": "integer"
+                    },
+                    "date": {
+                        "type": "string"
+                    },
+                    "custom_value1": {
+                        "type": "string"
+                    },
+                    "custom_value2": {
+                        "type": "string"
+                    },
+                    "custom_value3": {
+                        "type": "string"
+                    },
+                    "custom_value4": {
+                        "type": "string"
+                    },
+                    "task_id": {
+                        "type": "string"
+                    },
+                    "expense_id": {
+                        "type": "string"
+                    },
+                    "unit_code": {
+                        "type": "string"
+                    },
+                    "_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "cost",
+                    "notes",
+                    "product_key",
+                    "tax_rate1",
+                    "tax_rate2",
+                    "tax_name1",
+                    "tax_name2",
+                    "quantity",
+                    "type_id",
+                    "tax_id",
+                    "product_cost",
+                    "discount",
+                    "is_amount_discount",
+                    "tax_name3",
+                    "tax_rate3",
+                    "sort_id",
+                    "line_total",
+                    "gross_line_total",
+                    "tax_amount",
+                    "date",
+                    "custom_value1",
+                    "custom_value2",
+                    "custom_value3",
+                    "custom_value4",
+                    "task_id",
+                    "expense_id"
+                ]
+            }
+        },
+        "entity_type": {
+            "type": "string"
+        },
+        "reminder1_sent": {
+            "type": "string"
+        },
+        "reminder2_sent": {
+            "type": "string"
+        },
+        "reminder3_sent": {
+            "type": "string"
+        },
+        "reminder_last_sent": {
+            "type": "string"
+        },
+        "subscription_id": {
+            "type": "string"
+        },
+        "auto_bill_enabled": {
+            "type": "boolean"
+        },
+        "invitations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "client_contact_id": {
+                        "type": "string"
+                    },
+                    "key": {
+                        "type": "string"
+                    },
+                    "link": {
+                        "type": "string"
+                    },
+                    "sent_date": {
+                        "type": "string"
+                    },
+                    "viewed_date": {
+                        "type": "string"
+                    },
+                    "opened_date": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "integer"
+                    },
+                    "archived_at": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "integer"
+                    },
+                    "email_status": {
+                        "type": "string"
+                    },
+                    "email_error": {
+                        "type": "string"
+                    },
+                    "message_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "client_contact_id",
+                    "key",
+                    "link",
+                    "sent_date",
+                    "viewed_date",
+                    "opened_date",
+                    "updated_at",
+                    "archived_at",
+                    "created_at",
+                    "email_status",
+                    "email_error",
+                    "message_id"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "user_id",
+        "project_id",
+        "assigned_user_id",
+        "amount",
+        "balance",
+        "client_id",
+        "vendor_id",
+        "status_id",
+        "design_id",
+        "recurring_id",
+        "created_at",
+        "updated_at",
+        "archived_at",
+        "is_deleted",
+        "number",
+        "discount",
+        "po_number",
+        "date",
+        "last_sent_date",
+        "next_send_date",
+        "due_date",
+        "terms",
+        "public_notes",
+        "private_notes",
+        "uses_inclusive_taxes",
+        "tax_name1",
+        "tax_rate1",
+        "tax_name2",
+        "tax_rate2",
+        "tax_name3",
+        "tax_rate3",
+        "total_taxes",
+        "is_amount_discount",
+        "footer",
+        "partial",
+        "partial_due_date",
+        "custom_value1",
+        "custom_value2",
+        "custom_value3",
+        "custom_value4",
+        "has_tasks",
+        "has_expenses",
+        "custom_surcharge1",
+        "custom_surcharge2",
+        "custom_surcharge3",
+        "custom_surcharge4",
+        "exchange_rate",
+        "custom_surcharge_tax1",
+        "custom_surcharge_tax2",
+        "custom_surcharge_tax3",
+        "custom_surcharge_tax4",
+        "line_items",
+        "entity_type",
+        "reminder1_sent",
+        "reminder2_sent",
+        "reminder3_sent",
+        "reminder_last_sent",
+        "paid_to_date",
+        "subscription_id",
+        "auto_bill_enabled",
+        "tax_info",
+        "e_invoice",
+        "invitations",
+        "documents"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
index 6580464c4a..fa39aa55cf 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
@@ -16,19 +16,15 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		operation,
 	} as ItemListsType;
 
-	try {
-		switch (itemListsNodeData.resource) {
-			case 'itemList':
-				returnData = await itemList[itemListsNodeData.operation].execute.call(this, items);
-				break;
-			default:
-				throw new NodeOperationError(
-					this.getNode(),
-					`The operation "${operation}" is not supported!`,
-				);
-		}
-	} catch (error) {
-		throw error;
+	switch (itemListsNodeData.resource) {
+		case 'itemList':
+			returnData = await itemList[itemListsNodeData.operation].execute.call(this, items);
+			break;
+		default:
+			throw new NodeOperationError(
+				this.getNode(),
+				`The operation "${operation}" is not supported!`,
+			);
 	}
 
 	return [returnData];
diff --git a/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/limit.json b/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/limit.json
new file mode 100644
index 0000000000..eb320a6b60
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/limit.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "type": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/sort.json b/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/sort.json
new file mode 100644
index 0000000000..f55ac9bafd
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/sort.json
@@ -0,0 +1,44 @@
+{
+    "type": "object",
+    "properties": {
+        "creator": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "pubDate": {
+            "type": "string"
+        },
+        "content:encoded": {
+            "type": "string"
+        },
+        "content:encodedSnippet": {
+            "type": "string"
+        },
+        "dc:creator": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        },
+        "contentSnippet": {
+            "type": "string"
+        },
+        "guid": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "isoDate": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/summarize.json b/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/summarize.json
new file mode 100644
index 0000000000..082f62d455
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/__schema__/v3.1.0/itemList/summarize.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "content": {
+            "type": "string"
+        },
+        "appended_message_content": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index 7e5d7e20d2..016ca15a8d 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -29,6 +29,7 @@ export class Iterable implements INodeType {
 		defaults: {
 			name: 'Iterable',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts b/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
index 6517cb0dd7..84418bd3ba 100644
--- a/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
+++ b/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
@@ -33,6 +33,7 @@ export class Jenkins implements INodeType {
 		defaults: {
 			name: 'Jenkins',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index b5ea100ca1..129b78ad73 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -28,6 +28,9 @@ export async function jiraSoftwareCloudApiRequest(
 	if (jiraVersion === 'server') {
 		domain = (await this.getCredentials('jiraSoftwareServerApi')).domain as string;
 		credentialType = 'jiraSoftwareServerApi';
+	} else if (jiraVersion === 'serverPat') {
+		domain = (await this.getCredentials('jiraSoftwareServerPatApi')).domain as string;
+		credentialType = 'jiraSoftwareServerPatApi';
 	} else {
 		domain = (await this.getCredentials('jiraSoftwareCloudApi')).domain as string;
 		credentialType = 'jiraSoftwareCloudApi';
@@ -233,7 +236,7 @@ export async function getUsers(this: ILoadOptionsFunctions): Promise<INodeProper
 	const query: IDataObject = { maxResults };
 	let endpoint = '/api/2/users/search';
 
-	if (jiraVersion === 'server') {
+	if (jiraVersion === 'server' || jiraVersion === 'serverPat') {
 		endpoint = '/api/2/user/search';
 		query.username = "'";
 	}
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 26770e2eae..93cfc8681b 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -67,6 +67,15 @@ export class Jira implements INodeType {
 					},
 				},
 			},
+			{
+				name: 'jiraSoftwareServerPatApi',
+				required: true,
+				displayOptions: {
+					show: {
+						jiraVersion: ['serverPat'],
+					},
+				},
+			},
 		],
 		properties: [
 			{
@@ -82,6 +91,10 @@ export class Jira implements INodeType {
 						name: 'Server (Self Hosted)',
 						value: 'server',
 					},
+					{
+						name: 'Server Pat (Self Hosted)',
+						value: 'serverPat',
+					},
 				],
 				default: 'cloud',
 			},
@@ -139,7 +152,7 @@ export class Jira implements INodeType {
 				let endpoint = '';
 				let projects;
 
-				if (jiraVersion === 'server') {
+				if (jiraVersion === 'server' || jiraVersion === 'serverPat') {
 					endpoint = '/api/2/project';
 					projects = await jiraSoftwareCloudApiRequest.call(this, endpoint, 'GET');
 				} else {
@@ -276,8 +289,12 @@ export class Jira implements INodeType {
 			async getCustomFields(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 				const returnData: INodeListSearchItems[] = [];
 				const operation = this.getCurrentNodeParameter('operation') as string;
+				const jiraVersion = this.getNodeParameter('jiraVersion', 0) as string;
+
 				let projectId: string;
 				let issueTypeId: string;
+				let issueId: string = ''; // /editmeta endpoint requires issueId
+
 				if (operation === 'create') {
 					projectId = this.getCurrentNodeParameter('project', { extractValue: true }) as string;
 					issueTypeId = this.getCurrentNodeParameter('issueType', { extractValue: true }) as string;
@@ -292,6 +309,26 @@ export class Jira implements INodeType {
 					);
 					projectId = res.fields.project.id;
 					issueTypeId = res.fields.issuetype.id;
+					issueId = res.id;
+				}
+
+				if (jiraVersion === 'server' && operation === 'update' && issueId) {
+					// https://developer.atlassian.com/server/jira/platform/jira-rest-api-example-edit-issues-6291632/?utm_source=chatgpt.com
+					const { fields } = await jiraSoftwareCloudApiRequest.call(
+						this,
+						`/api/2/issue/${issueId}/editmeta`,
+						'GET',
+					);
+
+					for (const field of Object.keys(fields || {})) {
+						if (field.startsWith('customfield_')) {
+							returnData.push({
+								name: fields[field].name,
+								value: field,
+							});
+						}
+					}
+					return { results: returnData };
 				}
 
 				const res = await jiraSoftwareCloudApiRequest.call(
@@ -478,7 +515,7 @@ export class Jira implements INodeType {
 						};
 					}
 					if (additionalFields.assignee) {
-						if (jiraVersion === 'server') {
+						if (jiraVersion === 'server' || jiraVersion === 'serverPat') {
 							fields.assignee = {
 								name: additionalFields.assignee as string,
 							};
@@ -489,7 +526,7 @@ export class Jira implements INodeType {
 						}
 					}
 					if (additionalFields.reporter) {
-						if (jiraVersion === 'server') {
+						if (jiraVersion === 'server' || jiraVersion === 'serverPat') {
 							fields.reporter = {
 								name: additionalFields.reporter as string,
 							};
@@ -608,7 +645,7 @@ export class Jira implements INodeType {
 						};
 					}
 					if (updateFields.assignee) {
-						if (jiraVersion === 'server') {
+						if (jiraVersion === 'server' || jiraVersion === 'serverPat') {
 							fields.assignee = {
 								name: updateFields.assignee as string,
 							};
@@ -619,7 +656,7 @@ export class Jira implements INodeType {
 						}
 					}
 					if (updateFields.reporter) {
-						if (jiraVersion === 'server') {
+						if (jiraVersion === 'server' || jiraVersion === 'serverPat') {
 							fields.reporter = {
 								name: updateFields.reporter as string,
 							};
@@ -1001,7 +1038,8 @@ export class Jira implements INodeType {
 			}
 		}
 		if (resource === 'issueAttachment') {
-			const apiVersion = jiraVersion === 'server' ? '2' : ('3' as string);
+			const apiVersion =
+				jiraVersion === 'server' || jiraVersion === 'serverPat' ? '2' : ('3' as string);
 
 			//https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-attachments/#api-rest-api-3-issue-issueidorkey-attachments-post
 			if (operation === 'add') {
@@ -1159,7 +1197,8 @@ export class Jira implements INodeType {
 		}
 
 		if (resource === 'issueComment') {
-			let apiVersion = jiraVersion === 'server' ? '2' : ('3' as string);
+			let apiVersion =
+				jiraVersion === 'server' || jiraVersion === 'serverPat' ? '2' : ('3' as string);
 
 			//https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-comments/#api-rest-api-3-issue-issueidorkey-comment-post
 			if (operation === 'add') {
@@ -1181,7 +1220,7 @@ export class Jira implements INodeType {
 					Object.assign(body, options);
 					if (!jsonParameters) {
 						const comment = this.getNodeParameter('comment', i) as string;
-						if (jiraVersion === 'server' || options.wikiMarkup) {
+						if (jiraVersion === 'server' || jiraVersion === 'serverPat' || options.wikiMarkup) {
 							Object.assign(body, { body: comment });
 						} else {
 							Object.assign(body, {
@@ -1332,7 +1371,7 @@ export class Jira implements INodeType {
 					Object.assign(qs, options);
 					if (!jsonParameters) {
 						const comment = this.getNodeParameter('comment', i) as string;
-						if (jiraVersion === 'server' || options.wikiMarkup) {
+						if (jiraVersion === 'server' || jiraVersion === 'serverPat' || options.wikiMarkup) {
 							Object.assign(body, { body: comment });
 						} else {
 							Object.assign(body, {
@@ -1383,7 +1422,8 @@ export class Jira implements INodeType {
 		}
 
 		if (resource === 'user') {
-			const apiVersion = jiraVersion === 'server' ? '2' : ('3' as string);
+			const apiVersion =
+				jiraVersion === 'server' || jiraVersion === 'serverPat' ? '2' : ('3' as string);
 
 			if (operation === 'create') {
 				// https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-users/#api-rest-api-3-user-post
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index aa39a0da82..c812383210 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -45,6 +45,16 @@ export class JiraTrigger implements INodeType {
 					},
 				},
 			},
+			{
+				displayName: 'Credentials to Connect to Jira',
+				name: 'jiraSoftwareServerPatApi',
+				required: true,
+				displayOptions: {
+					show: {
+						jiraVersion: ['serverPat'],
+					},
+				},
+			},
 			{
 				// eslint-disable-next-line n8n-nodes-base/node-class-description-credentials-name-unsuffixed
 				name: 'httpQueryAuth',
@@ -87,6 +97,10 @@ export class JiraTrigger implements INodeType {
 						name: 'Server (Self Hosted)',
 						value: 'server',
 					},
+					{
+						name: 'Server (Pat) (Self Hosted)',
+						value: 'serverPat',
+					},
 				],
 				default: 'cloud',
 			},
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/changelog.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/changelog.json
new file mode 100644
index 0000000000..203c0f31dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/changelog.json
@@ -0,0 +1,99 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "accountId",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone",
+                "accountType"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "items": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "field": {
+                        "type": "string"
+                    },
+                    "fieldtype": {
+                        "type": "string"
+                    },
+                    "fieldId": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "field",
+                    "fieldtype",
+                    "from",
+                    "fromString",
+                    "to"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "author",
+        "created",
+        "items"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/create.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/create.json
new file mode 100644
index 0000000000..a96cb45eeb
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/create.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "key": {
+            "type": "string"
+        },
+        "self": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "key",
+        "self"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/get.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/get.json
new file mode 100644
index 0000000000..e73ef50e8f
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/get.json
@@ -0,0 +1,258 @@
+{
+    "type": "object",
+    "properties": {
+        "expand": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "self": {
+            "type": "string"
+        },
+        "key": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "object",
+            "properties": {
+                "status": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        },
+                        "iconUrl": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "statusCategory": {
+                            "type": "object",
+                            "properties": {
+                                "self": {
+                                    "type": "string"
+                                },
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "colorName": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "self",
+                                "id",
+                                "key",
+                                "colorName",
+                                "name"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "description",
+                        "iconUrl",
+                        "name",
+                        "id",
+                        "statusCategory"
+                    ]
+                },
+                "summary": {
+                    "type": "string"
+                },
+                "worklog": {
+                    "type": "object",
+                    "properties": {
+                        "startAt": {
+                            "type": "integer"
+                        },
+                        "maxResults": {
+                            "type": "integer"
+                        },
+                        "total": {
+                            "type": "integer"
+                        },
+                        "worklogs": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "self": {
+                                        "type": "string"
+                                    },
+                                    "author": {
+                                        "type": "object",
+                                        "properties": {
+                                            "self": {
+                                                "type": "string"
+                                            },
+                                            "accountId": {
+                                                "type": "string"
+                                            },
+                                            "avatarUrls": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "48x48": {
+                                                        "type": "string"
+                                                    },
+                                                    "24x24": {
+                                                        "type": "string"
+                                                    },
+                                                    "16x16": {
+                                                        "type": "string"
+                                                    },
+                                                    "32x32": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "48x48",
+                                                    "24x24",
+                                                    "16x16",
+                                                    "32x32"
+                                                ]
+                                            },
+                                            "displayName": {
+                                                "type": "string"
+                                            },
+                                            "active": {
+                                                "type": "boolean"
+                                            },
+                                            "timeZone": {
+                                                "type": "string"
+                                            },
+                                            "accountType": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "self",
+                                            "accountId",
+                                            "avatarUrls",
+                                            "displayName",
+                                            "active",
+                                            "timeZone",
+                                            "accountType"
+                                        ]
+                                    },
+                                    "updateAuthor": {
+                                        "type": "object",
+                                        "properties": {
+                                            "self": {
+                                                "type": "string"
+                                            },
+                                            "accountId": {
+                                                "type": "string"
+                                            },
+                                            "avatarUrls": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "48x48": {
+                                                        "type": "string"
+                                                    },
+                                                    "24x24": {
+                                                        "type": "string"
+                                                    },
+                                                    "16x16": {
+                                                        "type": "string"
+                                                    },
+                                                    "32x32": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "48x48",
+                                                    "24x24",
+                                                    "16x16",
+                                                    "32x32"
+                                                ]
+                                            },
+                                            "displayName": {
+                                                "type": "string"
+                                            },
+                                            "active": {
+                                                "type": "boolean"
+                                            },
+                                            "timeZone": {
+                                                "type": "string"
+                                            },
+                                            "accountType": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "self",
+                                            "accountId",
+                                            "avatarUrls",
+                                            "displayName",
+                                            "active",
+                                            "timeZone",
+                                            "accountType"
+                                        ]
+                                    },
+                                    "comment": {
+                                        "type": "string"
+                                    },
+                                    "created": {
+                                        "type": "string"
+                                    },
+                                    "updated": {
+                                        "type": "string"
+                                    },
+                                    "started": {
+                                        "type": "string"
+                                    },
+                                    "timeSpent": {
+                                        "type": "string"
+                                    },
+                                    "timeSpentSeconds": {
+                                        "type": "integer"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "issueId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "self",
+                                    "author",
+                                    "updateAuthor",
+                                    "comment",
+                                    "created",
+                                    "updated",
+                                    "started",
+                                    "timeSpent",
+                                    "timeSpentSeconds",
+                                    "id",
+                                    "issueId"
+                                ]
+                            }
+                        }
+                    },
+                    "required": [
+                        "startAt",
+                        "maxResults",
+                        "total",
+                        "worklogs"
+                    ]
+                }
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/getAll.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/getAll.json
new file mode 100644
index 0000000000..b77f3a5e12
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/getAll.json
@@ -0,0 +1,189 @@
+{
+    "type": "object",
+    "properties": {
+        "expand": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "self": {
+            "type": "string"
+        },
+        "key": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "object",
+            "properties": {
+                "priority": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "iconUrl": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "iconUrl",
+                        "name",
+                        "id"
+                    ]
+                },
+                "status": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "description": {
+                            "type": "string"
+                        },
+                        "iconUrl": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "statusCategory": {
+                            "type": "object",
+                            "properties": {
+                                "self": {
+                                    "type": "string"
+                                },
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "colorName": {
+                                    "type": "string"
+                                },
+                                "name": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "self",
+                                "id",
+                                "key",
+                                "colorName",
+                                "name"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "description",
+                        "iconUrl",
+                        "name",
+                        "id",
+                        "statusCategory"
+                    ]
+                },
+                "components": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "self": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "self",
+                            "id",
+                            "name"
+                        ]
+                    }
+                },
+                "summary": {
+                    "type": "string"
+                },
+                "reporter": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "accountId": {
+                            "type": "string"
+                        },
+                        "emailAddress": {
+                            "type": "string"
+                        },
+                        "avatarUrls": {
+                            "type": "object",
+                            "properties": {
+                                "48x48": {
+                                    "type": "string"
+                                },
+                                "24x24": {
+                                    "type": "string"
+                                },
+                                "16x16": {
+                                    "type": "string"
+                                },
+                                "32x32": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "48x48",
+                                "24x24",
+                                "16x16",
+                                "32x32"
+                            ]
+                        },
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "active": {
+                            "type": "boolean"
+                        },
+                        "timeZone": {
+                            "type": "string"
+                        },
+                        "accountType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "accountId",
+                        "avatarUrls",
+                        "displayName",
+                        "active",
+                        "timeZone",
+                        "accountType"
+                    ]
+                }
+            }
+        }
+    },
+    "required": [
+        "expand",
+        "id",
+        "self",
+        "key"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/transitions.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/transitions.json
new file mode 100644
index 0000000000..c49a20171c
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/transitions.json
@@ -0,0 +1,95 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "to": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "description": {
+                    "type": "string"
+                },
+                "iconUrl": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "statusCategory": {
+                    "type": "object",
+                    "properties": {
+                        "self": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "integer"
+                        },
+                        "key": {
+                            "type": "string"
+                        },
+                        "colorName": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "self",
+                        "id",
+                        "key",
+                        "colorName",
+                        "name"
+                    ]
+                }
+            },
+            "required": [
+                "self",
+                "description",
+                "iconUrl",
+                "name",
+                "id",
+                "statusCategory"
+            ]
+        },
+        "hasScreen": {
+            "type": "boolean"
+        },
+        "isGlobal": {
+            "type": "boolean"
+        },
+        "isInitial": {
+            "type": "boolean"
+        },
+        "isAvailable": {
+            "type": "boolean"
+        },
+        "isConditional": {
+            "type": "boolean"
+        },
+        "isLooped": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "to",
+        "hasScreen",
+        "isGlobal",
+        "isInitial",
+        "isAvailable",
+        "isConditional",
+        "isLooped"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/update.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/update.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issue/update.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/add.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/add.json
new file mode 100644
index 0000000000..0cf85c5ec3
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/add.json
@@ -0,0 +1,93 @@
+{
+    "type": "object",
+    "properties": {
+        "self": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "filename": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "emailAddress",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "mimeType": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "self",
+        "id",
+        "filename",
+        "author",
+        "created",
+        "size",
+        "mimeType",
+        "content"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/get.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/get.json
new file mode 100644
index 0000000000..b5f43eaca3
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/get.json
@@ -0,0 +1,84 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "self": {
+            "type": "string"
+        },
+        "filename": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "self",
+                "accountId",
+                "avatarUrls",
+                "displayName",
+                "active"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "mimeType": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "self",
+        "filename",
+        "author",
+        "created",
+        "size",
+        "mimeType",
+        "properties",
+        "content"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/getAll.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/getAll.json
new file mode 100644
index 0000000000..d3d0feb9b2
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueAttachment/getAll.json
@@ -0,0 +1,96 @@
+{
+    "type": "object",
+    "properties": {
+        "self": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "filename": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "emailAddress",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "mimeType": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        },
+        "thumbnail": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "self",
+        "id",
+        "filename",
+        "author",
+        "created",
+        "size",
+        "mimeType",
+        "content"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueComment/add.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueComment/add.json
new file mode 100644
index 0000000000..ffca0c0764
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueComment/add.json
@@ -0,0 +1,191 @@
+{
+    "type": "object",
+    "properties": {
+        "self": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "emailAddress",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "version": {
+                    "type": "integer"
+                },
+                "content": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "content": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "text": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "type"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "content"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "type",
+                "version",
+                "content"
+            ]
+        },
+        "updateAuthor": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "emailAddress",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "jsdPublic": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "self",
+        "id",
+        "author",
+        "body",
+        "updateAuthor",
+        "created",
+        "updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueComment/getAll.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueComment/getAll.json
new file mode 100644
index 0000000000..d27933b223
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/issueComment/getAll.json
@@ -0,0 +1,194 @@
+{
+    "type": "object",
+    "properties": {
+        "self": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "accountId",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone",
+                "accountType"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "version": {
+                    "type": "integer"
+                },
+                "content": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "content": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "text": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "type"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "content"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "type",
+                "version",
+                "content"
+            ]
+        },
+        "updateAuthor": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "string"
+                },
+                "accountId": {
+                    "type": "string"
+                },
+                "emailAddress": {
+                    "type": "string"
+                },
+                "avatarUrls": {
+                    "type": "object",
+                    "properties": {
+                        "48x48": {
+                            "type": "string"
+                        },
+                        "24x24": {
+                            "type": "string"
+                        },
+                        "16x16": {
+                            "type": "string"
+                        },
+                        "32x32": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "48x48",
+                        "24x24",
+                        "16x16",
+                        "32x32"
+                    ]
+                },
+                "displayName": {
+                    "type": "string"
+                },
+                "active": {
+                    "type": "boolean"
+                },
+                "timeZone": {
+                    "type": "string"
+                },
+                "accountType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "self",
+                "accountId",
+                "avatarUrls",
+                "displayName",
+                "active",
+                "timeZone",
+                "accountType"
+            ]
+        },
+        "created": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "string"
+        },
+        "jsdPublic": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "self",
+        "id",
+        "author",
+        "body",
+        "updateAuthor",
+        "created",
+        "updated",
+        "jsdPublic"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/user/get.json b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/user/get.json
new file mode 100644
index 0000000000..384a0f6f78
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/__schema__/v1.0.0/user/get.json
@@ -0,0 +1,132 @@
+{
+    "type": "object",
+    "properties": {
+        "self": {
+            "type": "string"
+        },
+        "accountId": {
+            "type": "string"
+        },
+        "accountType": {
+            "type": "string"
+        },
+        "avatarUrls": {
+            "type": "object",
+            "properties": {
+                "48x48": {
+                    "type": "string"
+                },
+                "24x24": {
+                    "type": "string"
+                },
+                "16x16": {
+                    "type": "string"
+                },
+                "32x32": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "48x48",
+                "24x24",
+                "16x16",
+                "32x32"
+            ]
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "timeZone": {
+            "type": "string"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "groups": {
+            "type": "object",
+            "properties": {
+                "size": {
+                    "type": "integer"
+                },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "groupId": {
+                                "type": "string"
+                            },
+                            "self": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "groupId",
+                            "self"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "size",
+                "items"
+            ]
+        },
+        "applicationRoles": {
+            "type": "object",
+            "properties": {
+                "size": {
+                    "type": "integer"
+                },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "key": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "key",
+                            "name"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "size",
+                "items"
+            ]
+        },
+        "expand": {
+            "type": "string"
+        },
+        "emailAddress": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "self",
+        "accountId",
+        "accountType",
+        "avatarUrls",
+        "displayName",
+        "active",
+        "timeZone",
+        "locale",
+        "groups",
+        "applicationRoles",
+        "expand"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Jira/test/node.methods.test.ts b/packages/nodes-base/nodes/Jira/test/node.methods.test.ts
new file mode 100644
index 0000000000..973ec9556d
--- /dev/null
+++ b/packages/nodes-base/nodes/Jira/test/node.methods.test.ts
@@ -0,0 +1,126 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { IHttpRequestMethods, ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { Jira } from '../Jira.node';
+
+const ISSUE_KEY = 'KEY-1';
+
+jest.mock('../GenericFunctions', () => {
+	const originalModule = jest.requireActual('../GenericFunctions');
+	return {
+		...originalModule,
+		jiraSoftwareCloudApiRequest: jest.fn(async function (
+			endpoint: string,
+			method: IHttpRequestMethods,
+		) {
+			if (method === 'GET' && endpoint === `/api/2/issue/${ISSUE_KEY}`) {
+				return {
+					id: 10000,
+					fields: {
+						project: {
+							id: 10001,
+						},
+						issuetype: {
+							id: 10002,
+						},
+					},
+				};
+			} else if (method === 'GET' && endpoint === '/api/2/issue/10000/editmeta') {
+				return {
+					fields: {
+						customfield_123: {
+							name: 'Field 123',
+						},
+						customfield_456: {
+							name: 'Field 456',
+						},
+					},
+				};
+			} else if (
+				method === 'GET' &&
+				endpoint ===
+					'/api/2/issue/createmeta?projectIds=10001&issueTypeIds=10002&expand=projects.issuetypes.fields'
+			) {
+				return {
+					projects: [
+						{
+							id: 10001,
+							issuetypes: [
+								{
+									id: 10002,
+									fields: {
+										customfield_abc: {
+											name: 'Field ABC',
+											schema: { customId: 'customfield_abc' },
+											fieldId: 'customfield_abc',
+										},
+										customfield_def: {
+											name: 'Field DEF',
+											schema: { customId: 'customfield_def' },
+											fieldId: 'customfield_def',
+										},
+									},
+								},
+							],
+						},
+					],
+				};
+			}
+		}),
+	};
+});
+
+describe('Jira Node, methods', () => {
+	let jira: Jira;
+	let loadOptionsFunctions: MockProxy<ILoadOptionsFunctions>;
+
+	beforeEach(() => {
+		jira = new Jira();
+		loadOptionsFunctions = mock<ILoadOptionsFunctions>();
+	});
+
+	describe('listSearch.getCustomFields', () => {
+		it('should call correct endpoint and return custom fields for server version', async () => {
+			loadOptionsFunctions.getCurrentNodeParameter.mockReturnValueOnce('update');
+			loadOptionsFunctions.getNodeParameter.mockReturnValue('server');
+			loadOptionsFunctions.getCurrentNodeParameter.mockReturnValueOnce(ISSUE_KEY);
+
+			const { results } = await jira.methods.listSearch.getCustomFields.call(
+				loadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(results).toEqual([
+				{
+					name: 'Field 123',
+					value: 'customfield_123',
+				},
+				{
+					name: 'Field 456',
+					value: 'customfield_456',
+				},
+			]);
+		});
+
+		it('should call correct endpoint and return custom fields for cloud version', async () => {
+			loadOptionsFunctions.getCurrentNodeParameter.mockReturnValueOnce('update');
+			loadOptionsFunctions.getNodeParameter.mockReturnValue('cloud');
+			loadOptionsFunctions.getCurrentNodeParameter.mockReturnValueOnce(ISSUE_KEY);
+
+			const { results } = await jira.methods.listSearch.getCustomFields.call(
+				loadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(results).toEqual([
+				{
+					name: 'Field ABC',
+					value: 'customfield_abc',
+				},
+				{
+					name: 'Field DEF',
+					value: 'customfield_def',
+				},
+			]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Jwt/Jwt.node.ts b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
index 1018f97bf8..672fff2178 100644
--- a/packages/nodes-base/nodes/Jwt/Jwt.node.ts
+++ b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
@@ -52,6 +52,7 @@ export class Jwt implements INodeType {
 		defaults: {
 			name: 'JWT',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 0306fae772..bf59a5fb22 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -14,8 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../utils/utilities';
-
 export class Kafka implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Kafka',
@@ -27,6 +25,7 @@ export class Kafka implements INodeType {
 		defaults: {
 			name: 'Kafka',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -259,7 +258,6 @@ export class Kafka implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const itemData = generatePairedItemData(items.length);
 
 		const length = items.length;
 
@@ -399,15 +397,12 @@ export class Kafka implements INodeType {
 
 			await producer.disconnect();
 
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
-				{ itemData },
-			);
+			const executionData = this.helpers.returnJsonArray(responseData);
 
 			return [executionData];
 		} catch (error) {
 			if (this.continueOnFail()) {
-				return [[{ json: { error: error.message }, pairedItem: itemData }]];
+				return [[{ json: { error: error.message } }]];
 			} else {
 				throw error;
 			}
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 065dbec746..5b6e85799e 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -48,6 +48,7 @@ export class Keap implements INodeType {
 		defaults: {
 			name: 'Keap',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Keap/__schema__/v1.0.0/contact/get.json b/packages/nodes-base/nodes/Keap/__schema__/v1.0.0/contact/get.json
new file mode 100644
index 0000000000..adf55dbc88
--- /dev/null
+++ b/packages/nodes-base/nodes/Keap/__schema__/v1.0.0/contact/get.json
@@ -0,0 +1,143 @@
+{
+    "type": "object",
+    "properties": {
+        "tag_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "id": {
+            "type": "integer"
+        },
+        "email_opted_in": {
+            "type": "boolean"
+        },
+        "email_status": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "last_updated": {
+            "type": "string"
+        },
+        "ScoreValue": {
+            "type": "string"
+        },
+        "last_updated_utc_millis": {
+            "type": "integer"
+        },
+        "email_addresses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "email": {
+                        "type": "string"
+                    },
+                    "field": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "email",
+                    "field"
+                ]
+            }
+        },
+        "addresses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "line1": {
+                        "type": "string"
+                    },
+                    "locality": {
+                        "type": "string"
+                    },
+                    "field": {
+                        "type": "string"
+                    },
+                    "postal_code": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "line1",
+                    "line2",
+                    "locality",
+                    "region",
+                    "field",
+                    "postal_code",
+                    "zip_code",
+                    "zip_four",
+                    "country_code"
+                ]
+            }
+        },
+        "phone_numbers": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "number": {
+                        "type": "string"
+                    },
+                    "field": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "number",
+                    "extension",
+                    "field",
+                    "type"
+                ]
+            }
+        },
+        "given_name": {
+            "type": "string"
+        },
+        "family_name": {
+            "type": "string"
+        },
+        "contact_type": {
+            "type": "string"
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "content"
+                ]
+            }
+        }
+    },
+    "required": [
+        "tag_ids",
+        "id",
+        "company",
+        "email_opted_in",
+        "email_status",
+        "date_created",
+        "last_updated",
+        "ScoreValue",
+        "last_updated_utc_millis",
+        "email_addresses",
+        "addresses",
+        "phone_numbers",
+        "given_name",
+        "family_name",
+        "middle_name",
+        "owner_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
index 87f6931dbf..38aa602b74 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -45,6 +45,7 @@ export class Kitemaker implements INodeType {
 		defaults: {
 			name: 'Kitemaker',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
index d4cdb886c2..796cbee525 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
@@ -33,6 +33,7 @@ export class KoBoToolbox implements INodeType {
 		defaults: {
 			name: 'KoBoToolbox',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/KoBoToolbox/__schema__/v1.0.0/submission/getAll.json b/packages/nodes-base/nodes/KoBoToolbox/__schema__/v1.0.0/submission/getAll.json
new file mode 100644
index 0000000000..98f46759de
--- /dev/null
+++ b/packages/nodes-base/nodes/KoBoToolbox/__schema__/v1.0.0/submission/getAll.json
@@ -0,0 +1,181 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "integer"
+        },
+        "formhub/uuid": {
+            "type": "string"
+        },
+        "start": {
+            "type": "string"
+        },
+        "end": {
+            "type": "string"
+        },
+        "today": {
+            "type": "string"
+        },
+        "username": {
+            "type": "string"
+        },
+        "deviceid": {
+            "type": "string"
+        },
+        "personal_QR_code": {
+            "type": "string"
+        },
+        "infra_categ": {
+            "type": "string"
+        },
+        "location": {
+            "type": "string"
+        },
+        "gps_note": {
+            "type": "string"
+        },
+        "__version__": {
+            "type": "string"
+        },
+        "meta/instanceID": {
+            "type": "string"
+        },
+        "_xform_id_string": {
+            "type": "string"
+        },
+        "_uuid": {
+            "type": "string"
+        },
+        "_attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "download_url": {
+                        "type": "string"
+                    },
+                    "download_large_url": {
+                        "type": "string"
+                    },
+                    "download_medium_url": {
+                        "type": "string"
+                    },
+                    "download_small_url": {
+                        "type": "string"
+                    },
+                    "mimetype": {
+                        "type": "string"
+                    },
+                    "filename": {
+                        "type": "string"
+                    },
+                    "instance": {
+                        "type": "integer"
+                    },
+                    "xform": {
+                        "type": "integer"
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "question_xpath": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "download_url",
+                    "download_large_url",
+                    "download_medium_url",
+                    "download_small_url",
+                    "mimetype",
+                    "filename",
+                    "instance",
+                    "xform",
+                    "id",
+                    "question_xpath"
+                ]
+            }
+        },
+        "_status": {
+            "type": "string"
+        },
+        "_submission_time": {
+            "type": "string"
+        },
+        "_validation_status": {
+            "type": "object",
+            "properties": {
+                "timestamp": {
+                    "type": "integer"
+                },
+                "uid": {
+                    "type": "string"
+                },
+                "by_whom": {
+                    "type": "string"
+                },
+                "color": {
+                    "type": "string"
+                },
+                "label": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "timestamp",
+                "uid",
+                "by_whom",
+                "color",
+                "label"
+            ]
+        },
+        "infra_subtype": {
+            "type": "string"
+        },
+        "pic1": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "q2nd_pic": {
+            "type": "string"
+        },
+        "pic2": {
+            "type": "string"
+        },
+        "Validation_comments": {
+            "type": "string"
+        },
+        "meta/deprecatedID": {
+            "type": "string"
+        },
+        "_version_": {
+            "type": "string"
+        },
+        "_version__001": {
+            "type": "string"
+        },
+        "_version__002": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "_id",
+        "formhub/uuid",
+        "start",
+        "end",
+        "__version__",
+        "meta/instanceID",
+        "_xform_id_string",
+        "_uuid",
+        "_attachments",
+        "_status",
+        "_geolocation",
+        "_submission_time",
+        "_tags",
+        "_notes",
+        "_validation_status",
+        "_submitted_by"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.ts b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
index 6c24606a67..0274956a27 100644
--- a/packages/nodes-base/nodes/Ldap/Ldap.node.ts
+++ b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
@@ -28,6 +28,7 @@ export class Ldap implements INodeType {
 		defaults: {
 			name: 'LDAP',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Lemlist/__schema__/v2.0.0/activity/getAll.json b/packages/nodes-base/nodes/Lemlist/__schema__/v2.0.0/activity/getAll.json
new file mode 100644
index 0000000000..418377a5f4
--- /dev/null
+++ b/packages/nodes-base/nodes/Lemlist/__schema__/v2.0.0/activity/getAll.json
@@ -0,0 +1,137 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "isFirst": {
+            "type": "boolean"
+        },
+        "stopped": {
+            "type": "boolean"
+        },
+        "bot": {
+            "type": "boolean"
+        },
+        "teamId": {
+            "type": "string"
+        },
+        "leadId": {
+            "type": "string"
+        },
+        "campaignId": {
+            "type": "string"
+        },
+        "sequenceId": {
+            "type": "string"
+        },
+        "sequenceStep": {
+            "type": "integer"
+        },
+        "emailTemplateId": {
+            "type": "string"
+        },
+        "createdBy": {
+            "type": "string"
+        },
+        "totalSequenceStep": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "sendUserName": {
+            "type": "string"
+        },
+        "leadFirstName": {
+            "type": "string"
+        },
+        "leadLastName": {
+            "type": "string"
+        },
+        "leadEmail": {
+            "type": "string"
+        },
+        "leadCompanyName": {
+            "type": "string"
+        },
+        "contactId": {
+            "type": "string"
+        },
+        "metaData": {
+            "type": "object",
+            "properties": {
+                "teamId": {
+                    "type": "string"
+                },
+                "campaignId": {
+                    "type": "string"
+                },
+                "leadId": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "createdBy": {
+                    "type": "string"
+                },
+                "taskId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "teamId",
+                "campaignId",
+                "leadId",
+                "type",
+                "createdBy"
+            ]
+        },
+        "firstName": {
+            "type": "string"
+        },
+        "lastName": {
+            "type": "string"
+        },
+        "linkedinUrl": {
+            "type": "string"
+        },
+        "companyName": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "campaignName": {
+            "type": "string"
+        },
+        "sequenceTested": {
+            "type": "string"
+        },
+        "emailTemplateName": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "_id",
+        "type",
+        "createdAt",
+        "bot",
+        "teamId",
+        "leadId",
+        "campaignId",
+        "createdBy",
+        "sendUserId",
+        "name",
+        "contactId",
+        "metaData",
+        "campaignName"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Lemlist/__schema__/v2.0.0/enrich/enrichPerson.json b/packages/nodes-base/nodes/Lemlist/__schema__/v2.0.0/enrich/enrichPerson.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/Lemlist/__schema__/v2.0.0/enrich/enrichPerson.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts b/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
index 7ccab5c90a..601f3755b9 100644
--- a/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
@@ -37,6 +37,7 @@ const versionDescription: INodeTypeDescription = {
 	defaults: {
 		name: 'Lemlist',
 	},
+	usableAsTool: true,
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
 	credentials: [
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index 15f4f4f36f..467e9cd717 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -23,6 +23,7 @@ export class Line implements INodeType {
 		defaults: {
 			name: 'Line',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Line/__schema__/v1.0.0/notification/send.json b/packages/nodes-base/nodes/Line/__schema__/v1.0.0/notification/send.json
new file mode 100644
index 0000000000..78dcef4cd1
--- /dev/null
+++ b/packages/nodes-base/nodes/Line/__schema__/v1.0.0/notification/send.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "status": {
+            "type": "integer"
+        },
+        "message": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "status",
+        "message"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index 23a8b9bd42..89afdabf6f 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -38,6 +38,7 @@ export class Linear implements INodeType {
 		defaults: {
 			name: 'Linear',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/create.json b/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/create.json
new file mode 100644
index 0000000000..509a8d3f9a
--- /dev/null
+++ b/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/create.json
@@ -0,0 +1,73 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "identifier": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "archivedAt": {
+            "type": "null"
+        },
+        "state": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "displayName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "displayName"
+            ]
+        },
+        "dueDate": {
+            "type": "null"
+        },
+        "cycle": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "identifier",
+        "title",
+        "priority",
+        "archivedAt",
+        "assignee",
+        "state",
+        "createdAt",
+        "creator",
+        "description",
+        "dueDate",
+        "cycle"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/get.json b/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/get.json
new file mode 100644
index 0000000000..1b822a2183
--- /dev/null
+++ b/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/get.json
@@ -0,0 +1,67 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "identifier": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "archivedAt": {
+            "type": "null"
+        },
+        "state": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "displayName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "displayName"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "identifier",
+        "title",
+        "priority",
+        "archivedAt",
+        "assignee",
+        "state",
+        "createdAt",
+        "creator",
+        "description",
+        "dueDate",
+        "cycle"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/getAll.json b/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/getAll.json
new file mode 100644
index 0000000000..0d66f3fc07
--- /dev/null
+++ b/packages/nodes-base/nodes/Linear/__schema__/v1.0.0/issue/getAll.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "identifier": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "archivedAt": {
+            "type": "null"
+        },
+        "state": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "createdAt": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "title",
+        "priority",
+        "archivedAt",
+        "assignee",
+        "state",
+        "createdAt",
+        "creator",
+        "description",
+        "dueDate",
+        "cycle"
+    ]
+}
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
index db82cec6f0..f3c30883a1 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
@@ -24,6 +24,7 @@ export class LingvaNex implements INodeType {
 		defaults: {
 			name: 'LingvaNex',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 44e8bb0585..89b2ec92e6 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -24,6 +24,7 @@ export class LinkedIn implements INodeType {
 		defaults: {
 			name: 'LinkedIn',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/LinkedIn/__schema__/v1.0.0/post/create.json b/packages/nodes-base/nodes/LinkedIn/__schema__/v1.0.0/post/create.json
new file mode 100644
index 0000000000..5930544d5f
--- /dev/null
+++ b/packages/nodes-base/nodes/LinkedIn/__schema__/v1.0.0/post/create.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "urn": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts b/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts
index acce979a97..0072df7608 100644
--- a/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts
+++ b/packages/nodes-base/nodes/LoneScale/LoneScale.node.ts
@@ -23,6 +23,7 @@ export class LoneScale implements INodeType {
 		defaults: {
 			name: 'LoneScale',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
index 0ddc4ff924..0ad5524fb4 100644
--- a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
@@ -26,6 +26,7 @@ export class Mqtt implements INodeType {
 		defaults: {
 			name: 'MQTT',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts
index ce473b16a8..188f206db7 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.ts
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts
@@ -45,6 +45,7 @@ export class Magento2 implements INodeType {
 		defaults: {
 			name: 'Magento 2',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
index 2c5562dbc4..df32041adc 100644
--- a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
@@ -21,6 +21,7 @@ export class Mailcheck implements INodeType {
 		defaults: {
 			name: 'Mailcheck',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index 890ca72360..1079869327 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -59,6 +59,7 @@ export class Mailchimp implements INodeType {
 		defaults: {
 			name: 'Mailchimp',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index b97c9dd37f..c388e3ef8b 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -214,7 +214,6 @@ export class MailchimpTrigger implements INodeType {
 			},
 
 			async create(this: IHookFunctions): Promise<boolean> {
-				let webhook;
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const listId = this.getNodeParameter('list') as string;
 				const events = this.getNodeParameter('events', []) as string[];
@@ -233,11 +232,7 @@ export class MailchimpTrigger implements INodeType {
 					}, {}),
 				};
 				const endpoint = `/lists/${listId}/webhooks`;
-				try {
-					webhook = await mailchimpApiRequest.call(this, endpoint, 'POST', body);
-				} catch (error) {
-					throw error;
-				}
+				const webhook = await mailchimpApiRequest.call(this, endpoint, 'POST', body);
 				if (webhook.id === undefined) {
 					return false;
 				}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/campaign/getAll.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/campaign/getAll.json
new file mode 100644
index 0000000000..87a0ccb339
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/campaign/getAll.json
@@ -0,0 +1,69 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "from_name": {
+                    "type": "string"
+                },
+                "reply_to": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "title"
+            ]
+        },
+        "tracking": {
+            "type": "object",
+            "properties": {
+                "opens": {
+                    "type": "boolean"
+                },
+                "html_clicks": {
+                    "type": "boolean"
+                },
+                "text_clicks": {
+                    "type": "boolean"
+                },
+                "goal_tracking": {
+                    "type": "boolean"
+                },
+                "ecomm360": {
+                    "type": "boolean"
+                },
+                "google_analytics": {
+                    "type": "string"
+                },
+                "clicktale": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "opens",
+                "html_clicks",
+                "text_clicks",
+                "goal_tracking",
+                "ecomm360",
+                "google_analytics",
+                "clicktale"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "status",
+        "settings",
+        "tracking"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/create.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/create.json
new file mode 100644
index 0000000000..e48950811e
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/create.json
@@ -0,0 +1,163 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "email_address": {
+            "type": "string"
+        },
+        "unique_email_id": {
+            "type": "string"
+        },
+        "contact_id": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "web_id": {
+            "type": "integer"
+        },
+        "email_type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "consents_to_one_to_one_messaging": {
+            "type": "boolean"
+        },
+        "sms_phone_number": {
+            "type": "string"
+        },
+        "sms_subscription_status": {
+            "type": "string"
+        },
+        "sms_subscription_last_updated": {
+            "type": "string"
+        },
+        "merge_fields": {
+            "type": "object",
+            "properties": {
+                "FNAME": {
+                    "type": "string"
+                },
+                "LNAME": {
+                    "type": "string"
+                }
+            }
+        },
+        "ip_signup": {
+            "type": "string"
+        },
+        "timestamp_signup": {
+            "type": "string"
+        },
+        "ip_opt": {
+            "type": "string"
+        },
+        "timestamp_opt": {
+            "type": "string"
+        },
+        "member_rating": {
+            "type": "integer"
+        },
+        "last_changed": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        },
+        "vip": {
+            "type": "boolean"
+        },
+        "email_client": {
+            "type": "string"
+        },
+        "location": {
+            "type": "object",
+            "properties": {
+                "gmtoff": {
+                    "type": "integer"
+                },
+                "dstoff": {
+                    "type": "integer"
+                },
+                "country_code": {
+                    "type": "string"
+                },
+                "timezone": {
+                    "type": "string"
+                },
+                "region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "latitude",
+                "longitude",
+                "gmtoff",
+                "dstoff",
+                "country_code",
+                "timezone",
+                "region"
+            ]
+        },
+        "source": {
+            "type": "string"
+        },
+        "tags_count": {
+            "type": "integer"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "list_id": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "rel": {
+                        "type": "string"
+                    },
+                    "href": {
+                        "type": "string"
+                    },
+                    "method": {
+                        "type": "string"
+                    },
+                    "targetSchema": {
+                        "type": "string"
+                    },
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "rel",
+                    "href",
+                    "method"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/delete.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/delete.json
new file mode 100644
index 0000000000..1b6930d5a6
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "error": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/get.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/get.json
new file mode 100644
index 0000000000..5b3f592bbb
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/get.json
@@ -0,0 +1,169 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "email_address": {
+            "type": "string"
+        },
+        "unique_email_id": {
+            "type": "string"
+        },
+        "contact_id": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "web_id": {
+            "type": "integer"
+        },
+        "email_type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "consents_to_one_to_one_messaging": {
+            "type": "boolean"
+        },
+        "sms_phone_number": {
+            "type": "string"
+        },
+        "sms_subscription_status": {
+            "type": "string"
+        },
+        "sms_subscription_last_updated": {
+            "type": "string"
+        },
+        "merge_fields": {
+            "type": "object",
+            "properties": {
+                "FNAME": {
+                    "type": "string"
+                },
+                "LNAME": {
+                    "type": "string"
+                },
+                "PHONE": {
+                    "type": "string"
+                },
+                "BIRTHDAY": {
+                    "type": "string"
+                }
+            }
+        },
+        "ip_signup": {
+            "type": "string"
+        },
+        "timestamp_signup": {
+            "type": "string"
+        },
+        "ip_opt": {
+            "type": "string"
+        },
+        "timestamp_opt": {
+            "type": "string"
+        },
+        "member_rating": {
+            "type": "integer"
+        },
+        "last_changed": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        },
+        "vip": {
+            "type": "boolean"
+        },
+        "email_client": {
+            "type": "string"
+        },
+        "location": {
+            "type": "object",
+            "properties": {
+                "gmtoff": {
+                    "type": "integer"
+                },
+                "dstoff": {
+                    "type": "integer"
+                },
+                "country_code": {
+                    "type": "string"
+                },
+                "timezone": {
+                    "type": "string"
+                },
+                "region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "latitude",
+                "longitude",
+                "gmtoff",
+                "dstoff",
+                "country_code",
+                "timezone",
+                "region"
+            ]
+        },
+        "source": {
+            "type": "string"
+        },
+        "tags_count": {
+            "type": "integer"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "list_id": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "rel": {
+                        "type": "string"
+                    },
+                    "href": {
+                        "type": "string"
+                    },
+                    "method": {
+                        "type": "string"
+                    },
+                    "targetSchema": {
+                        "type": "string"
+                    },
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "rel",
+                    "href",
+                    "method"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/getAll.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/getAll.json
new file mode 100644
index 0000000000..c3373fa5ae
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/getAll.json
@@ -0,0 +1,198 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "email_address": {
+            "type": "string"
+        },
+        "unique_email_id": {
+            "type": "string"
+        },
+        "contact_id": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "web_id": {
+            "type": "integer"
+        },
+        "email_type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "consents_to_one_to_one_messaging": {
+            "type": "boolean"
+        },
+        "sms_phone_number": {
+            "type": "string"
+        },
+        "sms_subscription_status": {
+            "type": "string"
+        },
+        "sms_subscription_last_updated": {
+            "type": "string"
+        },
+        "merge_fields": {
+            "type": "object",
+            "properties": {
+                "FNAME": {
+                    "type": "string"
+                },
+                "LNAME": {
+                    "type": "string"
+                },
+                "PHONE": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FNAME",
+                "LNAME"
+            ]
+        },
+        "ip_signup": {
+            "type": "string"
+        },
+        "timestamp_signup": {
+            "type": "string"
+        },
+        "ip_opt": {
+            "type": "string"
+        },
+        "timestamp_opt": {
+            "type": "string"
+        },
+        "member_rating": {
+            "type": "integer"
+        },
+        "last_changed": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        },
+        "vip": {
+            "type": "boolean"
+        },
+        "email_client": {
+            "type": "string"
+        },
+        "location": {
+            "type": "object",
+            "properties": {
+                "gmtoff": {
+                    "type": "integer"
+                },
+                "dstoff": {
+                    "type": "integer"
+                },
+                "country_code": {
+                    "type": "string"
+                },
+                "timezone": {
+                    "type": "string"
+                },
+                "region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "latitude",
+                "longitude",
+                "gmtoff",
+                "dstoff",
+                "country_code",
+                "timezone",
+                "region"
+            ]
+        },
+        "source": {
+            "type": "string"
+        },
+        "tags_count": {
+            "type": "integer"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "list_id": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "rel": {
+                        "type": "string"
+                    },
+                    "href": {
+                        "type": "string"
+                    },
+                    "method": {
+                        "type": "string"
+                    },
+                    "targetSchema": {
+                        "type": "string"
+                    },
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "rel",
+                    "href",
+                    "method"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "email_address",
+        "unique_email_id",
+        "contact_id",
+        "full_name",
+        "web_id",
+        "email_type",
+        "status",
+        "consents_to_one_to_one_messaging",
+        "sms_phone_number",
+        "sms_subscription_status",
+        "sms_subscription_last_updated",
+        "merge_fields",
+        "stats",
+        "ip_signup",
+        "timestamp_signup",
+        "ip_opt",
+        "timestamp_opt",
+        "member_rating",
+        "last_changed",
+        "language",
+        "vip",
+        "email_client",
+        "location",
+        "source",
+        "tags_count",
+        "tags",
+        "list_id",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/update.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/update.json
new file mode 100644
index 0000000000..5b3f592bbb
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/member/update.json
@@ -0,0 +1,169 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "email_address": {
+            "type": "string"
+        },
+        "unique_email_id": {
+            "type": "string"
+        },
+        "contact_id": {
+            "type": "string"
+        },
+        "full_name": {
+            "type": "string"
+        },
+        "web_id": {
+            "type": "integer"
+        },
+        "email_type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "consents_to_one_to_one_messaging": {
+            "type": "boolean"
+        },
+        "sms_phone_number": {
+            "type": "string"
+        },
+        "sms_subscription_status": {
+            "type": "string"
+        },
+        "sms_subscription_last_updated": {
+            "type": "string"
+        },
+        "merge_fields": {
+            "type": "object",
+            "properties": {
+                "FNAME": {
+                    "type": "string"
+                },
+                "LNAME": {
+                    "type": "string"
+                },
+                "PHONE": {
+                    "type": "string"
+                },
+                "BIRTHDAY": {
+                    "type": "string"
+                }
+            }
+        },
+        "ip_signup": {
+            "type": "string"
+        },
+        "timestamp_signup": {
+            "type": "string"
+        },
+        "ip_opt": {
+            "type": "string"
+        },
+        "timestamp_opt": {
+            "type": "string"
+        },
+        "member_rating": {
+            "type": "integer"
+        },
+        "last_changed": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        },
+        "vip": {
+            "type": "boolean"
+        },
+        "email_client": {
+            "type": "string"
+        },
+        "location": {
+            "type": "object",
+            "properties": {
+                "gmtoff": {
+                    "type": "integer"
+                },
+                "dstoff": {
+                    "type": "integer"
+                },
+                "country_code": {
+                    "type": "string"
+                },
+                "timezone": {
+                    "type": "string"
+                },
+                "region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "latitude",
+                "longitude",
+                "gmtoff",
+                "dstoff",
+                "country_code",
+                "timezone",
+                "region"
+            ]
+        },
+        "source": {
+            "type": "string"
+        },
+        "tags_count": {
+            "type": "integer"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "list_id": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "rel": {
+                        "type": "string"
+                    },
+                    "href": {
+                        "type": "string"
+                    },
+                    "method": {
+                        "type": "string"
+                    },
+                    "targetSchema": {
+                        "type": "string"
+                    },
+                    "schema": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "rel",
+                    "href",
+                    "method"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/memberTag/create.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/memberTag/create.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/memberTag/create.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/memberTag/delete.json b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/memberTag/delete.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailchimp/__schema__/v1.0.0/memberTag/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MailerLite/__schema__/v1.0.0/subscriber/get.json b/packages/nodes-base/nodes/MailerLite/__schema__/v1.0.0/subscriber/get.json
new file mode 100644
index 0000000000..36fbe07a92
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/__schema__/v1.0.0/subscriber/get.json
@@ -0,0 +1,66 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "sent": {
+            "type": "integer"
+        },
+        "opened": {
+            "type": "integer"
+        },
+        "clicked": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "country_id": {
+            "type": "string"
+        },
+        "signup_ip": {
+            "type": "null"
+        },
+        "signup_timestamp": {
+            "type": "null"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "key": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "key",
+                    "value",
+                    "type"
+                ]
+            }
+        },
+        "date_unsubscribe": {
+            "type": "null"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_updated": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MailerLite/__schema__/v1.0.0/subscriber/getAll.json b/packages/nodes-base/nodes/MailerLite/__schema__/v1.0.0/subscriber/getAll.json
new file mode 100644
index 0000000000..124c17d5cb
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/__schema__/v1.0.0/subscriber/getAll.json
@@ -0,0 +1,93 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "sent": {
+            "type": "integer"
+        },
+        "opened": {
+            "type": "integer"
+        },
+        "clicked": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "country_id": {
+            "type": "string"
+        },
+        "signup_ip": {
+            "type": "null"
+        },
+        "signup_timestamp": {
+            "type": "null"
+        },
+        "confirmation_ip": {
+            "type": "null"
+        },
+        "confirmation_timestamp": {
+            "type": "null"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "key": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "key",
+                    "value",
+                    "type"
+                ]
+            }
+        },
+        "date_subscribe": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_updated": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "email",
+        "sent",
+        "opened",
+        "opened_rate",
+        "clicked",
+        "clicked_rate",
+        "type",
+        "country_id",
+        "signup_ip",
+        "signup_timestamp",
+        "confirmation_ip",
+        "confirmation_timestamp",
+        "fields",
+        "date_subscribe",
+        "date_unsubscribe",
+        "date_created",
+        "date_updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
index 1430ea8ec7..468a653d45 100644
--- a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
+++ b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
@@ -11,8 +11,6 @@ import {
 describe('MailerLite', () => {
 	describe('Run v1 workflow', () => {
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			const mock = nock('https://api.mailerlite.com/api/v2');
 
 			mock.post('/subscribers').reply(200, getCreateResponseClassic);
@@ -21,10 +19,6 @@ describe('MailerLite', () => {
 			mock.put('/subscribers/demo@mailerlite.com').reply(200, getUpdateSubscriberResponseClassic);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		const workflows = getWorkflowFilenames(__dirname);
 		testWorkflows(workflows);
 	});
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
index d723e86908..9752eb3a44 100644
--- a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
+++ b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
@@ -11,8 +11,6 @@ import {
 describe('MailerLite', () => {
 	describe('Run v2 workflow', () => {
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			const mock = nock('https://connect.mailerlite.com/api');
 
 			mock.post('/subscribers').reply(200, getCreateResponseV2);
@@ -24,10 +22,6 @@ describe('MailerLite', () => {
 			mock.put('/subscribers/user@n8n.io').reply(200, getUpdateSubscriberResponseV2);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		const workflows = getWorkflowFilenames(__dirname);
 		testWorkflows(workflows);
 	});
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
index 953dc7232e..7c4d3c6bcf 100644
--- a/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
@@ -31,6 +31,7 @@ export class MailerLiteV2 implements INodeType {
 			defaults: {
 				name: 'MailerLite',
 			},
+			usableAsTool: true,
 			inputs: [NodeConnectionType.Main],
 			outputs: [NodeConnectionType.Main],
 			credentials: [
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 24a1eb9448..04fc9ab44f 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -20,6 +20,7 @@ export class Mailgun implements INodeType {
 		defaults: {
 			name: 'Mailgun',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index 303ef673ef..fc512405a0 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -25,6 +25,7 @@ export class Mailjet implements INodeType {
 		defaults: {
 			name: 'Mailjet',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mailjet/__schema__/v1.0.0/email/send.json b/packages/nodes-base/nodes/Mailjet/__schema__/v1.0.0/email/send.json
new file mode 100644
index 0000000000..88a6ee59e1
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailjet/__schema__/v1.0.0/email/send.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "Status": {
+            "type": "string"
+        },
+        "CustomID": {
+            "type": "string"
+        },
+        "To": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Email": {
+                        "type": "string"
+                    },
+                    "MessageUUID": {
+                        "type": "string"
+                    },
+                    "MessageID": {
+                        "type": "integer"
+                    },
+                    "MessageHref": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Email",
+                    "MessageUUID",
+                    "MessageID",
+                    "MessageHref"
+                ]
+            }
+        },
+        "Cc": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Email": {
+                        "type": "string"
+                    },
+                    "MessageUUID": {
+                        "type": "string"
+                    },
+                    "MessageID": {
+                        "type": "integer"
+                    },
+                    "MessageHref": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Email",
+                    "MessageUUID",
+                    "MessageID",
+                    "MessageHref"
+                ]
+            }
+        },
+        "Bcc": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Email": {
+                        "type": "string"
+                    },
+                    "MessageUUID": {
+                        "type": "string"
+                    },
+                    "MessageID": {
+                        "type": "integer"
+                    },
+                    "MessageHref": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Email",
+                    "MessageUUID",
+                    "MessageID",
+                    "MessageHref"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mailjet/__schema__/v1.0.0/email/sendTemplate.json b/packages/nodes-base/nodes/Mailjet/__schema__/v1.0.0/email/sendTemplate.json
new file mode 100644
index 0000000000..3307215c43
--- /dev/null
+++ b/packages/nodes-base/nodes/Mailjet/__schema__/v1.0.0/email/sendTemplate.json
@@ -0,0 +1,96 @@
+{
+    "type": "object",
+    "properties": {
+        "Status": {
+            "type": "string"
+        },
+        "CustomID": {
+            "type": "string"
+        },
+        "To": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Email": {
+                        "type": "string"
+                    },
+                    "MessageUUID": {
+                        "type": "string"
+                    },
+                    "MessageID": {
+                        "type": "integer"
+                    },
+                    "MessageHref": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Email",
+                    "MessageUUID",
+                    "MessageID",
+                    "MessageHref"
+                ]
+            }
+        },
+        "Cc": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Email": {
+                        "type": "string"
+                    },
+                    "MessageUUID": {
+                        "type": "string"
+                    },
+                    "MessageID": {
+                        "type": "integer"
+                    },
+                    "MessageHref": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Email",
+                    "MessageUUID",
+                    "MessageID",
+                    "MessageHref"
+                ]
+            }
+        },
+        "Bcc": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Email": {
+                        "type": "string"
+                    },
+                    "MessageUUID": {
+                        "type": "string"
+                    },
+                    "MessageID": {
+                        "type": "integer"
+                    },
+                    "MessageHref": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Email",
+                    "MessageUUID",
+                    "MessageID",
+                    "MessageHref"
+                ]
+            }
+        }
+    },
+    "required": [
+        "Status",
+        "CustomID",
+        "To",
+        "Cc",
+        "Bcc"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index 43ed419ddb..4477dd650f 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -105,6 +105,7 @@ export class Mandrill implements INodeType {
 		defaults: {
 			name: 'Mandrill',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mandrill/__schema__/v1.0.0/message/sendHtml.json b/packages/nodes-base/nodes/Mandrill/__schema__/v1.0.0/message/sendHtml.json
new file mode 100644
index 0000000000..fd2031c2c4
--- /dev/null
+++ b/packages/nodes-base/nodes/Mandrill/__schema__/v1.0.0/message/sendHtml.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "email": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "email",
+        "status",
+        "_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Mandrill/__schema__/v1.0.0/message/sendTemplate.json b/packages/nodes-base/nodes/Mandrill/__schema__/v1.0.0/message/sendTemplate.json
new file mode 100644
index 0000000000..fd2031c2c4
--- /dev/null
+++ b/packages/nodes-base/nodes/Mandrill/__schema__/v1.0.0/message/sendTemplate.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "email": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "email",
+        "status",
+        "_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
index 370fdb261b..b0411f63b4 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
@@ -35,6 +35,7 @@ export class Marketstack implements INodeType {
 		defaults: {
 			name: 'Marketstack',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index 6a0c4b40ac..1a6cf0ee2e 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -30,6 +30,7 @@ export class Matrix implements INodeType {
 		defaults: {
 			name: 'Matrix',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Matrix/__schema__/v1.0.0/message/create.json b/packages/nodes-base/nodes/Matrix/__schema__/v1.0.0/message/create.json
new file mode 100644
index 0000000000..f87c5266d9
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/__schema__/v1.0.0/message/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "event_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "event_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Matrix/__schema__/v1.0.0/message/getAll.json b/packages/nodes-base/nodes/Matrix/__schema__/v1.0.0/message/getAll.json
new file mode 100644
index 0000000000..5048276152
--- /dev/null
+++ b/packages/nodes-base/nodes/Matrix/__schema__/v1.0.0/message/getAll.json
@@ -0,0 +1,96 @@
+{
+    "type": "object",
+    "properties": {
+        "content": {
+            "type": "object",
+            "properties": {
+                "msgtype": {
+                    "type": "string"
+                },
+                "body": {
+                    "type": "string"
+                },
+                "com.beeper.linkpreviews": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "og:url": {
+                                "type": "string"
+                            },
+                            "og:title": {
+                                "type": "string"
+                            },
+                            "og:image": {
+                                "type": "string"
+                            },
+                            "matrix:image:size": {
+                                "type": "integer"
+                            },
+                            "og:image:width": {
+                                "type": "integer"
+                            },
+                            "og:image:height": {
+                                "type": "integer"
+                            },
+                            "og:image:type": {
+                                "type": "string"
+                            },
+                            "matched_url": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "og:url",
+                            "og:title",
+                            "og:image",
+                            "matrix:image:size",
+                            "og:image:width",
+                            "og:image:height",
+                            "og:image:type",
+                            "matched_url"
+                        ]
+                    }
+                }
+            }
+        },
+        "origin_server_ts": {
+            "type": "integer"
+        },
+        "room_id": {
+            "type": "string"
+        },
+        "sender": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "unsigned": {
+            "type": "object",
+            "properties": {
+                "age": {
+                    "type": "integer"
+                }
+            }
+        },
+        "event_id": {
+            "type": "string"
+        },
+        "user_id": {
+            "type": "string"
+        },
+        "age": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "content",
+        "origin_server_ts",
+        "room_id",
+        "sender",
+        "type",
+        "unsigned",
+        "event_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Mattermost/__schema__/v1.0.0/message/post.json b/packages/nodes-base/nodes/Mattermost/__schema__/v1.0.0/message/post.json
new file mode 100644
index 0000000000..a6a20bee2b
--- /dev/null
+++ b/packages/nodes-base/nodes/Mattermost/__schema__/v1.0.0/message/post.json
@@ -0,0 +1,92 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "create_at": {
+            "type": "integer"
+        },
+        "update_at": {
+            "type": "integer"
+        },
+        "edit_at": {
+            "type": "integer"
+        },
+        "delete_at": {
+            "type": "integer"
+        },
+        "is_pinned": {
+            "type": "boolean"
+        },
+        "user_id": {
+            "type": "string"
+        },
+        "channel_id": {
+            "type": "string"
+        },
+        "root_id": {
+            "type": "string"
+        },
+        "original_id": {
+            "type": "string"
+        },
+        "message": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "props": {
+            "type": "object",
+            "properties": {
+                "from_bot": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "attachments"
+            ]
+        },
+        "hashtags": {
+            "type": "string"
+        },
+        "pending_post_id": {
+            "type": "string"
+        },
+        "remote_id": {
+            "type": "string"
+        },
+        "reply_count": {
+            "type": "integer"
+        },
+        "last_reply_at": {
+            "type": "integer"
+        },
+        "participants": {
+            "type": "null"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "embeds": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "embeds"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
index 926be610ae..03e4ffff81 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
@@ -16,6 +16,7 @@ export class MattermostV1 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 0a5d61739c..77f24eb1c4 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -31,6 +31,7 @@ export class Mautic implements INodeType {
 		defaults: {
 			name: 'Mautic',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Medium/Medium.node.ts b/packages/nodes-base/nodes/Medium/Medium.node.ts
index 87c0768154..bc238eaa46 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.ts
+++ b/packages/nodes-base/nodes/Medium/Medium.node.ts
@@ -24,6 +24,7 @@ export class Medium implements INodeType {
 		defaults: {
 			name: 'Medium',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Medium/__schema__/v1.0.0/post/create.json b/packages/nodes-base/nodes/Medium/__schema__/v1.0.0/post/create.json
new file mode 100644
index 0000000000..97dbcde0bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Medium/__schema__/v1.0.0/post/create.json
@@ -0,0 +1,38 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "authorId": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "canonicalUrl": {
+            "type": "string"
+        },
+        "publishStatus": {
+            "type": "string"
+        },
+        "publishedAt": {
+            "type": "integer"
+        },
+        "license": {
+            "type": "string"
+        },
+        "licenseUrl": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index b008af7962..e897173ff8 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -22,6 +22,7 @@ export class MessageBird implements INodeType {
 		defaults: {
 			name: 'MessageBird',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Metabase/Metabase.node.ts b/packages/nodes-base/nodes/Metabase/Metabase.node.ts
index 1d00a0f38a..6cfcdde5c1 100644
--- a/packages/nodes-base/nodes/Metabase/Metabase.node.ts
+++ b/packages/nodes-base/nodes/Metabase/Metabase.node.ts
@@ -18,6 +18,7 @@ export class Metabase implements INodeType {
 		defaults: {
 			name: 'Metabase',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Metabase/__schema__/v1.0.0/questions/get.json b/packages/nodes-base/nodes/Metabase/__schema__/v1.0.0/questions/get.json
new file mode 100644
index 0000000000..01ee10eeab
--- /dev/null
+++ b/packages/nodes-base/nodes/Metabase/__schema__/v1.0.0/questions/get.json
@@ -0,0 +1,233 @@
+{
+    "type": "object",
+    "properties": {
+        "archived": {
+            "type": "boolean"
+        },
+        "creator": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "last_login": {
+                    "type": "string"
+                },
+                "is_qbnewb": {
+                    "type": "boolean"
+                },
+                "is_superuser": {
+                    "type": "boolean"
+                },
+                "id": {
+                    "type": "integer"
+                },
+                "date_joined": {
+                    "type": "string"
+                },
+                "common_name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "email",
+                "first_name",
+                "last_login",
+                "is_qbnewb",
+                "is_superuser",
+                "id",
+                "last_name",
+                "date_joined",
+                "common_name"
+            ]
+        },
+        "initially_published_at": {
+            "type": "null"
+        },
+        "can_write": {
+            "type": "boolean"
+        },
+        "database_id": {
+            "type": "integer"
+        },
+        "enable_embedding": {
+            "type": "boolean"
+        },
+        "query_type": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "dashboard_count": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "embedding_params": {
+            "type": "null"
+        },
+        "cache_ttl": {
+            "type": "null"
+        },
+        "dataset_query": {
+            "type": "object",
+            "properties": {
+                "database": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "native": {
+                    "type": "object",
+                    "properties": {
+                        "query": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "template-tags",
+                        "query"
+                    ]
+                }
+            },
+            "required": [
+                "database",
+                "type"
+            ]
+        },
+        "id": {
+            "type": "integer"
+        },
+        "display": {
+            "type": "string"
+        },
+        "collection_preview": {
+            "type": "boolean"
+        },
+        "last-edit-info": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "timestamp": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "email",
+                "first_name",
+                "last_name",
+                "timestamp"
+            ]
+        },
+        "visualization_settings": {
+            "type": "object",
+            "properties": {
+                "table.pivot_column": {
+                    "type": "string"
+                },
+                "table.cell_column": {
+                    "type": "string"
+                }
+            }
+        },
+        "collection": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "is_personal": {
+                    "type": "boolean"
+                },
+                "archived": {
+                    "type": "boolean"
+                },
+                "slug": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "null"
+                },
+                "is_sample": {
+                    "type": "boolean"
+                },
+                "location": {
+                    "type": "string"
+                },
+                "namespace": {
+                    "type": "null"
+                },
+                "created_at": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "parameter_usage_count": {
+            "type": "integer"
+        },
+        "cache_invalidated_at": {
+            "type": "null"
+        },
+        "view_count": {
+            "type": "integer"
+        },
+        "can_run_adhoc_query": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "description",
+        "archived",
+        "collection_position",
+        "table_id",
+        "result_metadata",
+        "creator",
+        "can_write",
+        "database_id",
+        "enable_embedding",
+        "collection_id",
+        "query_type",
+        "name",
+        "dashboard_count",
+        "creator_id",
+        "updated_at",
+        "made_public_by_id",
+        "embedding_params",
+        "cache_ttl",
+        "dataset_query",
+        "id",
+        "display",
+        "visualization_settings",
+        "collection",
+        "created_at",
+        "public_uuid"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
index 3ffaacbd69..1021ceefef 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
@@ -32,6 +32,7 @@ export class MicrosoftDynamicsCrm implements INodeType {
 		defaults: {
 			name: 'Microsoft Dynamics CRM',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
index d07255b86d..cf08c11f53 100644
--- a/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
@@ -24,6 +24,7 @@ export class MicrosoftEntra implements INodeType {
 		defaults: {
 			name: 'Micosoft Entra ID',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
index 5b15152624..428e64d94b 100644
--- a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
@@ -91,8 +91,6 @@ describe('Gong Node', () => {
 		];
 
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			jest
 				.spyOn(Helpers.CredentialsHelper.prototype, 'authenticate')
 				.mockImplementation(
@@ -116,11 +114,6 @@ describe('Gong Node', () => {
 				);
 		});
 
-		afterAll(() => {
-			nock.restore();
-			jest.restoreAllMocks();
-		});
-
 		nock(baseUrl)
 			.get(`/groups/${microsoftEntraApiResponse.getGroup.id}`)
 			.matchHeader(
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
index d53a43bd04..9f837faf9a 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -34,16 +33,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => addTable', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/addTable.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
index 04c51e71cd..4b85c99f91 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -51,16 +50,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => append', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/append.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
index 797e6c9de4..ce6fb50265 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -31,16 +30,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => convertToRange', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/convertToRange.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
index a771b77b5a..5a85db9290 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => deleteTable', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/deleteTable.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
index 815c9581a1..cb7f138441 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -33,16 +32,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => getColumns', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/getColumns.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
index d46d1a48a7..2aba1e8c92 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -49,16 +48,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => getRows', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/getRows.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
index 1dd75ce25c..e50d155669 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -67,16 +66,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, table => lookup', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/table/lookup.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
index 3ecc29f3ae..6a38edd3b4 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -35,16 +34,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, workbook => addWorksheet', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
index 0f4ba9e4b5..45a72c5e73 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, workbook => deleteWorkbook', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
index f87820ebcd..8058511767 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -35,16 +34,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, workbook => getAll', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/workbook/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
index 8cac626c00..f9ce0f5995 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -38,16 +37,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => append', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/append.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
index aed1657626..14df918187 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -30,16 +29,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => clear', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/clear.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
index 54b1ae221e..e38c43b60d 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -30,16 +29,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => deleteWorksheet', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
index 1f9057a687..d17353817f 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -37,16 +36,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => getAll', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
index 181913cc89..8dbed77a6e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -35,16 +34,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => readRows', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
index 0433d968db..f31047c37f 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -48,16 +47,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => update', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
index 5de97bf39d..4299db5beb 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -50,16 +49,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftExcelV2, worksheet => upsert', () => {
 	const workflows = ['nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
index 53d7764dfc..48e4c90ac8 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
@@ -21,7 +21,6 @@ import {
 import { tableFields, tableOperations } from './TableDescription';
 import { workbookFields, workbookOperations } from './WorkbookDescription';
 import { worksheetFields, worksheetOperations } from './WorksheetDescription';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Excel',
@@ -173,7 +172,6 @@ export class MicrosoftExcelV1 implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const itemData = generatePairedItemData(items.length);
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		let qs: IDataObject = {};
@@ -245,18 +243,12 @@ export class MicrosoftExcelV1 implements INodeType {
 						{ 'workbook-session-id': id },
 					);
 
-					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData },
-					);
+					const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 
 					returnData.push(...executionData);
 				} catch (error) {
 					if (this.continueOnFail()) {
-						const executionErrorData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ error: error.message }),
-							{ itemData },
-						);
+						const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
 						returnData.push(...executionErrorData);
 					} else {
 						throw error;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
index bcec8f6354..d418b6bcb3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
@@ -16,6 +16,7 @@ export class MicrosoftExcelV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
index 11e345c28b..a037baefe7 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
@@ -5,7 +5,7 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
@@ -274,11 +274,7 @@ export async function execute(
 		);
 	} catch (error) {
 		if (this.continueOnFail()) {
-			const itemData = generatePairedItemData(this.getInputData().length);
-			const executionErrorData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray({ error: error.message }),
-				{ itemData },
-			);
+			const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
 			returnData.push(...executionErrorData);
 		} else {
 			throw error;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
index b21a6b039e..a1ba1a5d0b 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
@@ -6,7 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import {
@@ -375,11 +375,7 @@ export async function execute(
 		}
 	} catch (error) {
 		if (this.continueOnFail()) {
-			const itemData = generatePairedItemData(this.getInputData().length);
-			const executionErrorData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray({ error: error.message }),
-				{ itemData },
-			);
+			const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
 			returnData.push(...executionErrorData);
 		} else {
 			throw error;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
index c27feae6d5..5821304d26 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
@@ -6,7 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import {
@@ -382,11 +382,7 @@ export async function execute(
 		);
 	} catch (error) {
 		if (this.continueOnFail()) {
-			const itemData = generatePairedItemData(this.getInputData().length);
-			const executionErrorData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray({ error: error.message }),
-				{ itemData },
-			);
+			const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
 			returnData.push(...executionErrorData);
 		} else {
 			throw error;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
index 12151a471a..a71c390ecd 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
@@ -1,7 +1,7 @@
 import type { IDataObject, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData, wrapData } from '@utils/utilities';
+import { wrapData } from '@utils/utilities';
 
 import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces';
 
@@ -62,11 +62,7 @@ export function prepareOutput(
 			returnData.push(...executionData);
 		}
 	} else {
-		const itemData = generatePairedItemData(this.getInputData().length);
-		const executionData = this.helpers.constructExecutionMetaData(
-			wrapData({ [config.dataProperty || 'data']: responseData }),
-			{ itemData },
-		);
+		const executionData = wrapData({ [config.dataProperty || 'data']: responseData });
 
 		returnData.push(...executionData);
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
index 293e847582..268d5b080d 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
@@ -31,6 +31,7 @@ export class MicrosoftGraphSecurity implements INodeType {
 		defaults: {
 			name: 'Microsoft Graph Security',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index 555d6faea2..20a600c399 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -24,6 +24,7 @@ export class MicrosoftOneDrive implements INodeType {
 		defaults: {
 			name: 'Microsoft OneDrive',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/copy.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/copy.json
new file mode 100644
index 0000000000..0d83b0fe03
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/copy.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "location": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/delete.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/delete.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/download.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/download.json
new file mode 100644
index 0000000000..33e957900e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/download.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/get.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/get.json
new file mode 100644
index 0000000000..864db49081
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/get.json
@@ -0,0 +1,171 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@microsoft.graph.downloadUrl": {
+            "type": "string"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "eTag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveType": {
+                    "type": "string"
+                },
+                "driveId": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "siteId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "driveType",
+                "driveId"
+            ]
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "cTag": {
+            "type": "string"
+        },
+        "file": {
+            "type": "object",
+            "properties": {
+                "hashes": {
+                    "type": "object",
+                    "properties": {
+                        "quickXorHash": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "quickXorHash"
+                    ]
+                },
+                "mimeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "hashes",
+                "mimeType"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        },
+        "size": {
+            "type": "integer"
+        },
+        "shared": {
+            "type": "object",
+            "properties": {
+                "scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "scope"
+            ]
+        }
+    },
+    "required": [
+        "createdDateTime",
+        "id",
+        "lastModifiedDateTime",
+        "name",
+        "parentReference",
+        "webUrl",
+        "fileSystemInfo",
+        "size"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/rename.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/rename.json
new file mode 100644
index 0000000000..c2b0e4e87c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/rename.json
@@ -0,0 +1,185 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@microsoft.graph.downloadUrl": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "eTag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "cTag": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                },
+                "application": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                },
+                "application": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveType": {
+                    "type": "string"
+                },
+                "driveId": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "siteId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "driveType",
+                "driveId",
+                "id",
+                "name",
+                "path"
+            ]
+        },
+        "file": {
+            "type": "object",
+            "properties": {
+                "mimeType": {
+                    "type": "string"
+                },
+                "hashes": {
+                    "type": "object",
+                    "properties": {
+                        "quickXorHash": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "quickXorHash"
+                    ]
+                }
+            },
+            "required": [
+                "mimeType",
+                "hashes"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/search.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/search.json
new file mode 100644
index 0000000000..27b699fd75
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/search.json
@@ -0,0 +1,115 @@
+{
+    "type": "object",
+    "properties": {
+        "createdDateTime": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveId": {
+                    "type": "string"
+                },
+                "driveType": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "siteId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "driveId",
+                "driveType",
+                "id"
+            ]
+        },
+        "file": {
+            "type": "object",
+            "properties": {
+                "mimeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "mimeType"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/upload.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/upload.json
new file mode 100644
index 0000000000..f72edf9746
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/file/upload.json
@@ -0,0 +1,185 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@microsoft.graph.downloadUrl": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "eTag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "cTag": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "application": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "application": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "user"
+            ]
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveType": {
+                    "type": "string"
+                },
+                "driveId": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "siteId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "driveType",
+                "driveId",
+                "id",
+                "path"
+            ]
+        },
+        "file": {
+            "type": "object",
+            "properties": {
+                "mimeType": {
+                    "type": "string"
+                },
+                "hashes": {
+                    "type": "object",
+                    "properties": {
+                        "quickXorHash": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "quickXorHash"
+                    ]
+                }
+            },
+            "required": [
+                "mimeType",
+                "hashes"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/create.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/create.json
new file mode 100644
index 0000000000..9ddc7a2ff2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/create.json
@@ -0,0 +1,235 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "eTag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "cTag": {
+            "type": "string"
+        },
+        "commentSettings": {
+            "type": "object",
+            "properties": {
+                "commentingDisabled": {
+                    "type": "object",
+                    "properties": {
+                        "isDisabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "isDisabled"
+                    ]
+                }
+            },
+            "required": [
+                "commentingDisabled"
+            ]
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "application": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName",
+                        "id"
+                    ]
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "user"
+            ]
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "application": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName",
+                        "id"
+                    ]
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "user"
+            ]
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveId": {
+                    "type": "string"
+                },
+                "driveType": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "sharepointIds": {
+                    "type": "object",
+                    "properties": {
+                        "listId": {
+                            "type": "string"
+                        },
+                        "listItemUniqueId": {
+                            "type": "string"
+                        },
+                        "siteId": {
+                            "type": "string"
+                        },
+                        "siteUrl": {
+                            "type": "string"
+                        },
+                        "tenantId": {
+                            "type": "string"
+                        },
+                        "webId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "listId",
+                        "listItemUniqueId",
+                        "siteId",
+                        "siteUrl",
+                        "tenantId",
+                        "webId"
+                    ]
+                }
+            },
+            "required": [
+                "driveId",
+                "driveType",
+                "id",
+                "path"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "childCount": {
+                    "type": "integer"
+                },
+                "view": {
+                    "type": "object",
+                    "properties": {
+                        "sortBy": {
+                            "type": "string"
+                        },
+                        "sortOrder": {
+                            "type": "string"
+                        },
+                        "viewType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "sortBy",
+                        "sortOrder",
+                        "viewType"
+                    ]
+                }
+            },
+            "required": [
+                "childCount"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/getChildren.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/getChildren.json
new file mode 100644
index 0000000000..a4eec81d01
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/getChildren.json
@@ -0,0 +1,174 @@
+{
+    "type": "object",
+    "properties": {
+        "@microsoft.graph.downloadUrl": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "cTag": {
+            "type": "string"
+        },
+        "eTag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveId": {
+                    "type": "string"
+                },
+                "driveType": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "path": {
+                    "type": "string"
+                },
+                "siteId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "driveId",
+                "driveType",
+                "id",
+                "path"
+            ]
+        },
+        "file": {
+            "type": "object",
+            "properties": {
+                "mimeType": {
+                    "type": "string"
+                },
+                "hashes": {
+                    "type": "object",
+                    "properties": {
+                        "quickXorHash": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "quickXorHash"
+                    ]
+                }
+            },
+            "required": [
+                "mimeType",
+                "hashes"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        },
+        "shared": {
+            "type": "object",
+            "properties": {
+                "scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "scope"
+            ]
+        }
+    },
+    "required": [
+        "createdDateTime",
+        "cTag",
+        "eTag",
+        "id",
+        "lastModifiedDateTime",
+        "name",
+        "size",
+        "webUrl",
+        "createdBy",
+        "lastModifiedBy",
+        "parentReference",
+        "fileSystemInfo"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/search.json b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/search.json
new file mode 100644
index 0000000000..b8e4cb5a4c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/__schema__/v1.0.0/folder/search.json
@@ -0,0 +1,123 @@
+{
+    "type": "object",
+    "properties": {
+        "createdDateTime": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "createdBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "lastModifiedBy": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "email": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "displayName"
+                    ]
+                }
+            },
+            "required": [
+                "user"
+            ]
+        },
+        "parentReference": {
+            "type": "object",
+            "properties": {
+                "driveId": {
+                    "type": "string"
+                },
+                "driveType": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "siteId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "driveId",
+                "driveType",
+                "id"
+            ]
+        },
+        "fileSystemInfo": {
+            "type": "object",
+            "properties": {
+                "createdDateTime": {
+                    "type": "string"
+                },
+                "lastModifiedDateTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "createdDateTime",
+                "lastModifiedDateTime"
+            ]
+        },
+        "folder": {
+            "type": "object",
+            "properties": {
+                "childCount": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "childCount"
+            ]
+        }
+    },
+    "required": [
+        "createdDateTime",
+        "id",
+        "lastModifiedDateTime",
+        "name",
+        "webUrl",
+        "parentReference"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
index abe9a68bf9..2b7b91e80e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.json
@@ -2,7 +2,10 @@
 	"node": "n8n-nodes-base.microsoftOutlook",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
 	"resources": {
 		"credentialDocumentation": [
 			{
@@ -15,5 +18,5 @@
 			}
 		]
 	},
-	"alias": ["email"]
+	"alias": ["email", "human", "form", "wait", "hitl", "approval"]
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/calendar/get.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/calendar/get.json
new file mode 100644
index 0000000000..1291bcb1e5
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/calendar/get.json
@@ -0,0 +1,68 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "color": {
+            "type": "string"
+        },
+        "hexColor": {
+            "type": "string"
+        },
+        "isDefaultCalendar": {
+            "type": "boolean"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "canShare": {
+            "type": "boolean"
+        },
+        "canViewPrivateItems": {
+            "type": "boolean"
+        },
+        "canEdit": {
+            "type": "boolean"
+        },
+        "allowedOnlineMeetingProviders": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "defaultOnlineMeetingProvider": {
+            "type": "string"
+        },
+        "isTallyingResponses": {
+            "type": "boolean"
+        },
+        "isRemovable": {
+            "type": "boolean"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "address"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/calendar/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/calendar/getAll.json
new file mode 100644
index 0000000000..ce0c25248b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/calendar/getAll.json
@@ -0,0 +1,78 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "color": {
+            "type": "string"
+        },
+        "hexColor": {
+            "type": "string"
+        },
+        "isDefaultCalendar": {
+            "type": "boolean"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "canShare": {
+            "type": "boolean"
+        },
+        "canViewPrivateItems": {
+            "type": "boolean"
+        },
+        "canEdit": {
+            "type": "boolean"
+        },
+        "allowedOnlineMeetingProviders": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "defaultOnlineMeetingProvider": {
+            "type": "string"
+        },
+        "isTallyingResponses": {
+            "type": "boolean"
+        },
+        "isRemovable": {
+            "type": "boolean"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "address"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "color",
+        "hexColor",
+        "isDefaultCalendar",
+        "changeKey",
+        "canShare",
+        "canViewPrivateItems",
+        "canEdit",
+        "allowedOnlineMeetingProviders",
+        "defaultOnlineMeetingProvider",
+        "isTallyingResponses",
+        "isRemovable",
+        "owner"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/contact/create.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/contact/create.json
new file mode 100644
index 0000000000..598b9286ec
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/contact/create.json
@@ -0,0 +1,145 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "birthday": {
+            "type": "null"
+        },
+        "fileAs": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "initials": {
+            "type": "null"
+        },
+        "middleName": {
+            "type": "null"
+        },
+        "nickName": {
+            "type": "null"
+        },
+        "title": {
+            "type": "null"
+        },
+        "yomiGivenName": {
+            "type": "null"
+        },
+        "yomiSurname": {
+            "type": "null"
+        },
+        "yomiCompanyName": {
+            "type": "null"
+        },
+        "generation": {
+            "type": "null"
+        },
+        "department": {
+            "type": "null"
+        },
+        "officeLocation": {
+            "type": "null"
+        },
+        "profession": {
+            "type": "null"
+        },
+        "assistantName": {
+            "type": "null"
+        },
+        "manager": {
+            "type": "null"
+        },
+        "businessPhones": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "spouseName": {
+            "type": "null"
+        },
+        "personalNotes": {
+            "type": "string"
+        },
+        "emailAddresses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "address": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "address"
+                ]
+            }
+        }
+    },
+    "required": [
+        "@odata.context",
+        "@odata.etag",
+        "id",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "changeKey",
+        "categories",
+        "parentFolderId",
+        "birthday",
+        "fileAs",
+        "displayName",
+        "givenName",
+        "initials",
+        "middleName",
+        "nickName",
+        "surname",
+        "title",
+        "yomiGivenName",
+        "yomiSurname",
+        "yomiCompanyName",
+        "generation",
+        "imAddresses",
+        "jobTitle",
+        "companyName",
+        "department",
+        "officeLocation",
+        "profession",
+        "businessHomePage",
+        "assistantName",
+        "manager",
+        "homePhones",
+        "mobilePhone",
+        "businessPhones",
+        "spouseName",
+        "personalNotes",
+        "children",
+        "emailAddresses",
+        "homeAddress",
+        "businessAddress",
+        "otherAddress"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/contact/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/contact/getAll.json
new file mode 100644
index 0000000000..f61ca30642
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/contact/getAll.json
@@ -0,0 +1,42 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "businessPhones": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "emailAddresses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "address": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name",
+                    "address"
+                ]
+            }
+        }
+    },
+    "required": [
+        "@odata.etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/draft/create.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/draft/create.json
new file mode 100644
index 0000000000..a49093e977
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/draft/create.json
@@ -0,0 +1,227 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "receivedDateTime": {
+            "type": "string"
+        },
+        "sentDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "internetMessageId": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "conversationId": {
+            "type": "string"
+        },
+        "conversationIndex": {
+            "type": "string"
+        },
+        "isDeliveryReceiptRequested": {
+            "type": "boolean"
+        },
+        "isReadReceiptRequested": {
+            "type": "boolean"
+        },
+        "isRead": {
+            "type": "boolean"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "inferenceClassification": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "toRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "ccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "bccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "replyTo": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "flag": {
+            "type": "object",
+            "properties": {
+                "flagStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "flagStatus"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context",
+        "@odata.etag",
+        "id",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "changeKey",
+        "categories",
+        "receivedDateTime",
+        "sentDateTime",
+        "hasAttachments",
+        "internetMessageId",
+        "subject",
+        "bodyPreview",
+        "importance",
+        "parentFolderId",
+        "conversationId",
+        "conversationIndex",
+        "isDeliveryReceiptRequested",
+        "isReadReceiptRequested",
+        "isRead",
+        "isDraft",
+        "webLink",
+        "inferenceClassification",
+        "body",
+        "toRecipients",
+        "ccRecipients",
+        "bccRecipients",
+        "replyTo",
+        "flag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/draft/send.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/draft/send.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/draft/send.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/create.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/create.json
new file mode 100644
index 0000000000..3dcdf08af0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/create.json
@@ -0,0 +1,235 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "transactionId": {
+            "type": "null"
+        },
+        "originalStartTimeZone": {
+            "type": "string"
+        },
+        "originalEndTimeZone": {
+            "type": "string"
+        },
+        "iCalUId": {
+            "type": "string"
+        },
+        "uid": {
+            "type": "string"
+        },
+        "reminderMinutesBeforeStart": {
+            "type": "integer"
+        },
+        "isReminderOn": {
+            "type": "boolean"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "sensitivity": {
+            "type": "string"
+        },
+        "isAllDay": {
+            "type": "boolean"
+        },
+        "isCancelled": {
+            "type": "boolean"
+        },
+        "isOrganizer": {
+            "type": "boolean"
+        },
+        "responseRequested": {
+            "type": "boolean"
+        },
+        "seriesMasterId": {
+            "type": "null"
+        },
+        "showAs": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "isOnlineMeeting": {
+            "type": "boolean"
+        },
+        "onlineMeetingProvider": {
+            "type": "string"
+        },
+        "allowNewTimeProposals": {
+            "type": "boolean"
+        },
+        "occurrenceId": {
+            "type": "null"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "hideAttendees": {
+            "type": "boolean"
+        },
+        "responseStatus": {
+            "type": "object",
+            "properties": {
+                "response": {
+                    "type": "string"
+                },
+                "time": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "response",
+                "time"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "location": {
+            "type": "object",
+            "properties": {
+                "displayName": {
+                    "type": "string"
+                },
+                "locationType": {
+                    "type": "string"
+                },
+                "uniqueIdType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "displayName",
+                "locationType",
+                "uniqueIdType"
+            ]
+        },
+        "locations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "locationType": {
+                        "type": "string"
+                    },
+                    "uniqueId": {
+                        "type": "string"
+                    },
+                    "uniqueIdType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "displayName",
+                    "locationType",
+                    "uniqueId",
+                    "uniqueIdType"
+                ]
+            }
+        },
+        "recurrence": {
+            "type": "null"
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/get.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/get.json
new file mode 100644
index 0000000000..41bf733175
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/get.json
@@ -0,0 +1,131 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "attendees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "object",
+                        "properties": {
+                            "response": {
+                                "type": "string"
+                            },
+                            "time": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "response",
+                            "time"
+                        ]
+                    },
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "type",
+                    "status",
+                    "emailAddress"
+                ]
+            }
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "calendar@odata.associationLink": {
+            "type": "string"
+        },
+        "calendar@odata.navigationLink": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "@odata.context"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/getAll.json
new file mode 100644
index 0000000000..ae69955490
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/getAll.json
@@ -0,0 +1,123 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "attendees": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "status": {
+                        "type": "object",
+                        "properties": {
+                            "response": {
+                                "type": "string"
+                            },
+                            "time": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "response",
+                            "time"
+                        ]
+                    },
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "type",
+                    "status",
+                    "emailAddress"
+                ]
+            }
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        }
+    },
+    "required": [
+        "@odata.etag",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/update.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/update.json
new file mode 100644
index 0000000000..01cbc7af86
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/event/update.json
@@ -0,0 +1,238 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "originalStartTimeZone": {
+            "type": "string"
+        },
+        "originalEndTimeZone": {
+            "type": "string"
+        },
+        "iCalUId": {
+            "type": "string"
+        },
+        "uid": {
+            "type": "string"
+        },
+        "reminderMinutesBeforeStart": {
+            "type": "integer"
+        },
+        "isReminderOn": {
+            "type": "boolean"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "sensitivity": {
+            "type": "string"
+        },
+        "isAllDay": {
+            "type": "boolean"
+        },
+        "isCancelled": {
+            "type": "boolean"
+        },
+        "isOrganizer": {
+            "type": "boolean"
+        },
+        "responseRequested": {
+            "type": "boolean"
+        },
+        "seriesMasterId": {
+            "type": "null"
+        },
+        "showAs": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "onlineMeetingUrl": {
+            "type": "null"
+        },
+        "isOnlineMeeting": {
+            "type": "boolean"
+        },
+        "onlineMeetingProvider": {
+            "type": "string"
+        },
+        "allowNewTimeProposals": {
+            "type": "boolean"
+        },
+        "occurrenceId": {
+            "type": "null"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "hideAttendees": {
+            "type": "boolean"
+        },
+        "responseStatus": {
+            "type": "object",
+            "properties": {
+                "response": {
+                    "type": "string"
+                },
+                "time": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "response",
+                "time"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "start": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "end": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        },
+        "location": {
+            "type": "object",
+            "properties": {
+                "displayName": {
+                    "type": "string"
+                },
+                "locationType": {
+                    "type": "string"
+                },
+                "uniqueIdType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "displayName",
+                "locationType",
+                "uniqueIdType"
+            ]
+        },
+        "locations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "locationType": {
+                        "type": "string"
+                    },
+                    "uniqueId": {
+                        "type": "string"
+                    },
+                    "uniqueIdType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "displayName",
+                    "locationType",
+                    "uniqueId",
+                    "uniqueIdType"
+                ]
+            }
+        },
+        "recurrence": {
+            "type": "null"
+        },
+        "organizer": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/create.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/create.json
new file mode 100644
index 0000000000..bded784e42
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/create.json
@@ -0,0 +1,43 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "childFolderCount": {
+            "type": "integer"
+        },
+        "unreadItemCount": {
+            "type": "integer"
+        },
+        "totalItemCount": {
+            "type": "integer"
+        },
+        "sizeInBytes": {
+            "type": "integer"
+        },
+        "isHidden": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "@odata.context",
+        "id",
+        "displayName",
+        "parentFolderId",
+        "childFolderCount",
+        "unreadItemCount",
+        "totalItemCount",
+        "sizeInBytes",
+        "isHidden"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/get.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/get.json
new file mode 100644
index 0000000000..4303c50617
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/get.json
@@ -0,0 +1,36 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "childFolderCount": {
+            "type": "integer"
+        },
+        "unreadItemCount": {
+            "type": "integer"
+        },
+        "totalItemCount": {
+            "type": "integer"
+        },
+        "sizeInBytes": {
+            "type": "integer"
+        },
+        "isHidden": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "@odata.context",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/getAll.json
new file mode 100644
index 0000000000..380a0e8fc8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folder/getAll.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "childFolderCount": {
+            "type": "integer"
+        },
+        "unreadItemCount": {
+            "type": "integer"
+        },
+        "totalItemCount": {
+            "type": "integer"
+        },
+        "sizeInBytes": {
+            "type": "integer"
+        },
+        "isHidden": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folderMessage/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folderMessage/getAll.json
new file mode 100644
index 0000000000..06633002e4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/folderMessage/getAll.json
@@ -0,0 +1,90 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "sender": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "conversationId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/delete.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/delete.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/get.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/get.json
new file mode 100644
index 0000000000..19eb581c9e
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/get.json
@@ -0,0 +1,128 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "receivedDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "conversationId": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "toRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "ccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/getAll.json
new file mode 100644
index 0000000000..2fa77f4141
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/getAll.json
@@ -0,0 +1,44 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "conversationId": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/move.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/move.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/move.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/reply.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/reply.json
new file mode 100644
index 0000000000..4f91010eb8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/reply.json
@@ -0,0 +1,279 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "receivedDateTime": {
+            "type": "string"
+        },
+        "sentDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "internetMessageId": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "conversationId": {
+            "type": "string"
+        },
+        "conversationIndex": {
+            "type": "string"
+        },
+        "isDeliveryReceiptRequested": {
+            "type": "boolean"
+        },
+        "isReadReceiptRequested": {
+            "type": "boolean"
+        },
+        "isRead": {
+            "type": "boolean"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "inferenceClassification": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "sender": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "toRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "ccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "bccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "replyTo": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "flag": {
+            "type": "object",
+            "properties": {
+                "flagStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "flagStatus"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context",
+        "@odata.etag",
+        "id",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "changeKey",
+        "categories",
+        "receivedDateTime",
+        "sentDateTime",
+        "hasAttachments",
+        "internetMessageId",
+        "subject",
+        "bodyPreview",
+        "importance",
+        "parentFolderId",
+        "conversationId",
+        "conversationIndex",
+        "isDeliveryReceiptRequested",
+        "isReadReceiptRequested",
+        "isRead",
+        "isDraft",
+        "webLink",
+        "inferenceClassification",
+        "body",
+        "sender",
+        "from",
+        "toRecipients",
+        "ccRecipients",
+        "bccRecipients",
+        "replyTo",
+        "flag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/send.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/send.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/send.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/update.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/update.json
new file mode 100644
index 0000000000..799bf5cc8c
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/message/update.json
@@ -0,0 +1,281 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "changeKey": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "receivedDateTime": {
+            "type": "string"
+        },
+        "sentDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "internetMessageId": {
+            "type": "string"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "bodyPreview": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "parentFolderId": {
+            "type": "string"
+        },
+        "conversationId": {
+            "type": "string"
+        },
+        "conversationIndex": {
+            "type": "string"
+        },
+        "isReadReceiptRequested": {
+            "type": "boolean"
+        },
+        "isRead": {
+            "type": "boolean"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "webLink": {
+            "type": "string"
+        },
+        "inferenceClassification": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "sender": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "emailAddress": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "address": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "name",
+                        "address"
+                    ]
+                }
+            },
+            "required": [
+                "emailAddress"
+            ]
+        },
+        "toRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "ccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "bccRecipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "replyTo": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emailAddress": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "address": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "address"
+                        ]
+                    }
+                },
+                "required": [
+                    "emailAddress"
+                ]
+            }
+        },
+        "flag": {
+            "type": "object",
+            "properties": {
+                "flagStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "flagStatus"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context",
+        "@odata.etag",
+        "id",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "changeKey",
+        "categories",
+        "receivedDateTime",
+        "sentDateTime",
+        "hasAttachments",
+        "internetMessageId",
+        "subject",
+        "bodyPreview",
+        "importance",
+        "parentFolderId",
+        "conversationId",
+        "conversationIndex",
+        "isDeliveryReceiptRequested",
+        "isReadReceiptRequested",
+        "isRead",
+        "isDraft",
+        "webLink",
+        "inferenceClassification",
+        "body",
+        "toRecipients",
+        "ccRecipients",
+        "bccRecipients",
+        "replyTo",
+        "flag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/download.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/download.json
new file mode 100644
index 0000000000..77d6744505
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/download.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.type": {
+            "type": "string"
+        },
+        "@odata.mediaContentType": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "contentType": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "isInline": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/get.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/get.json
new file mode 100644
index 0000000000..38de324176
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/get.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.type": {
+            "type": "string"
+        },
+        "@odata.mediaContentType": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "isInline": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "@odata.context"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/getAll.json b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/getAll.json
new file mode 100644
index 0000000000..2033db4f89
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/__schema__/v2.0.0/messageAttachment/getAll.json
@@ -0,0 +1,30 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.type": {
+            "type": "string"
+        },
+        "@odata.mediaContentType": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "isInline": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "@odata.type",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
index 822f20ca8a..93b5269fb8 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -42,16 +41,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, calendar => create', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
index bf14756f73..7e3f368939 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, calendar => delete', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/delete.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
index 4f8b34c9ea..a8b5908d6f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -42,16 +41,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, calendar => get', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
index 4c8176a05a..f994d55e3e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -63,16 +62,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, calendar => getAll', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
index 80a2acd1ab..18d05f7e44 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -42,16 +41,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, calendar => update', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/calendar/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
index 0dae646594..20fb9abfd3 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -65,16 +64,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, contact => create', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/contact/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
index 239d8bb42d..85c54fce2e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -71,16 +70,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, contact => update', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/contact/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
index 5f1dccf1ed..d92bb1d5ed 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -93,16 +92,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, draft => create', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/draft/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
index f88e8b2151..d04b7ebbee 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, draft => send', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/draft/send.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
index 3fec538f0b..460982cc95 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -103,16 +102,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, contact => event', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/event/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
index f9e2026c9d..783ead7821 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -34,16 +33,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, contact => folder', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/folder/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
index c97a9895f3..b38daa72b9 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -27,16 +26,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, folderMessage => getAll', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
index 1673027104..71070c7e9f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, message => move', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/move.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
index c7d106847c..e5cf588fc8 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -82,16 +81,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, message => reply', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/reply.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
index 0ce4e7f674..cb494ed1fa 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -22,16 +21,6 @@ jest.mock('../../../../v2/transport', () => {
 describe('Test MicrosoftOutlookV2, message => send', () => {
 	const workflows = ['nodes/Microsoft/Outlook/test/v2/node/message/send.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../v2/transport');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/sendAndWait.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/sendAndWait.test.ts
new file mode 100644
index 0000000000..0375f1d40f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/sendAndWait.test.ts
@@ -0,0 +1,76 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { SEND_AND_WAIT_OPERATION, type IExecuteFunctions } from 'n8n-workflow';
+
+import { description } from '../../../../v2/actions/node.description';
+import { MicrosoftOutlookV2 } from '../../../../v2/MicrosoftOutlookV2.node';
+import * as transport from '../../../../v2/transport';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(async function (method: string) {
+			if (method === 'POST') {
+				return {};
+			}
+		}),
+	};
+});
+
+describe('Test MicrosoftOutlookV2, message => sendAndWait', () => {
+	let microsoftOutlook: MicrosoftOutlookV2;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		microsoftOutlook = new MicrosoftOutlookV2(description);
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		//router
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(SEND_AND_WAIT_OPERATION);
+		mockExecuteFunctions.putExecutionToWait.mockImplementation();
+
+		//operation
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my@outlook.com');
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+
+		//getSendAndWaitConfig
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my subject');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({});
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('approval');
+
+		// configureWaitTillDate
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({}); //options.limitWaitTime.values
+
+		const result = await microsoftOutlook.execute.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith('POST', '/sendMail', {
+			message: {
+				body: {
+					content: expect.stringContaining(
+						'href="http://localhost/waiting-webhook/nodeID?approved=true"',
+					),
+					contentType: 'html',
+				},
+				subject: 'my subject',
+				toRecipients: [{ emailAddress: { address: 'my@outlook.com' } }],
+			},
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
index 481c868b35..a40671d722 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
@@ -8,6 +8,7 @@ import type {
 import { description } from './actions/node.description';
 import { router } from './actions/router';
 import { loadOptions, listSearch } from './methods';
+import { sendAndWaitWebhook } from '../../../../utils/sendAndWait/utils';
 
 export class MicrosoftOutlookV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -21,6 +22,8 @@ export class MicrosoftOutlookV2 implements INodeType {
 
 	methods = { loadOptions, listSearch };
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions) {
 		return await router.call(this);
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
index 4002ed6538..b36da52f38 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
@@ -1,4 +1,4 @@
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 
 import * as del from './delete.operation';
 import * as get from './get.operation';
@@ -6,9 +6,10 @@ import * as getAll from './getAll.operation';
 import * as move from './move.operation';
 import * as reply from './reply.operation';
 import * as send from './send.operation';
+import * as sendAndWait from './sendAndWait.operation';
 import * as update from './update.operation';
 
-export { del as delete, get, getAll, move, reply, send, update };
+export { del as delete, get, getAll, move, reply, send, sendAndWait, update };
 
 export const description: INodeProperties[] = [
 	{
@@ -58,6 +59,12 @@ export const description: INodeProperties[] = [
 				description: 'Send a message',
 				action: 'Send a message',
 			},
+			{
+				name: 'Send and Wait for Response',
+				value: SEND_AND_WAIT_OPERATION,
+				description: 'Send a message and wait for response',
+				action: 'Send message and wait for response',
+			},
 			{
 				name: 'Update',
 				value: 'update',
@@ -74,5 +81,6 @@ export const description: INodeProperties[] = [
 	...move.description,
 	...reply.description,
 	...send.description,
+	...sendAndWait.description,
 	...update.description,
 ];
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/sendAndWait.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/sendAndWait.operation.ts
new file mode 100644
index 0000000000..53985249dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/sendAndWait.operation.ts
@@ -0,0 +1,55 @@
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+
+import { createEmailBody } from '../../../../../../utils/sendAndWait/email-templates';
+import {
+	getSendAndWaitConfig,
+	getSendAndWaitProperties,
+	createButton,
+} from '../../../../../../utils/sendAndWait/utils';
+import { createMessage } from '../../helpers/utils';
+import { microsoftApiRequest } from '../../transport';
+
+export const description: INodeProperties[] = getSendAndWaitProperties([
+	{
+		displayName: 'To',
+		name: 'toRecipients',
+		description: 'Comma-separated list of email addresses of recipients',
+		type: 'string',
+		required: true,
+		default: '',
+	},
+]);
+
+export async function execute(this: IExecuteFunctions, index: number, items: INodeExecutionData[]) {
+	const toRecipients = this.getNodeParameter('toRecipients', index) as string;
+
+	const config = getSendAndWaitConfig(this);
+	const buttons: string[] = [];
+	for (const option of config.options) {
+		buttons.push(createButton(config.url, option.label, option.value, option.style));
+	}
+
+	const instanceId = this.getInstanceId();
+
+	const bodyContent = createEmailBody(config.message, buttons.join('\n'), instanceId);
+
+	const fields: IDataObject = {
+		subject: config.title,
+		bodyContent,
+		toRecipients,
+		bodyContentType: 'html',
+	};
+
+	const message: IDataObject = createMessage(fields);
+
+	const body: IDataObject = { message };
+
+	await microsoftApiRequest.call(this, 'POST', '/sendMail', body);
+
+	return items;
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
index 50d0349683..1c163d731d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
@@ -9,6 +9,7 @@ import * as folder from './folder';
 import * as folderMessage from './folderMessage';
 import * as message from './message';
 import * as messageAttachment from './messageAttachment';
+import { sendAndWaitWebhooksDescription } from '../../../../../utils/sendAndWait/descriptions';
 
 export const description: INodeTypeDescription = {
 	displayName: 'Microsoft Outlook',
@@ -30,6 +31,7 @@ export const description: INodeTypeDescription = {
 			required: true,
 		},
 	],
+	webhooks: sendAndWaitWebhooksDescription,
 	properties: [
 		{
 			displayName: 'Resource',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts
index 19b6f02b56..358498d0fb 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.type.ts
@@ -7,7 +7,7 @@ type NodeMap = {
 	event: 'create' | 'delete' | 'get' | 'getAll' | 'update';
 	folder: 'create' | 'delete' | 'get' | 'getAll' | 'update';
 	folderMessage: 'getAll';
-	message: 'delete' | 'get' | 'getAll' | 'move' | 'update' | 'send' | 'reply';
+	message: 'delete' | 'get' | 'getAll' | 'move' | 'update' | 'send' | 'reply' | 'sendAndWait';
 	messageAttachment: 'add' | 'download' | 'getAll' | 'get';
 };
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
index 7fd67db228..8a05975e56 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
@@ -1,5 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { NodeApiError, NodeOperationError, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
 
 import * as calendar from './calendar';
 import * as contact from './contact';
@@ -10,6 +10,7 @@ import * as folderMessage from './folderMessage';
 import * as message from './message';
 import * as messageAttachment from './messageAttachment';
 import type { MicrosoftOutlook } from './node.type';
+import { configureWaitTillDate } from '../../../../../utils/sendAndWait/utils';
 
 export async function router(this: IExecuteFunctions) {
 	const items = this.getInputData();
@@ -25,6 +26,18 @@ export async function router(this: IExecuteFunctions) {
 		operation,
 	} as MicrosoftOutlook;
 
+	if (
+		microsoftOutlook.resource === 'message' &&
+		microsoftOutlook.operation === SEND_AND_WAIT_OPERATION
+	) {
+		await message[microsoftOutlook.operation].execute.call(this, 0, items);
+
+		const waitTill = configureWaitTillDate(this);
+
+		await this.putExecutionToWait(waitTill);
+		return [items];
+	}
+
 	for (let i = 0; i < items.length; i++) {
 		try {
 			switch (microsoftOutlook.resource) {
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 0112c0f8bb..8df2314cae 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -12,7 +12,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { flatten, generatePairedItemData, getResolvables } from '@utils/utilities';
+import { flatten, getResolvables } from '@utils/utilities';
 
 import {
 	configurePool,
@@ -343,12 +343,7 @@ export class MicrosoftSql implements INodeType {
 				responseData = await deleteOperation(tables, pool);
 			}
 
-			const itemData = generatePairedItemData(items.length);
-
-			returnData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
-				{ itemData },
-			);
+			returnData = this.helpers.returnJsonArray(responseData);
 		} catch (error) {
 			if (this.continueOnFail()) {
 				responseData = items;
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json
index 03d322e99f..4163f0118b 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json
+++ b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.json
@@ -2,7 +2,11 @@
 	"node": "n8n-nodes-base.microsoftTeams",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
+	"alias": ["human", "form", "wait", "hitl", "approval"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/channelMessage/create.json b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/channelMessage/create.json
new file mode 100644
index 0000000000..6a18ffedeb
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/channelMessage/create.json
@@ -0,0 +1,155 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "messageType": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "lastEditedDateTime": {
+            "type": "null"
+        },
+        "deletedDateTime": {
+            "type": "null"
+        },
+        "subject": {
+            "type": "null"
+        },
+        "summary": {
+            "type": "null"
+        },
+        "chatId": {
+            "type": "null"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "onBehalfOf": {
+            "type": "null"
+        },
+        "policyViolation": {
+            "type": "null"
+        },
+        "eventDetail": {
+            "type": "null"
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "application": {
+                    "type": "null"
+                },
+                "device": {
+                    "type": "null"
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "@odata.type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "userIdentityType": {
+                            "type": "string"
+                        },
+                        "tenantId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "@odata.type",
+                        "id",
+                        "displayName",
+                        "userIdentityType",
+                        "tenantId"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "device",
+                "user"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "channelIdentity": {
+            "type": "object",
+            "properties": {
+                "teamId": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "teamId",
+                "channelId"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context",
+        "id",
+        "replyToId",
+        "etag",
+        "messageType",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "lastEditedDateTime",
+        "deletedDateTime",
+        "subject",
+        "summary",
+        "chatId",
+        "importance",
+        "locale",
+        "webUrl",
+        "onBehalfOf",
+        "policyViolation",
+        "eventDetail",
+        "from",
+        "body",
+        "channelIdentity",
+        "attachments",
+        "mentions",
+        "reactions"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/channelMessage/getAll.json b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/channelMessage/getAll.json
new file mode 100644
index 0000000000..6b36c47cb9
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/channelMessage/getAll.json
@@ -0,0 +1,247 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "replyToId": {
+            "type": "null"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "messageType": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "chatId": {
+            "type": "null"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "string"
+        },
+        "policyViolation": {
+            "type": "null"
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "device": {
+                    "type": "null"
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "@odata.type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "userIdentityType": {
+                            "type": "string"
+                        },
+                        "tenantId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "@odata.type",
+                        "id",
+                        "displayName",
+                        "userIdentityType",
+                        "tenantId"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "device",
+                "user"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "channelIdentity": {
+            "type": "object",
+            "properties": {
+                "teamId": {
+                    "type": "string"
+                },
+                "channelId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "teamId",
+                "channelId"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "contentType": {
+                        "type": "string"
+                    },
+                    "thumbnailUrl": {
+                        "type": "null"
+                    },
+                    "teamsAppId": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "contentType",
+                    "contentUrl",
+                    "content",
+                    "name",
+                    "thumbnailUrl",
+                    "teamsAppId"
+                ]
+            }
+        },
+        "mentions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "mentionText": {
+                        "type": "string"
+                    },
+                    "mentioned": {
+                        "type": "object",
+                        "properties": {
+                            "application": {
+                                "type": "null"
+                            },
+                            "device": {
+                                "type": "null"
+                            },
+                            "tag": {
+                                "type": "null"
+                            }
+                        },
+                        "required": [
+                            "application",
+                            "device",
+                            "conversation",
+                            "tag",
+                            "user"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "mentionText",
+                    "mentioned"
+                ]
+            }
+        },
+        "reactions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "reactionType": {
+                        "type": "string"
+                    },
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "reactionContentUrl": {
+                        "type": "null"
+                    },
+                    "createdDateTime": {
+                        "type": "string"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "application": {
+                                "type": "null"
+                            },
+                            "device": {
+                                "type": "null"
+                            },
+                            "user": {
+                                "type": "object",
+                                "properties": {
+                                    "@odata.type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "displayName": {
+                                        "type": "null"
+                                    },
+                                    "userIdentityType": {
+                                        "type": "string"
+                                    },
+                                    "tenantId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "@odata.type",
+                                    "id",
+                                    "displayName",
+                                    "userIdentityType",
+                                    "tenantId"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "application",
+                            "device",
+                            "user"
+                        ]
+                    }
+                },
+                "required": [
+                    "reactionType",
+                    "displayName",
+                    "reactionContentUrl",
+                    "createdDateTime",
+                    "user"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/create.json b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/create.json
new file mode 100644
index 0000000000..93ccc7eeaa
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/create.json
@@ -0,0 +1,142 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "replyToId": {
+            "type": "null"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "messageType": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "lastEditedDateTime": {
+            "type": "null"
+        },
+        "deletedDateTime": {
+            "type": "null"
+        },
+        "subject": {
+            "type": "null"
+        },
+        "summary": {
+            "type": "null"
+        },
+        "chatId": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "null"
+        },
+        "channelIdentity": {
+            "type": "null"
+        },
+        "policyViolation": {
+            "type": "null"
+        },
+        "eventDetail": {
+            "type": "null"
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "application": {
+                    "type": "null"
+                },
+                "device": {
+                    "type": "null"
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "@odata.type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "userIdentityType": {
+                            "type": "string"
+                        },
+                        "tenantId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "@odata.type",
+                        "id",
+                        "displayName",
+                        "userIdentityType",
+                        "tenantId"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "device",
+                "user"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context",
+        "id",
+        "replyToId",
+        "etag",
+        "messageType",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "lastEditedDateTime",
+        "deletedDateTime",
+        "subject",
+        "summary",
+        "chatId",
+        "importance",
+        "locale",
+        "webUrl",
+        "channelIdentity",
+        "policyViolation",
+        "eventDetail",
+        "from",
+        "body",
+        "attachments",
+        "mentions",
+        "reactions"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/get.json b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/get.json
new file mode 100644
index 0000000000..4760c1360f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/get.json
@@ -0,0 +1,178 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "replyToId": {
+            "type": "null"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "messageType": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "lastEditedDateTime": {
+            "type": "null"
+        },
+        "deletedDateTime": {
+            "type": "null"
+        },
+        "subject": {
+            "type": "null"
+        },
+        "summary": {
+            "type": "null"
+        },
+        "chatId": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "null"
+        },
+        "channelIdentity": {
+            "type": "null"
+        },
+        "policyViolation": {
+            "type": "null"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "contentType": {
+                        "type": "string"
+                    },
+                    "contentUrl": {
+                        "type": "null"
+                    },
+                    "content": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "null"
+                    },
+                    "thumbnailUrl": {
+                        "type": "null"
+                    },
+                    "teamsAppId": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "contentType",
+                    "contentUrl",
+                    "content",
+                    "name",
+                    "thumbnailUrl",
+                    "teamsAppId"
+                ]
+            }
+        },
+        "mentions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "mentionText": {
+                        "type": "string"
+                    },
+                    "mentioned": {
+                        "type": "object",
+                        "properties": {
+                            "device": {
+                                "type": "null"
+                            },
+                            "user": {
+                                "type": "null"
+                            },
+                            "conversation": {
+                                "type": "null"
+                            },
+                            "tag": {
+                                "type": "null"
+                            },
+                            "application": {
+                                "type": "object",
+                                "properties": {
+                                    "@odata.type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "displayName": {
+                                        "type": "string"
+                                    },
+                                    "applicationIdentityType": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "@odata.type",
+                                    "id",
+                                    "displayName",
+                                    "applicationIdentityType"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "device",
+                            "user",
+                            "conversation",
+                            "tag",
+                            "application"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "mentionText",
+                    "mentioned"
+                ]
+            }
+        }
+    },
+    "required": [
+        "@odata.context"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/getAll.json b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/getAll.json
new file mode 100644
index 0000000000..7366b86ce4
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/__schema__/v2.0.0/chatMessage/getAll.json
@@ -0,0 +1,281 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "replyToId": {
+            "type": "null"
+        },
+        "etag": {
+            "type": "string"
+        },
+        "messageType": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "chatId": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "webUrl": {
+            "type": "null"
+        },
+        "channelIdentity": {
+            "type": "null"
+        },
+        "policyViolation": {
+            "type": "null"
+        },
+        "from": {
+            "type": "object",
+            "properties": {
+                "device": {
+                    "type": "null"
+                },
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "@odata.type": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "displayName": {
+                            "type": "string"
+                        },
+                        "userIdentityType": {
+                            "type": "string"
+                        },
+                        "tenantId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "@odata.type",
+                        "id",
+                        "displayName",
+                        "userIdentityType"
+                    ]
+                }
+            },
+            "required": [
+                "application",
+                "device",
+                "user"
+            ]
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "contentType": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "contentType",
+                "content"
+            ]
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "contentType": {
+                        "type": "string"
+                    },
+                    "thumbnailUrl": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "contentType",
+                    "contentUrl",
+                    "content",
+                    "name",
+                    "thumbnailUrl",
+                    "teamsAppId"
+                ]
+            }
+        },
+        "mentions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "mentionText": {
+                        "type": "string"
+                    },
+                    "mentioned": {
+                        "type": "object",
+                        "properties": {
+                            "application": {
+                                "type": "null"
+                            },
+                            "device": {
+                                "type": "null"
+                            },
+                            "conversation": {
+                                "type": "null"
+                            },
+                            "tag": {
+                                "type": "null"
+                            },
+                            "user": {
+                                "type": "object",
+                                "properties": {
+                                    "@odata.type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "displayName": {
+                                        "type": "string"
+                                    },
+                                    "userIdentityType": {
+                                        "type": "string"
+                                    },
+                                    "tenantId": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "@odata.type",
+                                    "id",
+                                    "displayName",
+                                    "userIdentityType",
+                                    "tenantId"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "application",
+                            "device",
+                            "conversation",
+                            "tag",
+                            "user"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "mentionText",
+                    "mentioned"
+                ]
+            }
+        },
+        "reactions": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "reactionType": {
+                        "type": "string"
+                    },
+                    "displayName": {
+                        "type": "string"
+                    },
+                    "reactionContentUrl": {
+                        "type": "null"
+                    },
+                    "createdDateTime": {
+                        "type": "string"
+                    },
+                    "user": {
+                        "type": "object",
+                        "properties": {
+                            "application": {
+                                "type": "null"
+                            },
+                            "device": {
+                                "type": "null"
+                            },
+                            "user": {
+                                "type": "object",
+                                "properties": {
+                                    "@odata.type": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "displayName": {
+                                        "type": "null"
+                                    },
+                                    "userIdentityType": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "@odata.type",
+                                    "id",
+                                    "displayName",
+                                    "userIdentityType"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "application",
+                            "device",
+                            "user"
+                        ]
+                    }
+                },
+                "required": [
+                    "reactionType",
+                    "displayName",
+                    "reactionContentUrl",
+                    "createdDateTime",
+                    "user"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "replyToId",
+        "etag",
+        "messageType",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "lastEditedDateTime",
+        "deletedDateTime",
+        "subject",
+        "summary",
+        "chatId",
+        "importance",
+        "locale",
+        "webUrl",
+        "channelIdentity",
+        "policyViolation",
+        "eventDetail",
+        "from",
+        "body",
+        "attachments",
+        "mentions",
+        "reactions"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
index cea94648c3..6e5eef1b7f 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -30,16 +29,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, channel => create', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
index dfd9701049..6ffe72bbe4 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -18,16 +17,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, channel => deleteChannel', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
index fa54945b7e..6d46fa9e69 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -31,16 +30,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, channel => get', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
index 6ffa8ade53..ed462d0d2c 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -55,16 +54,6 @@ microsoftApiRequestSpy.mockImplementation(async (_, method: string) => {
 describe('Test MicrosoftTeamsV2, channel => getAll', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
index 364b4df799..c1868a2eac 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -18,16 +17,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, channel => update', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channel/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
index ec15aa2b13..6e1659c2bd 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -60,16 +59,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, channelMessage => create', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channelMessage/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
index 8c1152e82d..5c5a86085f 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -72,16 +71,6 @@ microsoftApiRequestSpy.mockImplementation(async (_, method: string) => {
 describe('Test MicrosoftTeamsV2, channelMessage => getAll', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
index 305c0069b0..1954ecd77a 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -56,16 +55,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, chatMessage => create', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
index 20c20ba4b9..62e7ae485b 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -57,16 +56,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, chatMessage => get', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
index 4d340a763a..1ac2774de3 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -95,16 +94,6 @@ microsoftApiRequestSpy.mockImplementation(async (_, method: string) => {
 describe('Test MicrosoftTeamsV2, chatMessage => getAll', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/sendAndWait.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/sendAndWait.test.ts
new file mode 100644
index 0000000000..2a803b11c2
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/sendAndWait.test.ts
@@ -0,0 +1,69 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { SEND_AND_WAIT_OPERATION, type IExecuteFunctions, type INode } from 'n8n-workflow';
+
+import { versionDescription } from '../../../../v2/actions/versionDescription';
+import { MicrosoftTeamsV2 } from '../../../../v2/MicrosoftTeamsV2.node';
+import * as transport from '../../../../v2/transport';
+
+jest.mock('../../../../v2/transport', () => {
+	const originalModule = jest.requireActual('../../../../v2/transport');
+	return {
+		...originalModule,
+		microsoftApiRequest: jest.fn(),
+	};
+});
+
+describe('Test MicrosoftTeamsV2, chatMessage => sendAndWait', () => {
+	let microsoftTeamsV2: MicrosoftTeamsV2;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		microsoftTeamsV2 = new MicrosoftTeamsV2(versionDescription);
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		mockExecuteFunctions.getNodeParameter.mockImplementation((key: string) => {
+			if (key === 'operation') return SEND_AND_WAIT_OPERATION;
+			if (key === 'resource') return 'chatMessage';
+			if (key === 'chatId') return 'chatID';
+			if (key === 'message') return 'my message';
+			if (key === 'subject') return '';
+			if (key === 'approvalOptions.values') return {};
+			if (key === 'responseType') return 'approval';
+			if (key === 'options.limitWaitTime.values') return {};
+		});
+
+		mockExecuteFunctions.putExecutionToWait.mockImplementation();
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 2 }));
+
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+
+		const result = await microsoftTeamsV2.execute.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+		expect(transport.microsoftApiRequest).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(transport.microsoftApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/v1.0/chats/chatID/messages',
+			{
+				body: {
+					content:
+						'my message<br><br><a href="http://localhost/waiting-webhook/nodeID?approved=true">Approve</a><br><br><em>This message was sent automatically with <a href="https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.microsoftTeams_instanceId">n8n</a></em>',
+					contentType: 'html',
+				},
+			},
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
index f550bd075b..60635dd0dc 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -68,16 +67,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, task => create', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
index f7694b1cf0..f3442cb31d 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -23,16 +22,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, task => deleteTask', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/deleteTask.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
index f70d458efb..7f41b6e471 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -68,16 +67,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, task => get', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
index 42ce214d85..177d34e938 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -163,16 +162,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, task => getAll', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
index 9ec11c99bb..a48fc67b20 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -23,16 +22,6 @@ microsoftApiRequestSpy.mockImplementation(async (method: string) => {
 describe('Test MicrosoftTeamsV2, task => update', () => {
 	const workflows = ['nodes/Microsoft/Teams/test/v2/node/task/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.resetAllMocks();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
index fbb54a05a0..f8a4fa6559 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
@@ -8,6 +8,7 @@ import type {
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { listSearch } from './methods';
+import { sendAndWaitWebhook } from '../../../../utils/sendAndWait/utils';
 
 export class MicrosoftTeamsV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -16,11 +17,14 @@ export class MicrosoftTeamsV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
 	methods = { listSearch };
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions) {
 		return await router.call(this);
 	}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts
index 1ae403bddc..955357ea47 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/index.ts
@@ -1,10 +1,11 @@
-import type { INodeProperties } from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
 
 import * as create from './create.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
+import * as sendAndWait from './sendAndWait.operation';
 
-export { create, get, getAll };
+export { create, get, getAll, sendAndWait };
 
 export const description: INodeProperties[] = [
 	{
@@ -36,6 +37,12 @@ export const description: INodeProperties[] = [
 				description: 'Get many messages from a chat',
 				action: 'Get many chat messages',
 			},
+			{
+				name: 'Send and Wait for Response',
+				value: SEND_AND_WAIT_OPERATION,
+				description: 'Send a message and wait for response',
+				action: 'Send message and wait for response',
+			},
 		],
 		default: 'create',
 	},
@@ -43,4 +50,5 @@ export const description: INodeProperties[] = [
 	...create.description,
 	...get.description,
 	...getAll.description,
+	...sendAndWait.description,
 ];
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/sendAndWait.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/sendAndWait.operation.ts
new file mode 100644
index 0000000000..e62309f9a8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/sendAndWait.operation.ts
@@ -0,0 +1,44 @@
+import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
+
+import {
+	getSendAndWaitConfig,
+	getSendAndWaitProperties,
+} from '../../../../../../utils/sendAndWait/utils';
+import { createUtmCampaignLink } from '../../../../../../utils/utilities';
+import { chatRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
+export const description: INodeProperties[] = getSendAndWaitProperties(
+	[chatRLC],
+	'chatMessage',
+	undefined,
+	{
+		noButtonStyle: true,
+		defaultApproveLabel: '✓ Approve',
+		defaultDisapproveLabel: '✗ Decline',
+	},
+).filter((p) => p.name !== 'subject');
+
+export async function execute(this: IExecuteFunctions, i: number, instanceId: string) {
+	const chatId = this.getNodeParameter('chatId', i, '', { extractValue: true }) as string;
+	const config = getSendAndWaitConfig(this);
+
+	const attributionText = 'This message was sent automatically with';
+	const link = createUtmCampaignLink('n8n-nodes-base.microsoftTeams', instanceId);
+	const attribution = `<em>${attributionText} <a href="${link}">n8n</a></em>`;
+
+	const buttons = config.options.map(
+		(option) => `<a href="${config.url}?approved=${option.value}">${option.label}</a>`,
+	);
+
+	const content = `${config.message}<br><br>${buttons.join(' ')}<br><br>${attribution}`;
+
+	const body = {
+		body: {
+			contentType: 'html',
+			content,
+		},
+	};
+
+	return await microsoftApiRequest.call(this, 'POST', `/v1.0/chats/${chatId}/messages`, body);
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts
index f4c7753709..42afa7a2bf 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/node.type.ts
@@ -3,7 +3,7 @@ import type { AllEntities } from 'n8n-workflow';
 type NodeMap = {
 	channel: 'create' | 'deleteChannel' | 'get' | 'getAll' | 'update';
 	channelMessage: 'create' | 'getAll';
-	chatMessage: 'create' | 'get' | 'getAll';
+	chatMessage: 'create' | 'get' | 'getAll' | 'sendAndWait';
 	task: 'create' | 'deleteTask' | 'get' | 'getAll' | 'update';
 };
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
index 6e4d966b3e..28c0028f3e 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
@@ -3,6 +3,7 @@ import {
 	type IDataObject,
 	type INodeExecutionData,
 	NodeOperationError,
+	SEND_AND_WAIT_OPERATION,
 } from 'n8n-workflow';
 
 import * as channel from './channel';
@@ -10,6 +11,7 @@ import * as channelMessage from './channelMessage';
 import * as chatMessage from './chatMessage';
 import type { MicrosoftTeamsType } from './node.type';
 import * as task from './task';
+import { configureWaitTillDate } from '../../../../../utils/sendAndWait/utils';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
@@ -27,6 +29,18 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		operation,
 	} as MicrosoftTeamsType;
 
+	if (
+		microsoftTeamsTypeData.resource === 'chatMessage' &&
+		microsoftTeamsTypeData.operation === SEND_AND_WAIT_OPERATION
+	) {
+		await chatMessage[microsoftTeamsTypeData.operation].execute.call(this, 0, instanceId);
+
+		const waitTill = configureWaitTillDate(this);
+
+		await this.putExecutionToWait(waitTill);
+		return [items];
+	}
+
 	for (let i = 0; i < items.length; i++) {
 		try {
 			switch (microsoftTeamsTypeData.resource) {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts
index a8d55cf89d..7374278028 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/versionDescription.ts
@@ -5,6 +5,7 @@ import * as channel from './channel';
 import * as channelMessage from './channelMessage';
 import * as chatMessage from './chatMessage';
 import * as task from './task';
+import { sendAndWaitWebhooksDescription } from '../../../../../utils/sendAndWait/descriptions';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Teams',
@@ -25,6 +26,7 @@ export const versionDescription: INodeTypeDescription = {
 			required: true,
 		},
 	],
+	webhooks: sendAndWaitWebhooksDescription,
 	properties: [
 		{
 			displayName: 'Resource',
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index 390f38d57a..3bbfc88d50 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -27,6 +27,7 @@ export class MicrosoftToDo implements INodeType {
 		defaults: {
 			name: 'Microsoft To Do',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/list/create.json b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/list/create.json
new file mode 100644
index 0000000000..088ea032f7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/list/create.json
@@ -0,0 +1,35 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "isOwner": {
+            "type": "boolean"
+        },
+        "isShared": {
+            "type": "boolean"
+        },
+        "wellknownListName": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "@odata.context",
+        "@odata.etag",
+        "displayName",
+        "isOwner",
+        "isShared",
+        "wellknownListName",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/list/getAll.json b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/list/getAll.json
new file mode 100644
index 0000000000..407fb47baf
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/list/getAll.json
@@ -0,0 +1,31 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.etag": {
+            "type": "string"
+        },
+        "displayName": {
+            "type": "string"
+        },
+        "isOwner": {
+            "type": "boolean"
+        },
+        "isShared": {
+            "type": "boolean"
+        },
+        "wellknownListName": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "@odata.etag",
+        "displayName",
+        "isOwner",
+        "isShared",
+        "wellknownListName",
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/create.json b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/create.json
new file mode 100644
index 0000000000..adc7042778
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/create.json
@@ -0,0 +1,50 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "isReminderOn": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "contentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "contentType"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/getAll.json b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/getAll.json
new file mode 100644
index 0000000000..e3e3a3f6f8
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/getAll.json
@@ -0,0 +1,81 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.etag": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "isReminderOn": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "id": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "contentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "contentType"
+            ]
+        },
+        "completedDateTime": {
+            "type": "object",
+            "properties": {
+                "dateTime": {
+                    "type": "string"
+                },
+                "timeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "dateTime",
+                "timeZone"
+            ]
+        }
+    },
+    "required": [
+        "@odata.etag",
+        "importance",
+        "isReminderOn",
+        "status",
+        "title",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "hasAttachments",
+        "categories",
+        "id",
+        "body"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/update.json b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/update.json
new file mode 100644
index 0000000000..699c4b8043
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/__schema__/v1.0.0/task/update.json
@@ -0,0 +1,64 @@
+{
+    "type": "object",
+    "properties": {
+        "@odata.context": {
+            "type": "string"
+        },
+        "@odata.etag": {
+            "type": "string"
+        },
+        "importance": {
+            "type": "string"
+        },
+        "isReminderOn": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "createdDateTime": {
+            "type": "string"
+        },
+        "lastModifiedDateTime": {
+            "type": "string"
+        },
+        "hasAttachments": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "body": {
+            "type": "object",
+            "properties": {
+                "content": {
+                    "type": "string"
+                },
+                "contentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "content",
+                "contentType"
+            ]
+        }
+    },
+    "required": [
+        "@odata.context",
+        "@odata.etag",
+        "importance",
+        "isReminderOn",
+        "status",
+        "title",
+        "createdDateTime",
+        "lastModifiedDateTime",
+        "hasAttachments",
+        "categories",
+        "id",
+        "body"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.ts b/packages/nodes-base/nodes/Misp/Misp.node.ts
index 0e42e15bcf..deb953f95e 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.ts
+++ b/packages/nodes-base/nodes/Misp/Misp.node.ts
@@ -54,6 +54,7 @@ export class Misp implements INodeType {
 		defaults: {
 			name: 'MISP',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index e6bc70242c..6240373b98 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -26,6 +26,7 @@ export class Mocean implements INodeType {
 		defaults: {
 			name: 'Mocean',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index a9064ae047..7fd0f0949a 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -37,6 +37,7 @@ export class MondayCom implements INodeType {
 		defaults: {
 			name: 'Monday.com',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/create.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/create.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/get.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/get.json
new file mode 100644
index 0000000000..4a4efe0fc9
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/get.json
@@ -0,0 +1,40 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "board_kind": {
+            "type": "string"
+        },
+        "owners": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "description",
+        "state",
+        "board_folder_id",
+        "board_kind",
+        "owners"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/getAll.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/getAll.json
new file mode 100644
index 0000000000..4a4efe0fc9
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/board/getAll.json
@@ -0,0 +1,40 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "board_kind": {
+            "type": "string"
+        },
+        "owners": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "description",
+        "state",
+        "board_folder_id",
+        "board_kind",
+        "owners"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardColumn/getAll.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardColumn/getAll.json
new file mode 100644
index 0000000000..c7aca6e502
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardColumn/getAll.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "settings_str": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "title",
+        "type",
+        "settings_str",
+        "archived"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardGroup/getAll.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardGroup/getAll.json
new file mode 100644
index 0000000000..14057b016d
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardGroup/getAll.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "color": {
+            "type": "string"
+        },
+        "position": {
+            "type": "string"
+        },
+        "archived": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "title",
+        "color",
+        "position",
+        "archived"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/addUpdate.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/addUpdate.json
new file mode 100644
index 0000000000..6b84d794c1
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/addUpdate.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/changeColumnValue.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/changeColumnValue.json
new file mode 100644
index 0000000000..6b84d794c1
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/changeColumnValue.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/changeMultipleColumnValues.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/changeMultipleColumnValues.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/changeMultipleColumnValues.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/create.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/create.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/delete.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/delete.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/delete.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/get.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/get.json
new file mode 100644
index 0000000000..bd75f9e815
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/get.json
@@ -0,0 +1,65 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "column_values": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "column": {
+                        "type": "object",
+                        "properties": {
+                            "title": {
+                                "type": "string"
+                            },
+                            "archived": {
+                                "type": "boolean"
+                            },
+                            "settings_str": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "title",
+                            "archived",
+                            "description",
+                            "settings_str"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "text",
+                    "type",
+                    "value",
+                    "column"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "created_at",
+        "state",
+        "column_values"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/getAll.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/getAll.json
new file mode 100644
index 0000000000..bd75f9e815
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/getAll.json
@@ -0,0 +1,65 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "column_values": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "column": {
+                        "type": "object",
+                        "properties": {
+                            "title": {
+                                "type": "string"
+                            },
+                            "archived": {
+                                "type": "boolean"
+                            },
+                            "settings_str": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "title",
+                            "archived",
+                            "description",
+                            "settings_str"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "text",
+                    "type",
+                    "value",
+                    "column"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "created_at",
+        "state",
+        "column_values"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/getByColumnValue.json b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/getByColumnValue.json
new file mode 100644
index 0000000000..c2d55f569d
--- /dev/null
+++ b/packages/nodes-base/nodes/MondayCom/__schema__/v1.0.0/boardItem/getByColumnValue.json
@@ -0,0 +1,77 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "board": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "column_values": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "column": {
+                        "type": "object",
+                        "properties": {
+                            "title": {
+                                "type": "string"
+                            },
+                            "archived": {
+                                "type": "boolean"
+                            },
+                            "settings_str": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "title",
+                            "archived",
+                            "description",
+                            "settings_str"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "text",
+                    "type",
+                    "value",
+                    "column"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "created_at",
+        "state",
+        "board",
+        "column_values"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 349e56fd43..274ae50173 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -28,7 +28,6 @@ import {
 } from './GenericFunctions';
 import type { IMongoParametricCredentials } from './mongoDb.types';
 import { nodeProperties } from './MongoDbProperties';
-import { generatePairedItemData } from '../../utils/utilities';
 
 export class MongoDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -118,7 +117,7 @@ export class MongoDb implements INodeType {
 		if (nodeVersion >= 1.1) {
 			itemsLength = items.length;
 		} else {
-			fallbackPairedItems = generatePairedItemData(items.length);
+			fallbackPairedItems = [];
 		}
 
 		if (operation === 'aggregate') {
@@ -235,7 +234,6 @@ export class MongoDb implements INodeType {
 		}
 
 		if (operation === 'findOneAndReplace') {
-			fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
 			const fields = prepareFields(this.getNodeParameter('fields', 0) as string);
 			const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean;
 			const dateFields = prepareFields(
@@ -270,14 +268,10 @@ export class MongoDb implements INodeType {
 				}
 			}
 
-			returnData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(updateItems),
-				{ itemData: fallbackPairedItems },
-			);
+			returnData = this.helpers.returnJsonArray(updateItems);
 		}
 
 		if (operation === 'findOneAndUpdate') {
-			fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
 			const fields = prepareFields(this.getNodeParameter('fields', 0) as string);
 			const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean;
 			const dateFields = prepareFields(
@@ -312,14 +306,10 @@ export class MongoDb implements INodeType {
 				}
 			}
 
-			returnData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(updateItems),
-				{ itemData: fallbackPairedItems },
-			);
+			returnData = this.helpers.returnJsonArray(updateItems);
 		}
 
 		if (operation === 'insert') {
-			fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
 			let responseData: IDataObject[] = [];
 			try {
 				// Prepare the data to insert and copy it to be returned
@@ -350,14 +340,10 @@ export class MongoDb implements INodeType {
 				}
 			}
 
-			returnData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
-				{ itemData: fallbackPairedItems },
-			);
+			returnData = this.helpers.returnJsonArray(responseData);
 		}
 
 		if (operation === 'update') {
-			fallbackPairedItems = fallbackPairedItems ?? generatePairedItemData(items.length);
 			const fields = prepareFields(this.getNodeParameter('fields', 0) as string);
 			const useDotNotation = this.getNodeParameter('options.useDotNotation', 0, false) as boolean;
 			const dateFields = prepareFields(
@@ -392,10 +378,7 @@ export class MongoDb implements INodeType {
 				}
 			}
 
-			returnData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(updateItems),
-				{ itemData: fallbackPairedItems },
-			);
+			returnData = this.helpers.returnJsonArray(updateItems);
 		}
 
 		await client.close();
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
index 30bb08789b..730dbc39f8 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
@@ -55,6 +55,7 @@ export class MonicaCrm implements INodeType {
 		defaults: {
 			name: 'Monica CRM',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index 9067fec27a..1ce599a75e 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -23,6 +23,7 @@ export class Msg91 implements INodeType {
 		defaults: {
 			name: 'MSG91',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/deleteTable.json b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/deleteTable.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/deleteTable.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/insert.json b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/insert.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/insert.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/update.json b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/update.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/upsert.json b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/upsert.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/MySql/__schema__/v2.4.0/database/upsert.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
index b9dff77153..b31cd493f7 100644
--- a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes } from 'n8n-workflow';
-import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
@@ -25,16 +24,6 @@ jest.mock('../../v1/GenericFunctions', () => {
 describe('Test MySqlV1, executeQuery', () => {
 	const workflows = ['nodes/MySql/test/v1/executeQuery.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../v1/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
index d477668662..75b5bff71a 100644
--- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
+++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
@@ -10,17 +10,10 @@ describe('Test N8n Node, expect base_url to be received from credentials', () =>
 	const tests = workflowToTests(workflows);
 
 	beforeAll(() => {
-		nock.disableNetConnect();
-
 		//base url is set in fake credentials map packages/nodes-base/test/nodes/FakeCredentialsMap.ts
 		const baseUrl = 'https://test.app.n8n.cloud/api/v1';
 		nock(baseUrl).get('/workflows?tags=n8n-test').reply(200, {});
 	});
-
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/credential/create.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/credential/create.json
new file mode 100644
index 0000000000..2529a3f347
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/credential/create.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "name",
+        "type",
+        "id",
+        "createdAt",
+        "updatedAt"
+    ]
+}
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/execution/get.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/execution/get.json
new file mode 100644
index 0000000000..3da4591dea
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/execution/get.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "finished": {
+            "type": "boolean"
+        },
+        "mode": {
+            "type": "string"
+        },
+        "retryOf": {
+            "type": "null"
+        },
+        "retrySuccessId": {
+            "type": "null"
+        },
+        "status": {
+            "type": "string"
+        },
+        "startedAt": {
+            "type": "string"
+        },
+        "deletedAt": {
+            "type": "null"
+        },
+        "workflowId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/execution/getAll.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/execution/getAll.json
new file mode 100644
index 0000000000..77e45e01fd
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/execution/getAll.json
@@ -0,0 +1,31 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "finished": {
+            "type": "boolean"
+        },
+        "mode": {
+            "type": "string"
+        },
+        "stoppedAt": {
+            "type": "string"
+        },
+        "workflowId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "finished",
+        "mode",
+        "retryOf",
+        "retrySuccessId",
+        "startedAt",
+        "stoppedAt",
+        "workflowId",
+        "waitTill"
+    ]
+}
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/create.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/create.json
new file mode 100644
index 0000000000..94d93ece3d
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/create.json
@@ -0,0 +1,98 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "nodes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "credentials": {
+                        "type": "object",
+                        "properties": {
+                            "googleSheetsOAuth2Api": {
+                                "type": "object",
+                                "properties": {
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "id",
+                                    "name"
+                                ]
+                            }
+                        }
+                    }
+                },
+                "required": [
+                    "parameters",
+                    "name",
+                    "type",
+                    "typeVersion",
+                    "position",
+                    "id"
+                ]
+            }
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "versionId": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "meta": {
+            "type": "null"
+        },
+        "pinData": {
+            "type": "null"
+        },
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "triggerCount": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "name",
+        "nodes",
+        "settings",
+        "connections",
+        "staticData",
+        "active",
+        "versionId",
+        "id",
+        "meta",
+        "pinData",
+        "createdAt",
+        "updatedAt",
+        "triggerCount"
+    ]
+}
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/get.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/get.json
new file mode 100644
index 0000000000..28b33e4ee9
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/get.json
@@ -0,0 +1,239 @@
+{
+    "type": "object",
+    "properties": {
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "nodes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "operation": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "parameters",
+                    "id",
+                    "name",
+                    "type",
+                    "typeVersion",
+                    "position"
+                ]
+            }
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "executionOrder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "executionOrder"
+            ]
+        },
+        "versionId": {
+            "type": "string"
+        },
+        "triggerCount": {
+            "type": "integer"
+        },
+        "shared": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "createdAt": {
+                        "type": "string"
+                    },
+                    "updatedAt": {
+                        "type": "string"
+                    },
+                    "role": {
+                        "type": "string"
+                    },
+                    "workflowId": {
+                        "type": "string"
+                    },
+                    "projectId": {
+                        "type": "string"
+                    },
+                    "project": {
+                        "type": "object",
+                        "properties": {
+                            "createdAt": {
+                                "type": "string"
+                            },
+                            "updatedAt": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "projectRelations": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "createdAt": {
+                                            "type": "string"
+                                        },
+                                        "updatedAt": {
+                                            "type": "string"
+                                        },
+                                        "role": {
+                                            "type": "string"
+                                        },
+                                        "userId": {
+                                            "type": "string"
+                                        },
+                                        "projectId": {
+                                            "type": "string"
+                                        },
+                                        "user": {
+                                            "type": "object",
+                                            "properties": {
+                                                "createdAt": {
+                                                    "type": "string"
+                                                },
+                                                "updatedAt": {
+                                                    "type": "string"
+                                                },
+                                                "id": {
+                                                    "type": "string"
+                                                },
+                                                "email": {
+                                                    "type": "string"
+                                                },
+                                                "firstName": {
+                                                    "type": "string"
+                                                },
+                                                "lastName": {
+                                                    "type": "string"
+                                                },
+                                                "role": {
+                                                    "type": "string"
+                                                },
+                                                "disabled": {
+                                                    "type": "boolean"
+                                                },
+                                                "mfaEnabled": {
+                                                    "type": "boolean"
+                                                },
+                                                "isPending": {
+                                                    "type": "boolean"
+                                                },
+                                                "isOwner": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "createdAt",
+                                                "updatedAt",
+                                                "id",
+                                                "email",
+                                                "firstName",
+                                                "lastName",
+                                                "personalizationAnswers",
+                                                "settings",
+                                                "role",
+                                                "disabled",
+                                                "mfaEnabled",
+                                                "isPending",
+                                                "isOwner"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "createdAt",
+                                        "updatedAt",
+                                        "role",
+                                        "userId",
+                                        "projectId",
+                                        "user"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "createdAt",
+                            "updatedAt",
+                            "id",
+                            "name",
+                            "type",
+                            "projectRelations"
+                        ]
+                    }
+                },
+                "required": [
+                    "createdAt",
+                    "updatedAt",
+                    "role",
+                    "workflowId",
+                    "projectId",
+                    "project"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "createdAt": {
+                        "type": "string"
+                    },
+                    "updatedAt": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "createdAt",
+                    "updatedAt",
+                    "id",
+                    "name"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/getAll.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/getAll.json
new file mode 100644
index 0000000000..03631fe3b9
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/getAll.json
@@ -0,0 +1,179 @@
+{
+    "type": "object",
+    "properties": {
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "nodes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "parameters": {
+                        "type": "object",
+                        "properties": {
+                            "url": {
+                                "type": "string"
+                            },
+                            "assignments": {
+                                "type": "object",
+                                "properties": {
+                                    "assignments": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "id": {
+                                                    "type": "string"
+                                                },
+                                                "name": {
+                                                    "type": "string"
+                                                },
+                                                "value": {
+                                                    "type": "string"
+                                                },
+                                                "type": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "id",
+                                                "name",
+                                                "value",
+                                                "type"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "assignments"
+                                ]
+                            },
+                            "authentication": {
+                                "type": "string"
+                            },
+                            "jsCode": {
+                                "type": "string"
+                            },
+                            "resource": {
+                                "type": "string"
+                            },
+                            "operation": {
+                                "type": "string"
+                            },
+                            "path": {
+                                "type": "string"
+                            }
+                        }
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "webhookId": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "parameters",
+                    "name",
+                    "type",
+                    "typeVersion",
+                    "position"
+                ]
+            }
+        },
+        "connections": {
+            "type": "object",
+            "properties": {
+                "When clicking ‘Test workflow’": {
+                    "type": "object",
+                    "properties": {
+                        "main": {
+                            "type": "array",
+                            "items": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "node": {
+                                            "type": "string"
+                                        },
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "index": {
+                                            "type": "integer"
+                                        }
+                                    },
+                                    "required": [
+                                        "node",
+                                        "type",
+                                        "index"
+                                    ]
+                                }
+                            }
+                        }
+                    },
+                    "required": [
+                        "main"
+                    ]
+                }
+            }
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "executionOrder": {
+                    "type": "string"
+                }
+            }
+        },
+        "triggerCount": {
+            "type": "integer"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "createdAt": {
+                        "type": "string"
+                    },
+                    "updatedAt": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "createdAt",
+                    "updatedAt",
+                    "id",
+                    "name"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/update.json b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/update.json
new file mode 100644
index 0000000000..90ec628334
--- /dev/null
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/__schema__/v1.0.0/workflow/update.json
@@ -0,0 +1,83 @@
+{
+    "type": "object",
+    "properties": {
+        "createdAt": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "nodes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "webhookId": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "parameters",
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "executionOrder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "executionOrder"
+            ]
+        },
+        "versionId": {
+            "type": "string"
+        },
+        "triggerCount": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "createdAt",
+        "updatedAt",
+        "id",
+        "name",
+        "active",
+        "nodes",
+        "connections",
+        "settings",
+        "staticData",
+        "meta",
+        "pinData",
+        "versionId",
+        "triggerCount"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 36e33e5ed3..0385caec22 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -23,6 +23,7 @@ export class Nasa implements INodeType {
 		defaults: {
 			name: 'NASA',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Nasa/__schema__/v1.0.0/astronomyPictureOfTheDay/get.json b/packages/nodes-base/nodes/Nasa/__schema__/v1.0.0/astronomyPictureOfTheDay/get.json
new file mode 100644
index 0000000000..b73ef63d41
--- /dev/null
+++ b/packages/nodes-base/nodes/Nasa/__schema__/v1.0.0/astronomyPictureOfTheDay/get.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "copyright": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "explanation": {
+            "type": "string"
+        },
+        "hdurl": {
+            "type": "string"
+        },
+        "media_type": {
+            "type": "string"
+        },
+        "service_version": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Nasa/__schema__/v1.0.0/donkiSolarFlare/get.json b/packages/nodes-base/nodes/Nasa/__schema__/v1.0.0/donkiSolarFlare/get.json
new file mode 100644
index 0000000000..b1a1e72f08
--- /dev/null
+++ b/packages/nodes-base/nodes/Nasa/__schema__/v1.0.0/donkiSolarFlare/get.json
@@ -0,0 +1,68 @@
+{
+    "type": "object",
+    "properties": {
+        "flrID": {
+            "type": "string"
+        },
+        "catalog": {
+            "type": "string"
+        },
+        "instruments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "displayName": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "displayName"
+                ]
+            }
+        },
+        "beginTime": {
+            "type": "string"
+        },
+        "peakTime": {
+            "type": "string"
+        },
+        "endTime": {
+            "type": "string"
+        },
+        "classType": {
+            "type": "string"
+        },
+        "sourceLocation": {
+            "type": "string"
+        },
+        "note": {
+            "type": "string"
+        },
+        "submissionTime": {
+            "type": "string"
+        },
+        "versionId": {
+            "type": "integer"
+        },
+        "link": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "flrID",
+        "catalog",
+        "instruments",
+        "beginTime",
+        "peakTime",
+        "endTime",
+        "classType",
+        "sourceLocation",
+        "activeRegionNum",
+        "note",
+        "submissionTime",
+        "versionId",
+        "link",
+        "linkedEvents"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
index 43894ea130..2420db008f 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
@@ -25,6 +25,7 @@ export class Netlify implements INodeType {
 		defaults: {
 			name: 'Netlify',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index bcae490194..87568540a6 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -27,6 +27,7 @@ export class NextCloud implements INodeType {
 		defaults: {
 			name: 'Nextcloud',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/file/download.json b/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/file/download.json
new file mode 100644
index 0000000000..499f4d905c
--- /dev/null
+++ b/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/file/download.json
@@ -0,0 +1,38 @@
+{
+    "type": "object",
+    "properties": {
+        "timestamp": {
+            "type": "string"
+        },
+        "Readable date": {
+            "type": "string"
+        },
+        "Readable time": {
+            "type": "string"
+        },
+        "Day of week": {
+            "type": "string"
+        },
+        "Year": {
+            "type": "string"
+        },
+        "Month": {
+            "type": "string"
+        },
+        "Day of month": {
+            "type": "string"
+        },
+        "Hour": {
+            "type": "string"
+        },
+        "Minute": {
+            "type": "string"
+        },
+        "Second": {
+            "type": "string"
+        },
+        "Timezone": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/folder/create.json b/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/folder/create.json
new file mode 100644
index 0000000000..0d1dd35817
--- /dev/null
+++ b/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/folder/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "error": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "error"
+    ]
+}
diff --git a/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/folder/list.json b/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/folder/list.json
new file mode 100644
index 0000000000..03e39c6e41
--- /dev/null
+++ b/packages/nodes-base/nodes/NextCloud/__schema__/v1.0.0/folder/list.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "path": {
+            "type": "string"
+        },
+        "lastModified": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "eTag": {
+            "type": "string"
+        },
+        "contentLength": {
+            "type": "string"
+        },
+        "contentType": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "path",
+        "lastModified",
+        "type",
+        "eTag"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/block/append.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/block/append.json
new file mode 100644
index 0000000000..7639597673
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/block/append.json
@@ -0,0 +1,181 @@
+{
+    "type": "object",
+    "properties": {
+        "object": {
+            "type": "string"
+        },
+        "results": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "object": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "parent": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "page_id": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "type"
+                        ]
+                    },
+                    "created_time": {
+                        "type": "string"
+                    },
+                    "last_edited_time": {
+                        "type": "string"
+                    },
+                    "created_by": {
+                        "type": "object",
+                        "properties": {
+                            "object": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "object",
+                            "id"
+                        ]
+                    },
+                    "last_edited_by": {
+                        "type": "object",
+                        "properties": {
+                            "object": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "object",
+                            "id"
+                        ]
+                    },
+                    "has_children": {
+                        "type": "boolean"
+                    },
+                    "archived": {
+                        "type": "boolean"
+                    },
+                    "in_trash": {
+                        "type": "boolean"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "paragraph": {
+                        "type": "object",
+                        "properties": {
+                            "color": {
+                                "type": "string"
+                            },
+                            "text": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "text": {
+                                            "type": "object",
+                                            "properties": {
+                                                "content": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "content",
+                                                "link"
+                                            ]
+                                        },
+                                        "annotations": {
+                                            "type": "object",
+                                            "properties": {
+                                                "bold": {
+                                                    "type": "boolean"
+                                                },
+                                                "italic": {
+                                                    "type": "boolean"
+                                                },
+                                                "strikethrough": {
+                                                    "type": "boolean"
+                                                },
+                                                "underline": {
+                                                    "type": "boolean"
+                                                },
+                                                "code": {
+                                                    "type": "boolean"
+                                                },
+                                                "color": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "bold",
+                                                "italic",
+                                                "strikethrough",
+                                                "underline",
+                                                "code",
+                                                "color"
+                                            ]
+                                        },
+                                        "plain_text": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "type",
+                                        "annotations",
+                                        "plain_text",
+                                        "href"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "color",
+                            "text"
+                        ]
+                    }
+                },
+                "required": [
+                    "object",
+                    "id",
+                    "parent",
+                    "created_time",
+                    "last_edited_time",
+                    "created_by",
+                    "last_edited_by",
+                    "has_children",
+                    "archived",
+                    "in_trash",
+                    "type"
+                ]
+            }
+        },
+        "next_cursor": {
+            "type": "null"
+        },
+        "has_more": {
+            "type": "boolean"
+        },
+        "request_id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/block/getAll.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/block/getAll.json
new file mode 100644
index 0000000000..fc466f8948
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/block/getAll.json
@@ -0,0 +1,64 @@
+{
+    "type": "object",
+    "properties": {
+        "object": {
+            "type": "string"
+        },
+        "parent_id": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "parent": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "page_id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type"
+            ]
+        },
+        "last_edited_by": {
+            "type": "object",
+            "properties": {
+                "object": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "object",
+                "id"
+            ]
+        },
+        "has_children": {
+            "type": "boolean"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "in_trash": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "string"
+        },
+        "root_id": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/get.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/get.json
new file mode 100644
index 0000000000..ff77dcfd67
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/get.json
@@ -0,0 +1,18 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/getAll.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/getAll.json
new file mode 100644
index 0000000000..649d0347bb
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/getAll.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/search.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/search.json
new file mode 100644
index 0000000000..e1566bfd5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/database/search.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/create.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/create.json
new file mode 100644
index 0000000000..e1566bfd5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/create.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/get.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/get.json
new file mode 100644
index 0000000000..e1566bfd5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/get.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/getAll.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/getAll.json
new file mode 100644
index 0000000000..ff77dcfd67
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/getAll.json
@@ -0,0 +1,18 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/update.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/update.json
new file mode 100644
index 0000000000..dd5fad18df
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/databasePage/update.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "property_status": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/archive.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/archive.json
new file mode 100644
index 0000000000..e1566bfd5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/archive.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/create.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/create.json
new file mode 100644
index 0000000000..e1566bfd5b
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/create.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/search.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/search.json
new file mode 100644
index 0000000000..ff77dcfd67
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/page/search.json
@@ -0,0 +1,18 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/user/get.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/user/get.json
new file mode 100644
index 0000000000..215782d7ed
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/user/get.json
@@ -0,0 +1,39 @@
+{
+    "type": "object",
+    "properties": {
+        "object": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "person": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        },
+        "request_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "object",
+        "id",
+        "name",
+        "avatar_url",
+        "type",
+        "person"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/user/getAll.json b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/user/getAll.json
new file mode 100644
index 0000000000..1a6e69e746
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/__schema__/v2.2.0/user/getAll.json
@@ -0,0 +1,35 @@
+{
+    "type": "object",
+    "properties": {
+        "object": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "person": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "email"
+            ]
+        }
+    },
+    "required": [
+        "object",
+        "id",
+        "name",
+        "avatar_url",
+        "type"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
index 5bd576ae4c..cd9de28fa5 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -427,16 +426,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, block => append', () => {
 	const workflows = ['nodes/Notion/test/node/v2/block/append.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
index a482d97a06..44d1490cd5 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -223,16 +222,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, block => getAll', () => {
 	const workflows = ['nodes/Notion/test/node/v2/block/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
index b4a36f8629..44b12ea385 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -81,16 +80,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, database => get', () => {
 	const workflows = ['nodes/Notion/test/node/v2/database/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
index 467b630060..de5ebcb33c 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -322,16 +321,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, database => getAll', () => {
 	const workflows = ['nodes/Notion/test/node/v2/database/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
index 4208d1524e..1aeb937f19 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -196,16 +195,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, database => search', () => {
 	const workflows = ['nodes/Notion/test/node/v2/database/search.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
index f2c010e75a..0cf2222ee3 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -97,16 +96,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, databasePage => create', () => {
 	const workflows = ['nodes/Notion/test/node/v2/databasePage/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
index 5b2d5d2eb5..b6164ddd11 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -77,16 +76,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, databasePage => get', () => {
 	const workflows = ['nodes/Notion/test/node/v2/databasePage/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
index 1160e6c971..07e20be464 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -78,16 +77,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, databasePage => getAll', () => {
 	const workflows = ['nodes/Notion/test/node/v2/databasePage/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
index 39531dbac7..964525e571 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -77,16 +76,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, databasePage => update', () => {
 	const workflows = ['nodes/Notion/test/node/v2/databasePage/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
index 72ae18ae01..e4d75c7089 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -77,16 +76,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, page => archive', () => {
 	const workflows = ['nodes/Notion/test/node/v2/page/archive.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
index 85090c7938..3f8373d023 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -72,16 +71,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, page => create', () => {
 	const workflows = ['nodes/Notion/test/node/v2/page/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
index bc4c2d7a92..7ec0dceb79 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -73,16 +72,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, page => search', () => {
 	const workflows = ['nodes/Notion/test/node/v2/page/search.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
index 62ed0ef6e2..a8c971ef2e 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -28,16 +27,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, user => get', () => {
 	const workflows = ['nodes/Notion/test/node/v2/user/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
index 46816dfea2..44a5138704 100644
--- a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -52,16 +51,6 @@ jest.mock('../../../../shared/GenericFunctions', () => {
 describe('Test NotionV2, user => getAll', () => {
 	const workflows = ['nodes/Notion/test/node/v2/user/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../shared/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Npm/Npm.node.ts b/packages/nodes-base/nodes/Npm/Npm.node.ts
index 2eeca1ec30..244bfbc49d 100644
--- a/packages/nodes-base/nodes/Npm/Npm.node.ts
+++ b/packages/nodes-base/nodes/Npm/Npm.node.ts
@@ -16,6 +16,7 @@ export class Npm implements INodeType {
 		defaults: {
 			name: 'npm',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
index 2ae6f93a2b..12cb215935 100644
--- a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
+++ b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
@@ -5,8 +5,6 @@ import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 describe('Test npm Node', () => {
 	beforeAll(() => {
-		nock.disableNetConnect();
-
 		const { registryUrl } = FAKE_CREDENTIALS_DATA.npmApi;
 		const mock = nock(registryUrl); //.matchHeader('Authorization', `Bearer ${accessToken}`);
 
@@ -30,10 +28,6 @@ describe('Test npm Node', () => {
 		});
 	});
 
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const workflows = getWorkflowFilenames(__dirname);
 	testWorkflows(workflows);
 });
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 54ca0621cb..8fc94d69c3 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -50,6 +50,7 @@ export class Odoo implements INodeType {
 		defaults: {
 			name: 'Odoo',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/create.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/create.json
new file mode 100644
index 0000000000..e000fbc256
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/create.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/get.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/get.json
new file mode 100644
index 0000000000..83ebeb5a70
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/get.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..b0ba8ffa90
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "display_name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/create.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/create.json
new file mode 100644
index 0000000000..e000fbc256
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/create.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/get.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/get.json
new file mode 100644
index 0000000000..c98b05c97f
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/get.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/getAll.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/getAll.json
new file mode 100644
index 0000000000..c98b05c97f
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/custom/getAll.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/opportunity/create.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/opportunity/create.json
new file mode 100644
index 0000000000..c98b05c97f
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/opportunity/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/opportunity/getAll.json b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/opportunity/getAll.json
new file mode 100644
index 0000000000..a5ac28b392
--- /dev/null
+++ b/packages/nodes-base/nodes/Odoo/__schema__/v1.0.0/opportunity/getAll.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "expected_revenue": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Okta/Okta.node.ts b/packages/nodes-base/nodes/Okta/Okta.node.ts
index 18ec90fb22..d5940209ed 100644
--- a/packages/nodes-base/nodes/Okta/Okta.node.ts
+++ b/packages/nodes-base/nodes/Okta/Okta.node.ts
@@ -16,6 +16,7 @@ export class Okta implements INodeType {
 		defaults: {
 			name: 'Okta',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
index e04dbaaedd..ca5dfd2e86 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
@@ -20,6 +20,7 @@ export class OneSimpleApi implements INodeType {
 		defaults: {
 			name: 'One Simple API',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index e6c18b9026..3d9221f98d 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -34,6 +34,7 @@ export class Onfleet implements INodeType {
 		defaults: {
 			name: 'Onfleet',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Onfleet/__schema__/v1.0.0/task/getAll.json b/packages/nodes-base/nodes/Onfleet/__schema__/v1.0.0/task/getAll.json
new file mode 100644
index 0000000000..a3834414fd
--- /dev/null
+++ b/packages/nodes-base/nodes/Onfleet/__schema__/v1.0.0/task/getAll.json
@@ -0,0 +1,417 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "timeCreated": {
+            "type": "integer"
+        },
+        "timeLastModified": {
+            "type": "integer"
+        },
+        "organization": {
+            "type": "string"
+        },
+        "shortId": {
+            "type": "string"
+        },
+        "orderShortId": {
+            "type": "null"
+        },
+        "trackingURL": {
+            "type": "string"
+        },
+        "worker": {
+            "type": "string"
+        },
+        "merchant": {
+            "type": "string"
+        },
+        "executor": {
+            "type": "string"
+        },
+        "creator": {
+            "type": "string"
+        },
+        "state": {
+            "type": "integer"
+        },
+        "pickupTask": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "notes": {
+            "type": "string"
+        },
+        "completionDetails": {
+            "type": "object",
+            "properties": {
+                "success": {
+                    "type": "boolean"
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "failureNotes": {
+                    "type": "string"
+                },
+                "events": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "time": {
+                                "type": "integer"
+                            },
+                            "location": {
+                                "type": "array",
+                                "items": {
+                                    "type": "number"
+                                }
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "time"
+                        ]
+                    }
+                },
+                "successNotes": {
+                    "type": "string"
+                },
+                "failureReason": {
+                    "type": "string"
+                },
+                "actions": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "createdAt": {
+                                "type": "string"
+                            },
+                            "actionType": {
+                                "type": "string"
+                            },
+                            "adminId": {
+                                "type": "string"
+                            },
+                            "prevState": {
+                                "type": "object",
+                                "properties": {
+                                    "success": {
+                                        "type": "boolean"
+                                    },
+                                    "notes": {
+                                        "type": "string"
+                                    },
+                                    "failureNotes": {
+                                        "type": "string"
+                                    },
+                                    "successNotes": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "success",
+                                    "notes",
+                                    "failureNotes",
+                                    "successNotes"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "createdAt",
+                            "actionType",
+                            "adminId",
+                            "prevState"
+                        ]
+                    }
+                },
+                "photoUploadId": {
+                    "type": "null"
+                },
+                "firstLocation": {
+                    "type": "array",
+                    "items": {
+                        "type": "number"
+                    }
+                },
+                "lastLocation": {
+                    "type": "array",
+                    "items": {
+                        "type": "number"
+                    }
+                }
+            },
+            "required": [
+                "time",
+                "failureNotes",
+                "events",
+                "successNotes",
+                "failureReason",
+                "actions",
+                "signatureUploadId",
+                "photoUploadId",
+                "photoUploadIds",
+                "firstLocation",
+                "lastLocation",
+                "unavailableAttachments"
+            ]
+        },
+        "feedback": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "comments": {
+                        "type": "string"
+                    },
+                    "time": {
+                        "type": "string"
+                    },
+                    "recipient": {
+                        "type": "string"
+                    },
+                    "rating": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "comments",
+                    "time",
+                    "recipient",
+                    "rating"
+                ]
+            }
+        },
+        "additionalQuantities": {
+            "type": "object",
+            "properties": {
+                "quantityA": {
+                    "type": "integer"
+                },
+                "quantityB": {
+                    "type": "integer"
+                },
+                "quantityC": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "quantityA",
+                "quantityB",
+                "quantityC"
+            ]
+        },
+        "serviceTime": {
+            "type": "integer"
+        },
+        "identity": {
+            "type": "object",
+            "properties": {
+                "failedScanCount": {
+                    "type": "integer"
+                },
+                "checksum": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "failedScanCount",
+                "checksum"
+            ]
+        },
+        "appearance": {
+            "type": "object",
+            "properties": {
+                "triangleColor": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "triangleColor"
+            ]
+        },
+        "scanOnlyRequiredBarcodes": {
+            "type": "boolean"
+        },
+        "trackingViewed": {
+            "type": "boolean"
+        },
+        "estimatedCompletionTime": {
+            "type": "null"
+        },
+        "estimatedArrivalTime": {
+            "type": "null"
+        },
+        "eta": {
+            "type": "null"
+        },
+        "recipients": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "timeCreated": {
+                        "type": "integer"
+                    },
+                    "timeLastModified": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "phone": {
+                        "type": "string"
+                    },
+                    "organization": {
+                        "type": "string"
+                    },
+                    "skipSMSNotifications": {
+                        "type": "boolean"
+                    },
+                    "notes": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "timeCreated",
+                    "timeLastModified",
+                    "name",
+                    "phone",
+                    "organization",
+                    "skipSMSNotifications",
+                    "metadata"
+                ]
+            }
+        },
+        "destination": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "timeCreated": {
+                    "type": "integer"
+                },
+                "timeLastModified": {
+                    "type": "integer"
+                },
+                "location": {
+                    "type": "array",
+                    "items": {
+                        "type": "number"
+                    }
+                },
+                "address": {
+                    "type": "object",
+                    "properties": {
+                        "name": {
+                            "type": "string"
+                        },
+                        "number": {
+                            "type": "string"
+                        },
+                        "street": {
+                            "type": "string"
+                        },
+                        "city": {
+                            "type": "string"
+                        },
+                        "state": {
+                            "type": "string"
+                        },
+                        "postalCode": {
+                            "type": "string"
+                        },
+                        "country": {
+                            "type": "string"
+                        },
+                        "apartment": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "city",
+                        "state",
+                        "postalCode",
+                        "country",
+                        "apartment"
+                    ]
+                },
+                "notes": {
+                    "type": "string"
+                },
+                "warnings": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "useGPS": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "timeCreated",
+                "timeLastModified",
+                "location",
+                "address",
+                "notes",
+                "metadata",
+                "googlePlaceId",
+                "warnings",
+                "useGPS"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "timeCreated",
+        "timeLastModified",
+        "organization",
+        "shortId",
+        "orderShortId",
+        "trackingURL",
+        "worker",
+        "merchant",
+        "executor",
+        "creator",
+        "dependencies",
+        "state",
+        "completeAfter",
+        "completeBefore",
+        "pickupTask",
+        "notes",
+        "completionDetails",
+        "feedback",
+        "metadata",
+        "overrides",
+        "quantity",
+        "additionalQuantities",
+        "serviceTime",
+        "identity",
+        "appearance",
+        "scanOnlyRequiredBarcodes",
+        "customFields",
+        "trackingViewed",
+        "delayTime",
+        "estimatedCompletionTime",
+        "estimatedArrivalTime",
+        "eta",
+        "recipients",
+        "destination"
+    ]
+}
diff --git a/packages/nodes-base/nodes/OpenAi/__schema__/v1.0.0/image/create.json b/packages/nodes-base/nodes/OpenAi/__schema__/v1.0.0/image/create.json
new file mode 100644
index 0000000000..971e7ec5fe
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenAi/__schema__/v1.0.0/image/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "revised_prompt": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/OpenAi/__schema__/v1.1.0/chat/complete.json b/packages/nodes-base/nodes/OpenAi/__schema__/v1.1.0/chat/complete.json
new file mode 100644
index 0000000000..894cbdfcb6
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenAi/__schema__/v1.1.0/chat/complete.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "index": {
+            "type": "integer"
+        },
+        "message": {
+            "type": "object",
+            "properties": {
+                "role": {
+                    "type": "string"
+                },
+                "content": {
+                    "type": "string"
+                },
+                "refusal": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "role",
+                "content"
+            ]
+        },
+        "logprobs": {
+            "type": "null"
+        },
+        "finish_reason": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/OpenAi/__schema__/v1.1.0/text/complete.json b/packages/nodes-base/nodes/OpenAi/__schema__/v1.1.0/text/complete.json
new file mode 100644
index 0000000000..dc3f1367b1
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenAi/__schema__/v1.1.0/text/complete.json
@@ -0,0 +1,17 @@
+{
+	"type": "object",
+	"properties": {
+		"index": {
+			"type": "integer"
+		},
+		"text": {
+			"type": "string"
+		},
+		"logprobs": {
+			"type": "null"
+		},
+		"finish_reason": {
+			"type": "string"
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
index 0e2481f625..9434f42b6f 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
@@ -22,6 +22,7 @@ export class OpenThesaurus implements INodeType {
 		defaults: {
 			name: 'OpenThesaurus',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
index c5766b5df8..2b46a086e8 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
@@ -20,6 +20,7 @@ export class OpenWeatherMap implements INodeType {
 		defaults: {
 			name: 'OpenWeatherMap',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts b/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts
index 70fe54bbb8..45079bbc8a 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts
@@ -10,18 +10,12 @@ describe('OpenWeatherMap', () => {
 		const tests = workflowToTests(workflows);
 
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			nock('https://api.openweathermap.org')
 				.get('/data/2.5/weather')
 				.query({ units: 'metric', q: 'berlin,de', lang: 'en' })
 				.reply(200, currentWeatherResponse);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		const nodeTypes = setup(tests);
 
 		for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index ce522996d7..936df42163 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.ts
+++ b/packages/nodes-base/nodes/Oura/Oura.node.ts
@@ -24,6 +24,7 @@ export class Oura implements INodeType {
 		defaults: {
 			name: 'Oura',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Oura/test/oura.node.test.ts b/packages/nodes-base/nodes/Oura/test/oura.node.test.ts
index 19c1e8c2b4..5e4a1ad45c 100644
--- a/packages/nodes-base/nodes/Oura/test/oura.node.test.ts
+++ b/packages/nodes-base/nodes/Oura/test/oura.node.test.ts
@@ -56,17 +56,11 @@ describe('Oura', () => {
 		const tests = workflowToTests(workflows);
 
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			nock('https://api.ouraring.com/v2')
 				.get('/usercollection/personal_info')
 				.reply(200, profileResponse);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		const nodeTypes = setup(tests);
 
 		for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index 1bdedf2338..934a50c619 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -36,6 +36,7 @@ export class Paddle implements INodeType {
 		defaults: {
 			name: 'Paddle',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index d00742dec1..792b1287d5 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -34,6 +34,7 @@ export class PagerDuty implements INodeType {
 		defaults: {
 			name: 'PagerDuty',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 7fb8987ef5..d3bf26669f 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -115,7 +115,6 @@ export class PayPalTrigger implements INodeType {
 			},
 
 			async create(this: IHookFunctions): Promise<boolean> {
-				let webhook;
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const events = this.getNodeParameter('events', []) as string[];
 				const body = {
@@ -125,11 +124,7 @@ export class PayPalTrigger implements INodeType {
 					}),
 				};
 				const endpoint = '/notifications/webhooks';
-				try {
-					webhook = await payPalApiRequest.call(this, endpoint, 'POST', body);
-				} catch (error) {
-					throw error;
-				}
+				const webhook = await payPalApiRequest.call(this, endpoint, 'POST', body);
 
 				if (webhook.id === undefined) {
 					return false;
@@ -156,7 +151,6 @@ export class PayPalTrigger implements INodeType {
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		let webhook;
 		const webhookData = this.getWorkflowStaticData('node');
 		const bodyData = this.getBodyData();
 		const req = this.getRequestObject();
@@ -188,11 +182,7 @@ export class PayPalTrigger implements INodeType {
 				webhook_id: webhookData.webhookId,
 				webhook_event: bodyData,
 			};
-			try {
-				webhook = await payPalApiRequest.call(this, endpoint, 'POST', body);
-			} catch (error) {
-				throw error;
-			}
+			const webhook = await payPalApiRequest.call(this, endpoint, 'POST', body);
 			if (webhook.verification_status !== 'SUCCESS') {
 				return {};
 			}
diff --git a/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts b/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
index 5e18c8600a..dcddc38d14 100644
--- a/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
+++ b/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
@@ -25,6 +25,7 @@ export class Peekalink extends Node {
 		defaults: {
 			name: 'Peekalink',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index facb21aa46..fb13c57037 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -29,6 +29,7 @@ export class Phantombuster implements INodeType {
 		defaults: {
 			name: 'Phantombuster',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/get.json b/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/get.json
new file mode 100644
index 0000000000..c8dc56375c
--- /dev/null
+++ b/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/get.json
@@ -0,0 +1,116 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "scriptOrgName": {
+            "type": "string"
+        },
+        "scriptId": {
+            "type": "string"
+        },
+        "script": {
+            "type": "string"
+        },
+        "branch": {
+            "type": "string"
+        },
+        "environment": {
+            "type": "string"
+        },
+        "argument": {
+            "type": "string"
+        },
+        "code": {
+            "type": "null"
+        },
+        "launchType": {
+            "type": "string"
+        },
+        "nbLaunches": {
+            "type": "integer"
+        },
+        "s3Folder": {
+            "type": "string"
+        },
+        "orgS3Folder": {
+            "type": "string"
+        },
+        "updatedAt": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "fileMgmt": {
+            "type": "string"
+        },
+        "maxParallelism": {
+            "type": "integer"
+        },
+        "notifications": {
+            "type": "object",
+            "properties": {
+                "mailManualExitError": {
+                    "type": "boolean"
+                },
+                "mailManualTimeError": {
+                    "type": "boolean"
+                },
+                "mailManualExitSuccess": {
+                    "type": "boolean"
+                },
+                "mailManualLaunchError": {
+                    "type": "boolean"
+                },
+                "mailAutomaticExitError": {
+                    "type": "boolean"
+                },
+                "mailAutomaticTimeError": {
+                    "type": "boolean"
+                },
+                "mailAutomaticExitSuccess": {
+                    "type": "boolean"
+                },
+                "mailAutomaticLaunchError": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "mailManualExitError",
+                "mailManualTimeError",
+                "mailManualExitSuccess",
+                "mailManualLaunchError",
+                "mailAutomaticExitError",
+                "mailAutomaticTimeError",
+                "mailAutomaticExitSuccess",
+                "mailAutomaticLaunchError"
+            ]
+        },
+        "lastEndType": {
+            "type": "string"
+        },
+        "wasSetupValidWhenSubmittedByTheFrontend": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "scriptOrgName",
+        "scriptId",
+        "script",
+        "branch",
+        "environment",
+        "argument",
+        "code",
+        "launchType",
+        "nbLaunches",
+        "s3Folder",
+        "orgS3Folder",
+        "updatedAt",
+        "name",
+        "fileMgmt",
+        "maxParallelism"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/getOutput.json b/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/getOutput.json
new file mode 100644
index 0000000000..783aef0a7d
--- /dev/null
+++ b/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/getOutput.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "query": {
+            "type": "string"
+        },
+        "timestamp": {
+            "type": "string"
+        },
+        "profileUrl": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/launch.json b/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/launch.json
new file mode 100644
index 0000000000..165fa1fd02
--- /dev/null
+++ b/packages/nodes-base/nodes/Phantombuster/__schema__/v1.0.0/agent/launch.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "createdAt": {
+            "type": "integer"
+        },
+        "launchedAt": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "launchType": {
+            "type": "string"
+        },
+        "retryNumber": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 83c90c3068..f4041fa627 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -25,6 +25,7 @@ export class PhilipsHue implements INodeType {
 		defaults: {
 			name: 'Philips Hue',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/get.json b/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/get.json
new file mode 100644
index 0000000000..165984bdac
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/get.json
@@ -0,0 +1,209 @@
+{
+    "type": "object",
+    "properties": {
+        "state": {
+            "type": "object",
+            "properties": {
+                "on": {
+                    "type": "boolean"
+                },
+                "bri": {
+                    "type": "integer"
+                },
+                "hue": {
+                    "type": "integer"
+                },
+                "sat": {
+                    "type": "integer"
+                },
+                "effect": {
+                    "type": "string"
+                },
+                "xy": {
+                    "type": "array",
+                    "items": {
+                        "type": "number"
+                    }
+                },
+                "ct": {
+                    "type": "integer"
+                },
+                "alert": {
+                    "type": "string"
+                },
+                "colormode": {
+                    "type": "string"
+                },
+                "mode": {
+                    "type": "string"
+                },
+                "reachable": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "on",
+                "bri",
+                "hue",
+                "sat",
+                "effect",
+                "xy",
+                "ct",
+                "alert",
+                "colormode",
+                "mode",
+                "reachable"
+            ]
+        },
+        "swupdate": {
+            "type": "object",
+            "properties": {
+                "state": {
+                    "type": "string"
+                },
+                "lastinstall": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "state",
+                "lastinstall"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "modelid": {
+            "type": "string"
+        },
+        "manufacturername": {
+            "type": "string"
+        },
+        "productname": {
+            "type": "string"
+        },
+        "capabilities": {
+            "type": "object",
+            "properties": {
+                "certified": {
+                    "type": "boolean"
+                },
+                "control": {
+                    "type": "object",
+                    "properties": {
+                        "mindimlevel": {
+                            "type": "integer"
+                        },
+                        "maxlumen": {
+                            "type": "integer"
+                        },
+                        "colorgamuttype": {
+                            "type": "string"
+                        },
+                        "colorgamut": {
+                            "type": "array",
+                            "items": {
+                                "type": "array",
+                                "items": {
+                                    "type": "number"
+                                }
+                            }
+                        },
+                        "ct": {
+                            "type": "object",
+                            "properties": {
+                                "min": {
+                                    "type": "integer"
+                                },
+                                "max": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "min",
+                                "max"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "mindimlevel",
+                        "maxlumen",
+                        "colorgamuttype",
+                        "colorgamut",
+                        "ct"
+                    ]
+                },
+                "streaming": {
+                    "type": "object",
+                    "properties": {
+                        "renderer": {
+                            "type": "boolean"
+                        },
+                        "proxy": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "renderer",
+                        "proxy"
+                    ]
+                }
+            },
+            "required": [
+                "certified",
+                "control",
+                "streaming"
+            ]
+        },
+        "config": {
+            "type": "object",
+            "properties": {
+                "archetype": {
+                    "type": "string"
+                },
+                "function": {
+                    "type": "string"
+                },
+                "direction": {
+                    "type": "string"
+                },
+                "startup": {
+                    "type": "object",
+                    "properties": {
+                        "mode": {
+                            "type": "string"
+                        },
+                        "configured": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "mode",
+                        "configured"
+                    ]
+                }
+            },
+            "required": [
+                "archetype",
+                "function",
+                "direction",
+                "startup"
+            ]
+        },
+        "uniqueid": {
+            "type": "string"
+        },
+        "swversion": {
+            "type": "string"
+        },
+        "swconfigid": {
+            "type": "string"
+        },
+        "productid": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/getAll.json b/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/getAll.json
new file mode 100644
index 0000000000..30f8c85e39
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/getAll.json
@@ -0,0 +1,208 @@
+{
+    "type": "object",
+    "properties": {
+        "state": {
+            "type": "object",
+            "properties": {
+                "on": {
+                    "type": "boolean"
+                },
+                "bri": {
+                    "type": "integer"
+                },
+                "alert": {
+                    "type": "string"
+                },
+                "mode": {
+                    "type": "string"
+                },
+                "reachable": {
+                    "type": "boolean"
+                },
+                "ct": {
+                    "type": "integer"
+                },
+                "colormode": {
+                    "type": "string"
+                },
+                "hue": {
+                    "type": "integer"
+                },
+                "sat": {
+                    "type": "integer"
+                },
+                "effect": {
+                    "type": "string"
+                },
+                "xy": {
+                    "type": "array",
+                    "items": {
+                        "type": "number"
+                    }
+                }
+            },
+            "required": [
+                "on",
+                "alert",
+                "mode",
+                "reachable"
+            ]
+        },
+        "swupdate": {
+            "type": "object",
+            "properties": {
+                "state": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "state",
+                "lastinstall"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "modelid": {
+            "type": "string"
+        },
+        "manufacturername": {
+            "type": "string"
+        },
+        "productname": {
+            "type": "string"
+        },
+        "capabilities": {
+            "type": "object",
+            "properties": {
+                "certified": {
+                    "type": "boolean"
+                },
+                "control": {
+                    "type": "object",
+                    "properties": {
+                        "mindimlevel": {
+                            "type": "integer"
+                        },
+                        "maxlumen": {
+                            "type": "integer"
+                        },
+                        "ct": {
+                            "type": "object",
+                            "properties": {
+                                "min": {
+                                    "type": "integer"
+                                },
+                                "max": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "min",
+                                "max"
+                            ]
+                        },
+                        "colorgamuttype": {
+                            "type": "string"
+                        },
+                        "colorgamut": {
+                            "type": "array",
+                            "items": {
+                                "type": "array",
+                                "items": {
+                                    "type": "number"
+                                }
+                            }
+                        }
+                    },
+                    "required": [
+                        "mindimlevel",
+                        "maxlumen"
+                    ]
+                },
+                "streaming": {
+                    "type": "object",
+                    "properties": {
+                        "renderer": {
+                            "type": "boolean"
+                        },
+                        "proxy": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "renderer",
+                        "proxy"
+                    ]
+                }
+            },
+            "required": [
+                "certified",
+                "control",
+                "streaming"
+            ]
+        },
+        "config": {
+            "type": "object",
+            "properties": {
+                "archetype": {
+                    "type": "string"
+                },
+                "function": {
+                    "type": "string"
+                },
+                "direction": {
+                    "type": "string"
+                },
+                "startup": {
+                    "type": "object",
+                    "properties": {
+                        "mode": {
+                            "type": "string"
+                        },
+                        "configured": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "mode",
+                        "configured"
+                    ]
+                }
+            },
+            "required": [
+                "archetype",
+                "function",
+                "direction"
+            ]
+        },
+        "uniqueid": {
+            "type": "string"
+        },
+        "swversion": {
+            "type": "string"
+        },
+        "swconfigid": {
+            "type": "string"
+        },
+        "productid": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "state",
+        "swupdate",
+        "type",
+        "name",
+        "modelid",
+        "manufacturername",
+        "productname",
+        "capabilities",
+        "config",
+        "uniqueid",
+        "swversion"
+    ]
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/update.json b/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/update.json
new file mode 100644
index 0000000000..6d6571061c
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/__schema__/v1.0.0/light/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "/lights/3/state/on": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
index 26f6796632..4608552137 100644
--- a/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
@@ -19,8 +19,6 @@ describe('PhilipsHue', () => {
 		const tests = workflowToTests(workflows);
 
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			const mock = nock('https://api.meethue.com/route');
 			mock.persist().get('/api/0/config').reply(200, getConfigResponse);
 			mock.get('/api/pAtwdCV8NZId25Gk/lights').reply(200, getLightsResponse);
@@ -28,10 +26,6 @@ describe('PhilipsHue', () => {
 			mock.delete('/api/pAtwdCV8NZId25Gk/lights/1').reply(200, deleteLightResponse);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		const nodeTypes = setup(tests);
 
 		for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index bdca4a33f4..659fb96031 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -60,6 +60,7 @@ export class Pipedrive implements INodeType {
 		defaults: {
 			name: 'Pipedrive',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/create.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/create.json
new file mode 100644
index 0000000000..526f1c016b
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/create.json
@@ -0,0 +1,155 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "user_id": {
+            "type": "integer"
+        },
+        "done": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "string"
+        },
+        "reference_type": {
+            "type": "null"
+        },
+        "reference_id": {
+            "type": "null"
+        },
+        "conference_meeting_client": {
+            "type": "null"
+        },
+        "conference_meeting_url": {
+            "type": "null"
+        },
+        "due_date": {
+            "type": "string"
+        },
+        "due_time": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "string"
+        },
+        "busy_flag": {
+            "type": "boolean"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "marked_as_done_time": {
+            "type": "string"
+        },
+        "last_notification_time": {
+            "type": "null"
+        },
+        "last_notification_user_id": {
+            "type": "null"
+        },
+        "notification_language_id": {
+            "type": "null"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "public_description": {
+            "type": "null"
+        },
+        "calendar_sync_include_context": {
+            "type": "null"
+        },
+        "location": {
+            "type": "null"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "update_user_id": {
+            "type": "null"
+        },
+        "source_timezone": {
+            "type": "null"
+        },
+        "rec_rule": {
+            "type": "null"
+        },
+        "rec_rule_extension": {
+            "type": "null"
+        },
+        "rec_master_activity_id": {
+            "type": "null"
+        },
+        "conference_meeting_id": {
+            "type": "null"
+        },
+        "original_start_time": {
+            "type": "null"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "priority": {
+            "type": "null"
+        },
+        "created_by_user_id": {
+            "type": "integer"
+        },
+        "location_subpremise": {
+            "type": "null"
+        },
+        "location_street_number": {
+            "type": "null"
+        },
+        "location_route": {
+            "type": "null"
+        },
+        "location_sublocality": {
+            "type": "null"
+        },
+        "location_locality": {
+            "type": "null"
+        },
+        "location_admin_area_level_1": {
+            "type": "null"
+        },
+        "location_admin_area_level_2": {
+            "type": "null"
+        },
+        "location_country": {
+            "type": "null"
+        },
+        "location_postal_code": {
+            "type": "null"
+        },
+        "location_formatted_address": {
+            "type": "null"
+        },
+        "attendees": {
+            "type": "null"
+        },
+        "series": {
+            "type": "null"
+        },
+        "is_recurring": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "assigned_to_user_id": {
+            "type": "integer"
+        },
+        "type_name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/get.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/get.json
new file mode 100644
index 0000000000..ac6fade9de
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/get.json
@@ -0,0 +1,180 @@
+{
+    "type": "object",
+    "properties": {
+        "company_id": {
+            "type": "integer"
+        },
+        "reference_id": {
+            "type": "null"
+        },
+        "last_notification_user_id": {
+            "type": "null"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "rec_rule": {
+            "type": "null"
+        },
+        "rec_rule_extension": {
+            "type": "null"
+        },
+        "rec_master_activity_id": {
+            "type": "null"
+        },
+        "conference_meeting_id": {
+            "type": "null"
+        },
+        "original_start_time": {
+            "type": "null"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "series": {
+            "type": "null"
+        },
+        "is_recurring": {
+            "type": "null"
+        },
+        "lead_title": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "assigned_to_user_id": {
+            "type": "integer"
+        },
+        "type_name": {
+            "type": "string"
+        },
+        "lead": {
+            "type": "null"
+        },
+        "ID": {
+            "type": "integer"
+        },
+        "Assigned to user": {
+            "type": "integer"
+        },
+        "Done": {
+            "type": "string"
+        },
+        "Type": {
+            "type": "string"
+        },
+        "Due date": {
+            "type": "string"
+        },
+        "Due time": {
+            "type": "string"
+        },
+        "Duration": {
+            "type": "string"
+        },
+        "Free/busy": {
+            "type": "string"
+        },
+        "Add time": {
+            "type": "string"
+        },
+        "Marked as done time": {
+            "type": "string"
+        },
+        "Last notification time": {
+            "type": "null"
+        },
+        "Subject": {
+            "type": "string"
+        },
+        "Location": {
+            "type": "null"
+        },
+        "Organisation": {
+            "type": "integer"
+        },
+        "Contact person": {
+            "type": "integer"
+        },
+        "Lead": {
+            "type": "null"
+        },
+        "Update time": {
+            "type": "string"
+        },
+        "Priority": {
+            "type": "null"
+        },
+        "Note": {
+            "type": "string"
+        },
+        "Creator": {
+            "type": "integer"
+        },
+        "Apartment/suite no of Location": {
+            "type": "null"
+        },
+        "House number of Location": {
+            "type": "null"
+        },
+        "Street/road name of Location": {
+            "type": "null"
+        },
+        "District/sublocality of Location": {
+            "type": "null"
+        },
+        "City/town/village/locality of Location": {
+            "type": "null"
+        },
+        "State/county of Location": {
+            "type": "null"
+        },
+        "Region of Location": {
+            "type": "null"
+        },
+        "Country of Location": {
+            "type": "null"
+        },
+        "ZIP/Postal code of Location": {
+            "type": "null"
+        },
+        "Full/combined address of Location": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "company_id",
+        "reference_type",
+        "reference_id",
+        "conference_meeting_client",
+        "conference_meeting_url",
+        "last_notification_user_id",
+        "notification_language_id",
+        "calendar_sync_include_context",
+        "deal_id",
+        "active_flag",
+        "update_user_id",
+        "source_timezone",
+        "rec_rule",
+        "rec_rule_extension",
+        "rec_master_activity_id",
+        "conference_meeting_id",
+        "original_start_time",
+        "private",
+        "attendees",
+        "participants",
+        "series",
+        "is_recurring",
+        "org_name",
+        "person_name",
+        "deal_title",
+        "lead_title",
+        "owner_name",
+        "person_dropbox_bcc",
+        "deal_dropbox_bcc",
+        "assigned_to_user_id",
+        "type_name",
+        "lead"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/getAll.json
new file mode 100644
index 0000000000..7f4e61ec7d
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/getAll.json
@@ -0,0 +1,193 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "user_id": {
+            "type": "integer"
+        },
+        "done": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "string"
+        },
+        "reference_id": {
+            "type": "null"
+        },
+        "due_date": {
+            "type": "string"
+        },
+        "due_time": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "string"
+        },
+        "busy_flag": {
+            "type": "boolean"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "last_notification_time": {
+            "type": "null"
+        },
+        "last_notification_user_id": {
+            "type": "null"
+        },
+        "notification_language_id": {
+            "type": "null"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "lead_id": {
+            "type": "null"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "rec_rule": {
+            "type": "null"
+        },
+        "rec_rule_extension": {
+            "type": "null"
+        },
+        "conference_meeting_id": {
+            "type": "null"
+        },
+        "original_start_time": {
+            "type": "null"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "created_by_user_id": {
+            "type": "integer"
+        },
+        "location_subpremise": {
+            "type": "null"
+        },
+        "location_street_number": {
+            "type": "null"
+        },
+        "location_route": {
+            "type": "null"
+        },
+        "location_sublocality": {
+            "type": "null"
+        },
+        "location_locality": {
+            "type": "null"
+        },
+        "location_admin_area_level_1": {
+            "type": "null"
+        },
+        "location_admin_area_level_2": {
+            "type": "null"
+        },
+        "location_country": {
+            "type": "null"
+        },
+        "location_postal_code": {
+            "type": "null"
+        },
+        "location_formatted_address": {
+            "type": "null"
+        },
+        "series": {
+            "type": "null"
+        },
+        "is_recurring": {
+            "type": "null"
+        },
+        "lead_title": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "assigned_to_user_id": {
+            "type": "integer"
+        },
+        "type_name": {
+            "type": "string"
+        },
+        "lead": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "company_id",
+        "user_id",
+        "done",
+        "type",
+        "reference_type",
+        "reference_id",
+        "conference_meeting_client",
+        "conference_meeting_url",
+        "due_date",
+        "due_time",
+        "duration",
+        "busy_flag",
+        "add_time",
+        "marked_as_done_time",
+        "last_notification_time",
+        "last_notification_user_id",
+        "notification_language_id",
+        "subject",
+        "public_description",
+        "calendar_sync_include_context",
+        "location",
+        "org_id",
+        "person_id",
+        "deal_id",
+        "lead_id",
+        "active_flag",
+        "update_time",
+        "update_user_id",
+        "source_timezone",
+        "rec_rule",
+        "rec_rule_extension",
+        "rec_master_activity_id",
+        "conference_meeting_id",
+        "original_start_time",
+        "private",
+        "priority",
+        "note",
+        "created_by_user_id",
+        "location_subpremise",
+        "location_street_number",
+        "location_route",
+        "location_sublocality",
+        "location_locality",
+        "location_admin_area_level_1",
+        "location_admin_area_level_2",
+        "location_country",
+        "location_postal_code",
+        "location_formatted_address",
+        "attendees",
+        "participants",
+        "series",
+        "is_recurring",
+        "org_name",
+        "person_name",
+        "deal_title",
+        "lead_title",
+        "owner_name",
+        "person_dropbox_bcc",
+        "deal_dropbox_bcc",
+        "assigned_to_user_id",
+        "type_name",
+        "lead"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/update.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/update.json
new file mode 100644
index 0000000000..1bae93e43c
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/activity/update.json
@@ -0,0 +1,202 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "user_id": {
+            "type": "integer"
+        },
+        "done": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "string"
+        },
+        "reference_id": {
+            "type": "null"
+        },
+        "due_date": {
+            "type": "string"
+        },
+        "due_time": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "string"
+        },
+        "busy_flag": {
+            "type": "boolean"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "marked_as_done_time": {
+            "type": "string"
+        },
+        "last_notification_time": {
+            "type": "null"
+        },
+        "last_notification_user_id": {
+            "type": "null"
+        },
+        "notification_language_id": {
+            "type": "null"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "lead_id": {
+            "type": "null"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "update_user_id": {
+            "type": "integer"
+        },
+        "rec_rule": {
+            "type": "null"
+        },
+        "rec_rule_extension": {
+            "type": "null"
+        },
+        "rec_master_activity_id": {
+            "type": "null"
+        },
+        "conference_meeting_id": {
+            "type": "null"
+        },
+        "original_start_time": {
+            "type": "null"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "created_by_user_id": {
+            "type": "integer"
+        },
+        "location_subpremise": {
+            "type": "null"
+        },
+        "location_street_number": {
+            "type": "null"
+        },
+        "location_route": {
+            "type": "null"
+        },
+        "location_sublocality": {
+            "type": "null"
+        },
+        "location_locality": {
+            "type": "null"
+        },
+        "location_admin_area_level_1": {
+            "type": "null"
+        },
+        "location_admin_area_level_2": {
+            "type": "null"
+        },
+        "location_country": {
+            "type": "null"
+        },
+        "location_postal_code": {
+            "type": "null"
+        },
+        "location_formatted_address": {
+            "type": "null"
+        },
+        "series": {
+            "type": "null"
+        },
+        "is_recurring": {
+            "type": "null"
+        },
+        "lead_title": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "assigned_to_user_id": {
+            "type": "integer"
+        },
+        "type_name": {
+            "type": "string"
+        },
+        "lead": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "company_id",
+        "user_id",
+        "done",
+        "type",
+        "reference_type",
+        "reference_id",
+        "conference_meeting_client",
+        "conference_meeting_url",
+        "due_date",
+        "due_time",
+        "duration",
+        "busy_flag",
+        "add_time",
+        "marked_as_done_time",
+        "last_notification_time",
+        "last_notification_user_id",
+        "notification_language_id",
+        "subject",
+        "public_description",
+        "calendar_sync_include_context",
+        "location",
+        "org_id",
+        "person_id",
+        "deal_id",
+        "lead_id",
+        "active_flag",
+        "update_time",
+        "update_user_id",
+        "source_timezone",
+        "rec_rule",
+        "rec_rule_extension",
+        "rec_master_activity_id",
+        "conference_meeting_id",
+        "original_start_time",
+        "private",
+        "priority",
+        "note",
+        "created_by_user_id",
+        "location_subpremise",
+        "location_street_number",
+        "location_route",
+        "location_sublocality",
+        "location_locality",
+        "location_admin_area_level_1",
+        "location_admin_area_level_2",
+        "location_country",
+        "location_postal_code",
+        "location_formatted_address",
+        "attendees",
+        "participants",
+        "series",
+        "is_recurring",
+        "org_name",
+        "person_name",
+        "deal_title",
+        "lead_title",
+        "owner_name",
+        "person_dropbox_bcc",
+        "deal_dropbox_bcc",
+        "assigned_to_user_id",
+        "type_name",
+        "lead"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/create.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/create.json
new file mode 100644
index 0000000000..e7324aac8c
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/create.json
@@ -0,0 +1,300 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "creator_user_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "user_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "stage_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "acv": {
+            "type": "null"
+        },
+        "mrr": {
+            "type": "null"
+        },
+        "arr": {
+            "type": "null"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "stage_change_time": {
+            "type": "null"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "probability": {
+            "type": "null"
+        },
+        "next_activity_date": {
+            "type": "null"
+        },
+        "next_activity_time": {
+            "type": "null"
+        },
+        "next_activity_id": {
+            "type": "null"
+        },
+        "last_activity_id": {
+            "type": "null"
+        },
+        "last_activity_date": {
+            "type": "null"
+        },
+        "lost_reason": {
+            "type": "null"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "pipeline_id": {
+            "type": "integer"
+        },
+        "lost_time": {
+            "type": "null"
+        },
+        "products_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "participants_count": {
+            "type": "integer"
+        },
+        "expected_close_date": {
+            "type": "null"
+        },
+        "last_incoming_mail_time": {
+            "type": "null"
+        },
+        "last_outgoing_mail_time": {
+            "type": "null"
+        },
+        "local_lost_date": {
+            "type": "null"
+        },
+        "origin": {
+            "type": "string"
+        },
+        "origin_id": {
+            "type": "null"
+        },
+        "channel": {
+            "type": "null"
+        },
+        "channel_id": {
+            "type": "null"
+        },
+        "stage_order_nr": {
+            "type": "integer"
+        },
+        "next_activity_subject": {
+            "type": "null"
+        },
+        "next_activity_type": {
+            "type": "null"
+        },
+        "next_activity_duration": {
+            "type": "null"
+        },
+        "next_activity_note": {
+            "type": "null"
+        },
+        "formatted_value": {
+            "type": "string"
+        },
+        "formatted_weighted_value": {
+            "type": "string"
+        },
+        "weighted_value_currency": {
+            "type": "string"
+        },
+        "acv_currency": {
+            "type": "null"
+        },
+        "mrr_currency": {
+            "type": "null"
+        },
+        "arr_currency": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "org_hidden": {
+            "type": "boolean"
+        },
+        "person_hidden": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "creator_user_id",
+        "user_id",
+        "person_id",
+        "org_id",
+        "stage_id",
+        "title",
+        "value",
+        "currency",
+        "add_time",
+        "update_time",
+        "stage_change_time",
+        "active",
+        "deleted",
+        "status",
+        "probability",
+        "next_activity_date",
+        "next_activity_time",
+        "next_activity_id",
+        "last_activity_id",
+        "last_activity_date",
+        "lost_reason",
+        "visible_to",
+        "close_time",
+        "pipeline_id",
+        "won_time",
+        "first_won_time",
+        "lost_time",
+        "products_count",
+        "files_count",
+        "notes_count",
+        "followers_count",
+        "email_messages_count",
+        "activities_count",
+        "done_activities_count",
+        "undone_activities_count",
+        "participants_count",
+        "expected_close_date",
+        "last_incoming_mail_time",
+        "last_outgoing_mail_time",
+        "label",
+        "local_won_date",
+        "local_lost_date",
+        "local_close_date",
+        "origin",
+        "origin_id",
+        "channel",
+        "channel_id",
+        "stage_order_nr",
+        "person_name",
+        "org_name",
+        "next_activity_subject",
+        "next_activity_type",
+        "next_activity_duration",
+        "next_activity_note",
+        "formatted_value",
+        "weighted_value",
+        "formatted_weighted_value",
+        "weighted_value_currency",
+        "rotten_time",
+        "owner_name",
+        "cc_email",
+        "org_hidden",
+        "person_hidden"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/get.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/get.json
new file mode 100644
index 0000000000..7549be3cf3
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/get.json
@@ -0,0 +1,364 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "creator_user_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "user_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "person_id": {
+            "type": "object",
+            "properties": {
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "label": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "primary"
+                        ]
+                    }
+                },
+                "phone": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "primary": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "primary"
+                        ]
+                    }
+                },
+                "owner_id": {
+                    "type": "integer"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "active_flag",
+                "name",
+                "email",
+                "phone",
+                "owner_id",
+                "value"
+            ]
+        },
+        "stage_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "next_activity_time": {
+            "type": "null"
+        },
+        "lost_reason": {
+            "type": "null"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "pipeline_id": {
+            "type": "integer"
+        },
+        "lost_time": {
+            "type": "null"
+        },
+        "products_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "participants_count": {
+            "type": "integer"
+        },
+        "local_lost_date": {
+            "type": "null"
+        },
+        "stage_order_nr": {
+            "type": "integer"
+        },
+        "next_activity_duration": {
+            "type": "null"
+        },
+        "next_activity_note": {
+            "type": "null"
+        },
+        "formatted_value": {
+            "type": "string"
+        },
+        "formatted_weighted_value": {
+            "type": "string"
+        },
+        "weighted_value_currency": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "org_hidden": {
+            "type": "boolean"
+        },
+        "person_hidden": {
+            "type": "boolean"
+        },
+        "average_time_to_won": {
+            "type": "object",
+            "properties": {
+                "y": {
+                    "type": "integer"
+                },
+                "m": {
+                    "type": "integer"
+                },
+                "d": {
+                    "type": "integer"
+                },
+                "h": {
+                    "type": "integer"
+                },
+                "i": {
+                    "type": "integer"
+                },
+                "s": {
+                    "type": "integer"
+                },
+                "total_seconds": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "y",
+                "m",
+                "d",
+                "h",
+                "i",
+                "s",
+                "total_seconds"
+            ]
+        },
+        "average_stage_progress": {
+            "type": "integer"
+        },
+        "age": {
+            "type": "object",
+            "properties": {
+                "y": {
+                    "type": "integer"
+                },
+                "m": {
+                    "type": "integer"
+                },
+                "d": {
+                    "type": "integer"
+                },
+                "h": {
+                    "type": "integer"
+                },
+                "i": {
+                    "type": "integer"
+                },
+                "s": {
+                    "type": "integer"
+                },
+                "total_seconds": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "y",
+                "m",
+                "d",
+                "h",
+                "i",
+                "s",
+                "total_seconds"
+            ]
+        },
+        "stay_in_pipeline_stages": {
+            "type": "object",
+            "properties": {
+                "times_in_stages": {
+                    "type": "object",
+                    "properties": {
+                        "36": {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "order_of_stages": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "required": [
+                "times_in_stages",
+                "order_of_stages"
+            ]
+        },
+        "6ed765e95e07cb884c5ca83bed7f9129687b06f1": {
+            "type": "string"
+        },
+        "6978a0bb41b5952de4d88d432af93fcd1cee3c48": {
+            "type": "string"
+        },
+        "5a3096c3afe73de34f661fb2f39fd1730b8b9a14": {
+            "type": "integer"
+        },
+        "0d2381bc2f18042052f532661380b2526d5d1418": {
+            "type": "string"
+        },
+        "861f700a2a00ee759b696c61c68ad81d6add71b8": {
+            "type": "string"
+        },
+        "4d2ee5efefb51e5c4c85f5aaee8a1080a3db2303": {
+            "type": "string"
+        },
+        "943fc1f0be467988db62ed6e53b7662a9e03da71": {
+            "type": "string"
+        },
+        "2b88250c8fe6de6a9c18a843012c3be4120bc977": {
+            "type": "string"
+        },
+        "5bf837804980758d9b007751a08a0282c400d7d8": {
+            "type": "string"
+        },
+        "509080cf228cf9363d8d822ae4e7391e42b46bd0": {
+            "type": "string"
+        },
+        "0bb28fa193c6b091813e9ba57a42aae322b1f098": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/getAll.json
new file mode 100644
index 0000000000..654ad3fb0b
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/getAll.json
@@ -0,0 +1,299 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "creator_user_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "user_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "person_id": {
+            "type": "object",
+            "properties": {
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "value": {
+                                "type": "string"
+                            },
+                            "primary": {
+                                "type": "boolean"
+                            },
+                            "label": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "primary"
+                        ]
+                    }
+                },
+                "phone": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "label": {
+                                "type": "string"
+                            },
+                            "value": {
+                                "type": "string"
+                            },
+                            "primary": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "value",
+                            "primary"
+                        ]
+                    }
+                },
+                "owner_id": {
+                    "type": "integer"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "active_flag",
+                "name",
+                "email",
+                "phone",
+                "owner_id",
+                "value"
+            ]
+        },
+        "org_id": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "people_count": {
+                    "type": "integer"
+                },
+                "owner_id": {
+                    "type": "integer"
+                },
+                "label_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "cc_email": {
+                    "type": "string"
+                },
+                "owner_name": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "name",
+                "people_count",
+                "owner_id",
+                "address",
+                "label_ids",
+                "active_flag",
+                "cc_email",
+                "owner_name",
+                "value"
+            ]
+        },
+        "stage_id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "pipeline_id": {
+            "type": "integer"
+        },
+        "products_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "participants_count": {
+            "type": "integer"
+        },
+        "stage_order_nr": {
+            "type": "integer"
+        },
+        "next_activity_duration": {
+            "type": "null"
+        },
+        "formatted_value": {
+            "type": "string"
+        },
+        "formatted_weighted_value": {
+            "type": "string"
+        },
+        "weighted_value_currency": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "org_hidden": {
+            "type": "boolean"
+        },
+        "person_hidden": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "stage_id",
+        "active",
+        "deleted",
+        "status",
+        "next_activity_time",
+        "next_activity_id",
+        "last_activity_id",
+        "pipeline_id",
+        "first_won_time",
+        "products_count",
+        "files_count",
+        "notes_count",
+        "followers_count",
+        "participants_count",
+        "local_won_date",
+        "local_lost_date",
+        "local_close_date",
+        "stage_order_nr",
+        "person_name",
+        "org_name",
+        "next_activity_subject",
+        "next_activity_type",
+        "next_activity_duration",
+        "next_activity_note",
+        "formatted_value",
+        "formatted_weighted_value",
+        "rotten_time",
+        "owner_name",
+        "cc_email",
+        "org_hidden",
+        "person_hidden"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/search.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/search.json
new file mode 100644
index 0000000000..7cf12f21cb
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/search.json
@@ -0,0 +1,73 @@
+{
+    "type": "object",
+    "properties": {
+        "result_score": {
+            "type": "number"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "integer"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "stage": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "person": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name"
+            ]
+        },
+        "notes": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/update.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/update.json
new file mode 100644
index 0000000000..c13b0c0853
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/deal/update.json
@@ -0,0 +1,62 @@
+{
+    "type": "object",
+    "properties": {
+        "stage_id": {
+            "type": "integer"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "status": {
+            "type": "string"
+        },
+        "next_activity_time": {
+            "type": "null"
+        },
+        "pipeline_id": {
+            "type": "integer"
+        },
+        "products_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "participants_count": {
+            "type": "integer"
+        },
+        "stage_order_nr": {
+            "type": "integer"
+        },
+        "next_activity_duration": {
+            "type": "null"
+        },
+        "formatted_value": {
+            "type": "string"
+        },
+        "formatted_weighted_value": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "org_hidden": {
+            "type": "boolean"
+        },
+        "person_hidden": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/dealProduct/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/dealProduct/getAll.json
new file mode 100644
index 0000000000..f44415850c
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/dealProduct/getAll.json
@@ -0,0 +1,95 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "deal_id": {
+            "type": "integer"
+        },
+        "product_id": {
+            "type": "integer"
+        },
+        "product_variation_id": {
+            "type": "null"
+        },
+        "name": {
+            "type": "string"
+        },
+        "order_nr": {
+            "type": "integer"
+        },
+        "quantity": {
+            "type": "integer"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "enabled_flag": {
+            "type": "boolean"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "last_edit": {
+            "type": "string"
+        },
+        "tax": {
+            "type": "integer"
+        },
+        "quantity_formatted": {
+            "type": "string"
+        },
+        "sum_formatted": {
+            "type": "string"
+        },
+        "tax_method": {
+            "type": "string"
+        },
+        "discount": {
+            "type": "integer"
+        },
+        "discount_type": {
+            "type": "string"
+        },
+        "billing_frequency": {
+            "type": "string"
+        },
+        "billing_frequency_cycles": {
+            "type": "null"
+        },
+        "product": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "deal_id",
+        "product_id",
+        "product_variation_id",
+        "name",
+        "order_nr",
+        "item_price",
+        "quantity",
+        "sum",
+        "currency",
+        "active_flag",
+        "enabled_flag",
+        "add_time",
+        "last_edit",
+        "comments",
+        "tax",
+        "quantity_formatted",
+        "sum_formatted",
+        "tax_method",
+        "discount",
+        "discount_type",
+        "billing_frequency",
+        "billing_frequency_cycles",
+        "billing_start_date",
+        "product"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/create.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/create.json
new file mode 100644
index 0000000000..8790d0d79b
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/create.json
@@ -0,0 +1,59 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "owner_id": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "source_name": {
+            "type": "string"
+        },
+        "origin": {
+            "type": "string"
+        },
+        "origin_id": {
+            "type": "null"
+        },
+        "channel": {
+            "type": "null"
+        },
+        "channel_id": {
+            "type": "null"
+        },
+        "was_seen": {
+            "type": "boolean"
+        },
+        "next_activity_id": {
+            "type": "null"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/get.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/get.json
new file mode 100644
index 0000000000..925e6db8fc
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/get.json
@@ -0,0 +1,139 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "owner_id": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "value": {
+            "type": "null"
+        },
+        "expected_close_date": {
+            "type": "null"
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "source_name": {
+            "type": "string"
+        },
+        "origin": {
+            "type": "string"
+        },
+        "was_seen": {
+            "type": "boolean"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "4ab3d8a89fda2c9c54d97f0866fee6466972fe89": {
+            "type": "string"
+        },
+        "53ffd671d280f0c9a55970cd84f45aa77cd530a4": {
+            "type": "integer"
+        },
+        "841a75f7e934371ba8232f7ae7dd0d7628c64e1d": {
+            "type": "string"
+        },
+        "1fe8e42d10e3d2157622d5a889c23d5ca032294c": {
+            "type": "string"
+        },
+        "6f2173470675a59837cc6c1b1c5b14ceb7179e4f": {
+            "type": "string"
+        },
+        "f322f098a65fdf8a89a37594fc726b96fd2592ca": {
+            "type": "integer"
+        },
+        "97e2e0d8a08e9db54e358145686d3819db5199aa": {
+            "type": "integer"
+        },
+        "90bb36492fc0f0a792825991428c1c37b128c747": {
+            "type": "integer"
+        },
+        "605ad30ac60d0abead1b24ca6da7358da39bb2dd": {
+            "type": "integer"
+        },
+        "0244d091c3f4dc963af267bc3f0625f62f0a113a": {
+            "type": "string"
+        },
+        "4b897f0541c86ebbc895f37a74cd233a37dff4f9": {
+            "type": "string"
+        },
+        "5c6879c9e1846491da9e6be9352adc15e3cfba2f": {
+            "type": "string"
+        },
+        "51dd778f70a8d2183487a4646fdfa4409592b805": {
+            "type": "integer"
+        },
+        "4a05b7107a6d10f807b1ce20cab44920705ee27a": {
+            "type": "string"
+        },
+        "fef1cec50bfba8fbccf025d21faaeaf49be5d9a4": {
+            "type": "string"
+        },
+        "766c4133375414b0769c3961a5b1b762add94778": {
+            "type": "string"
+        },
+        "0a3b7c687c6e1d9349c9051f3b8479c2d55170c8": {
+            "type": "string"
+        },
+        "9ad5f2cc62f7926372c1f95ae8425a09d721ef50": {
+            "type": "integer"
+        },
+        "725468bc0f1074227a97ce5a9a1c3b6444d05004": {
+            "type": "string"
+        },
+        "02edbeb283d17eea411157a711119d0a03694866": {
+            "type": "string"
+        },
+        "03c06dc14ea780dd8c69ec5ca37ba7579d87454a": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "title",
+        "owner_id",
+        "creator_id",
+        "label_ids",
+        "value",
+        "expected_close_date",
+        "person_id",
+        "organization_id",
+        "is_archived",
+        "source_name",
+        "origin",
+        "origin_id",
+        "channel",
+        "channel_id",
+        "was_seen",
+        "next_activity_id",
+        "add_time",
+        "update_time",
+        "visible_to",
+        "cc_email"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/getAll.json
new file mode 100644
index 0000000000..feeb21ca9c
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/lead/getAll.json
@@ -0,0 +1,73 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "owner_id": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "integer"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "source_name": {
+            "type": "string"
+        },
+        "origin": {
+            "type": "string"
+        },
+        "channel_id": {
+            "type": "null"
+        },
+        "was_seen": {
+            "type": "boolean"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "title",
+        "owner_id",
+        "creator_id",
+        "label_ids",
+        "value",
+        "expected_close_date",
+        "person_id",
+        "organization_id",
+        "is_archived",
+        "source_name",
+        "origin",
+        "origin_id",
+        "channel",
+        "channel_id",
+        "was_seen",
+        "next_activity_id",
+        "add_time",
+        "update_time",
+        "visible_to",
+        "cc_email"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/note/create.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/note/create.json
new file mode 100644
index 0000000000..affa74b262
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/note/create.json
@@ -0,0 +1,69 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "user_id": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "pinned_to_deal_flag": {
+            "type": "boolean"
+        },
+        "pinned_to_person_flag": {
+            "type": "boolean"
+        },
+        "pinned_to_organization_flag": {
+            "type": "boolean"
+        },
+        "pinned_to_lead_flag": {
+            "type": "boolean"
+        },
+        "last_update_user_id": {
+            "type": "null"
+        },
+        "organization": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name"
+            ]
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "email": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "is_you": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "email",
+                "name",
+                "icon_url",
+                "is_you"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/create.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/create.json
new file mode 100644
index 0000000000..b5fca53692
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/create.json
@@ -0,0 +1,181 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "people_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "picture_id": {
+            "type": "null"
+        },
+        "country_code": {
+            "type": "null"
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "delete_time": {
+            "type": "null"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "next_activity_date": {
+            "type": "null"
+        },
+        "next_activity_time": {
+            "type": "null"
+        },
+        "next_activity_id": {
+            "type": "null"
+        },
+        "last_activity_id": {
+            "type": "null"
+        },
+        "last_activity_date": {
+            "type": "null"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "address_subpremise": {
+            "type": "null"
+        },
+        "address_street_number": {
+            "type": "null"
+        },
+        "address_route": {
+            "type": "null"
+        },
+        "address_sublocality": {
+            "type": "null"
+        },
+        "address_locality": {
+            "type": "null"
+        },
+        "address_admin_area_level_1": {
+            "type": "null"
+        },
+        "address_admin_area_level_2": {
+            "type": "null"
+        },
+        "address_country": {
+            "type": "null"
+        },
+        "address_postal_code": {
+            "type": "null"
+        },
+        "address_formatted_address": {
+            "type": "null"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "edit_name": {
+            "type": "boolean"
+        },
+        "category_id": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/get.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/get.json
new file mode 100644
index 0000000000..119ce50a15
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/get.json
@@ -0,0 +1,136 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "people_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "picture_id": {
+            "type": "null"
+        },
+        "country_code": {
+            "type": "null"
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "next_activity_time": {
+            "type": "null"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "edit_name": {
+            "type": "boolean"
+        },
+        "category_id": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/getAll.json
new file mode 100644
index 0000000000..3127df038a
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/getAll.json
@@ -0,0 +1,153 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "people_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "picture_id": {
+            "type": "null"
+        },
+        "country_code": {
+            "type": "null"
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "delete_time": {
+            "type": "null"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "category_id": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "company_id",
+        "related_open_deals_count",
+        "related_closed_deals_count",
+        "files_count",
+        "notes_count",
+        "followers_count",
+        "related_won_deals_count",
+        "related_lost_deals_count",
+        "active_flag",
+        "country_code",
+        "first_char",
+        "delete_time",
+        "next_activity_time",
+        "next_activity_id",
+        "last_activity_id",
+        "label_ids",
+        "owner_name",
+        "cc_email"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/search.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/search.json
new file mode 100644
index 0000000000..e4ebaed2c6
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/search.json
@@ -0,0 +1,37 @@
+{
+    "type": "object",
+    "properties": {
+        "result_score": {
+            "type": "number"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "integer"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "notes": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/update.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/update.json
new file mode 100644
index 0000000000..9506dadd0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/organization/update.json
@@ -0,0 +1,133 @@
+{
+    "type": "object",
+    "properties": {
+        "company_id": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "country_code": {
+            "type": "null"
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "delete_time": {
+            "type": "null"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "category_id": {
+            "type": "null"
+        },
+        "ID": {
+            "type": "integer"
+        },
+        "Owner": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "Name": {
+            "type": "string"
+        },
+        "Open deals": {
+            "type": "integer"
+        },
+        "Closed deals": {
+            "type": "integer"
+        },
+        "Email messages count": {
+            "type": "integer"
+        },
+        "People": {
+            "type": "integer"
+        },
+        "Total activities": {
+            "type": "integer"
+        },
+        "Done activities": {
+            "type": "integer"
+        },
+        "Activities to do": {
+            "type": "integer"
+        },
+        "Won deals": {
+            "type": "integer"
+        },
+        "Lost deals": {
+            "type": "integer"
+        },
+        "Profile picture": {
+            "type": "null"
+        },
+        "Update time": {
+            "type": "string"
+        },
+        "Organization created": {
+            "type": "string"
+        },
+        "Visible to": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/create.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/create.json
new file mode 100644
index 0000000000..afe9998875
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/create.json
@@ -0,0 +1,250 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "participant_open_deals_count": {
+            "type": "integer"
+        },
+        "participant_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "phone": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    },
+                    "label": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "email": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "label": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "delete_time": {
+            "type": "null"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "picture_id": {
+            "type": "null"
+        },
+        "next_activity_date": {
+            "type": "null"
+        },
+        "next_activity_time": {
+            "type": "null"
+        },
+        "next_activity_id": {
+            "type": "null"
+        },
+        "last_activity_id": {
+            "type": "null"
+        },
+        "last_activity_date": {
+            "type": "null"
+        },
+        "last_incoming_mail_time": {
+            "type": "null"
+        },
+        "last_outgoing_mail_time": {
+            "type": "null"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "im": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "postal_address": {
+            "type": "null"
+        },
+        "postal_address_lat": {
+            "type": "null"
+        },
+        "postal_address_long": {
+            "type": "null"
+        },
+        "postal_address_subpremise": {
+            "type": "null"
+        },
+        "postal_address_street_number": {
+            "type": "null"
+        },
+        "postal_address_route": {
+            "type": "null"
+        },
+        "postal_address_sublocality": {
+            "type": "null"
+        },
+        "postal_address_locality": {
+            "type": "null"
+        },
+        "postal_address_admin_area_level_1": {
+            "type": "null"
+        },
+        "postal_address_admin_area_level_2": {
+            "type": "null"
+        },
+        "postal_address_country": {
+            "type": "null"
+        },
+        "postal_address_postal_code": {
+            "type": "null"
+        },
+        "postal_address_formatted_address": {
+            "type": "null"
+        },
+        "birthday": {
+            "type": "null"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "owner_name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/get.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/get.json
new file mode 100644
index 0000000000..3bb566b98e
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/get.json
@@ -0,0 +1,193 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "participant_open_deals_count": {
+            "type": "integer"
+        },
+        "participant_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "phone": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "label": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "email": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "label": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "im": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "postal_address_lat": {
+            "type": "null"
+        },
+        "postal_address_long": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/getAll.json
new file mode 100644
index 0000000000..d48bd924e2
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/getAll.json
@@ -0,0 +1,221 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "participant_open_deals_count": {
+            "type": "integer"
+        },
+        "participant_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "phone": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "email": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "delete_time": {
+            "type": "null"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "im": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "postal_address_subpremise": {
+            "type": "null"
+        },
+        "postal_address_sublocality": {
+            "type": "null"
+        },
+        "birthday": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "postal_address_lat": {
+            "type": "null"
+        },
+        "postal_address_long": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "related_open_deals_count",
+        "related_closed_deals_count",
+        "participant_open_deals_count",
+        "participant_closed_deals_count",
+        "files_count",
+        "notes_count",
+        "followers_count",
+        "related_won_deals_count",
+        "related_lost_deals_count",
+        "active_flag",
+        "first_char",
+        "delete_time",
+        "next_activity_time",
+        "next_activity_id",
+        "last_activity_id",
+        "label_ids",
+        "org_name",
+        "owner_name",
+        "primary_email",
+        "cc_email"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/search.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/search.json
new file mode 100644
index 0000000000..1b5730acd5
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/search.json
@@ -0,0 +1,58 @@
+{
+    "type": "object",
+    "properties": {
+        "result_score": {
+            "type": "number"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "phones": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "emails": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "visible_to": {
+            "type": "integer"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "notes": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "update_time": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/update.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/update.json
new file mode 100644
index 0000000000..4ad5faf4c3
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/person/update.json
@@ -0,0 +1,205 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "open_deals_count": {
+            "type": "integer"
+        },
+        "related_open_deals_count": {
+            "type": "integer"
+        },
+        "closed_deals_count": {
+            "type": "integer"
+        },
+        "related_closed_deals_count": {
+            "type": "integer"
+        },
+        "participant_open_deals_count": {
+            "type": "integer"
+        },
+        "participant_closed_deals_count": {
+            "type": "integer"
+        },
+        "email_messages_count": {
+            "type": "integer"
+        },
+        "activities_count": {
+            "type": "integer"
+        },
+        "done_activities_count": {
+            "type": "integer"
+        },
+        "undone_activities_count": {
+            "type": "integer"
+        },
+        "files_count": {
+            "type": "integer"
+        },
+        "notes_count": {
+            "type": "integer"
+        },
+        "followers_count": {
+            "type": "integer"
+        },
+        "won_deals_count": {
+            "type": "integer"
+        },
+        "related_won_deals_count": {
+            "type": "integer"
+        },
+        "lost_deals_count": {
+            "type": "integer"
+        },
+        "related_lost_deals_count": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "phone": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "label": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "email": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "label": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "delete_time": {
+            "type": "null"
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "label_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "im": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "value": {
+                        "type": "string"
+                    },
+                    "primary": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "value",
+                    "primary"
+                ]
+            }
+        },
+        "postal_address_lat": {
+            "type": "null"
+        },
+        "postal_address_long": {
+            "type": "null"
+        },
+        "postal_address_subpremise": {
+            "type": "null"
+        },
+        "owner_name": {
+            "type": "string"
+        },
+        "company_id": {
+            "type": "integer"
+        },
+        "cc_email": {
+            "type": "string"
+        },
+        "marketing_status": {
+            "type": "string"
+        },
+        "doi_status": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/product/getAll.json b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/product/getAll.json
new file mode 100644
index 0000000000..1e67b3d077
--- /dev/null
+++ b/packages/nodes-base/nodes/Pipedrive/__schema__/v1.0.0/product/getAll.json
@@ -0,0 +1,181 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "tax": {
+            "type": "integer"
+        },
+        "active_flag": {
+            "type": "boolean"
+        },
+        "selectable": {
+            "type": "boolean"
+        },
+        "first_char": {
+            "type": "string"
+        },
+        "visible_to": {
+            "type": "string"
+        },
+        "owner_id": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "has_pic": {
+                    "type": "integer"
+                },
+                "pic_hash": {
+                    "type": "null"
+                },
+                "active_flag": {
+                    "type": "boolean"
+                },
+                "value": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "email",
+                "has_pic",
+                "pic_hash",
+                "active_flag",
+                "value"
+            ]
+        },
+        "add_time": {
+            "type": "string"
+        },
+        "update_time": {
+            "type": "string"
+        },
+        "billing_frequency": {
+            "type": "string"
+        },
+        "billing_frequency_cycles": {
+            "type": "null"
+        },
+        "prices": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "currency": {
+                        "type": "string"
+                    },
+                    "notes": {
+                        "type": "string"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "price",
+                    "currency",
+                    "cost",
+                    "overhead_cost",
+                    "notes",
+                    "product_id"
+                ]
+            }
+        },
+        "product_variations": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "prices": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "product_id": {
+                                    "type": "integer"
+                                },
+                                "product_variation_id": {
+                                    "type": "integer"
+                                },
+                                "currency": {
+                                    "type": "string"
+                                },
+                                "cost": {
+                                    "type": "integer"
+                                },
+                                "comment": {
+                                    "type": "string"
+                                },
+                                "overhead_cost": {
+                                    "type": "integer"
+                                },
+                                "price": {
+                                    "type": "integer"
+                                },
+                                "price_formatted": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "product_id",
+                                "product_variation_id",
+                                "currency",
+                                "cost",
+                                "comment",
+                                "overhead_cost",
+                                "price",
+                                "price_formatted"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "product_id",
+                    "prices"
+                ]
+            }
+        }
+    },
+    "required": [
+        "active_flag",
+        "first_char",
+        "files_count",
+        "add_time",
+        "update_time",
+        "billing_frequency",
+        "prices",
+        "product_variations"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Plivo/Plivo.node.ts b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
index 53f651a31c..30f8f90352 100644
--- a/packages/nodes-base/nodes/Plivo/Plivo.node.ts
+++ b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
@@ -24,6 +24,7 @@ export class Plivo implements INodeType {
 		defaults: {
 			name: 'Plivo',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/PostBin/PostBin.node.ts b/packages/nodes-base/nodes/PostBin/PostBin.node.ts
index 4547ca1fc5..d82f0d52fa 100644
--- a/packages/nodes-base/nodes/PostBin/PostBin.node.ts
+++ b/packages/nodes-base/nodes/PostBin/PostBin.node.ts
@@ -16,6 +16,7 @@ export class PostBin implements INodeType {
 		defaults: {
 			name: 'PostBin',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [],
diff --git a/packages/nodes-base/nodes/PostBin/__schema__/v1.0.0/request/send.json b/packages/nodes-base/nodes/PostBin/__schema__/v1.0.0/request/send.json
new file mode 100644
index 0000000000..8d9474c24a
--- /dev/null
+++ b/packages/nodes-base/nodes/PostBin/__schema__/v1.0.0/request/send.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "requestId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index 3a894815a8..ad2f23dfda 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -27,6 +27,7 @@ export class PostHog implements INodeType {
 		defaults: {
 			name: 'PostHog',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
index 6dcb91ce7d..4465cea975 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
@@ -7,8 +7,8 @@ import type {
 	INodeListSearchItems,
 } from 'n8n-workflow';
 
+import { configurePostgres } from './transport';
 import type { PgpDatabase, PostgresNodeCredentials } from './v2/helpers/interfaces';
-import { configurePostgres } from './v2/transport';
 
 export function prepareNames(id: string, mode: string, additionalFields: IDataObject) {
 	let suffix = id.replace(/-/g, '_');
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
index 5a7addf0d1..a2c0055590 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -1151,3 +1151,184 @@ describe('Test PostgresV2, upsert operation', () => {
 		);
 	});
 });
+
+describe('When matching on all columns', () => {
+	it('dataMode: define, should call runQueries with', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'upsert',
+			schema: {
+				__rl: true,
+				mode: 'list',
+				value: 'public',
+			},
+			table: {
+				__rl: true,
+				value: 'my_table',
+				mode: 'list',
+			},
+			columns: {
+				matchingColumns: ['id', 'json', 'foo'],
+				value: { id: '5', json: '{ "test": 5 }', foo: 'data 5' },
+				mappingMode: 'defineBelow',
+			},
+			options: {
+				outputColumns: ['json'],
+				nodeVersion: 2.5,
+			},
+		};
+		const columnsInfo: ColumnInfo[] = [
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
+		];
+		const inputItems = [
+			{
+				json: {
+					id: 1,
+					json: {
+						test: 15,
+					},
+					foo: 'data 1',
+				},
+			},
+		];
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await upsert.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			inputItems,
+			nodeOptions,
+			createMockDb(columnsInfo),
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING $7:name',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: '5', json: '{ "test": 5 }', foo: 'data 5' },
+						['json'],
+					],
+				},
+			],
+			inputItems,
+			nodeOptions,
+		);
+	});
+
+	it('dataMode: autoMapInputData, should call runQueries with', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'upsert',
+			schema: {
+				__rl: true,
+				mode: 'list',
+				value: 'public',
+			},
+			table: {
+				__rl: true,
+				value: 'my_table',
+				mode: 'list',
+			},
+			columns: {
+				matchingColumns: ['id', 'json', 'foo'],
+				mappingMode: 'autoMapInputData',
+			},
+			options: { nodeVersion: 2.5 },
+		};
+		const columnsInfo: ColumnInfo[] = [
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
+		];
+
+		const inputItems = [
+			{
+				json: {
+					id: 1,
+					json: {
+						test: 15,
+					},
+					foo: 'data 1',
+				},
+			},
+			{
+				json: {
+					id: 2,
+					json: {
+						test: 10,
+					},
+					foo: 'data 2',
+				},
+			},
+			{
+				json: {
+					id: 3,
+					json: {
+						test: 5,
+					},
+					foo: 'data 3',
+				},
+			},
+		];
+
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await upsert.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			inputItems,
+			nodeOptions,
+			createMockDb(columnsInfo),
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING *',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: 1, json: { test: 15 }, foo: 'data 1' },
+					],
+				},
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING *',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: 2, json: { test: 10 }, foo: 'data 2' },
+					],
+				},
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING *',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: 3, json: { test: 5 }, foo: 'data 3' },
+					],
+				},
+			],
+			inputItems,
+			nodeOptions,
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
index 86689890f2..fff4d7d39f 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
@@ -49,7 +49,7 @@ describe('Test PostgresV2, runQueries', () => {
 
 		expect(result).toBeDefined();
 		expect(result).toHaveLength(1);
-		expect(result).toEqual([{ json: { success: true }, pairedItem: [{ item: 0 }] }]);
+		expect(result).toEqual([{ json: { success: true }, pairedItem: undefined }]);
 		expect(dbMultiSpy).toHaveBeenCalledWith('SELECT * FROM table');
 	});
 });
diff --git a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts b/packages/nodes-base/nodes/Postgres/transport/index.ts
similarity index 97%
rename from packages/nodes-base/nodes/Postgres/v2/transport/index.ts
rename to packages/nodes-base/nodes/Postgres/transport/index.ts
index 0f1dfbf72b..71684ddf95 100644
--- a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Postgres/transport/index.ts
@@ -16,7 +16,7 @@ import type {
 	PgpConnectionParameters,
 	PostgresNodeCredentials,
 	PostgresNodeOptions,
-} from '../helpers/interfaces';
+} from '../v2/helpers/interfaces';
 
 const getPostgresConfig = (
 	credentials: PostgresNodeCredentials,
@@ -29,6 +29,7 @@ const getPostgresConfig = (
 		user: credentials.user,
 		password: credentials.password,
 		keepAlive: true,
+		max: credentials.maxConnections,
 	};
 
 	if (options.connectionTimeout) {
@@ -185,7 +186,7 @@ export async function configurePostgres(
 		nodeVersion: options.nodeVersion as unknown as string,
 		fallBackHandler,
 		cleanUpHandler: async ({ db }) => {
-			await db.$pool.end();
+			if (!db.$pool.ended) await db.$pool.end();
 		},
 	});
 }
diff --git a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
index 3924a16e4b..a716ddcc33 100644
--- a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
@@ -1,7 +1,6 @@
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
-	IDataObject,
 	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
@@ -10,11 +9,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import pgPromise from 'pg-promise';
 
 import { oldVersionNotice } from '@utils/descriptions';
 
 import { pgInsertV2, pgQueryV2, pgUpdate, wrapData } from './genericFunctions';
+import { configurePostgres } from '../transport';
+import type { PgpConnection, PostgresNodeCredentials } from '../v2/helpers/interfaces';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Postgres',
@@ -298,33 +298,27 @@ export class PostgresV1 implements INodeType {
 				this: ICredentialTestFunctions,
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
-				const credentials = credential.data as IDataObject;
+				const credentials = credential.data as PostgresNodeCredentials;
+
+				let connection: PgpConnection | undefined;
+
 				try {
-					const pgp = pgPromise();
-					const config: IDataObject = {
-						host: credentials.host as string,
-						port: credentials.port as number,
-						database: credentials.database as string,
-						user: credentials.user as string,
-						password: credentials.password as string,
-					};
+					const { db } = await configurePostgres.call(this, credentials, {});
 
-					if (credentials.allowUnauthorizedCerts === true) {
-						config.ssl = {
-							rejectUnauthorized: false,
-						};
-					} else {
-						config.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
-						config.sslmode = (credentials.ssl as string) || 'disable';
-					}
-
-					const db = pgp(config);
-					await db.connect();
+					// Acquires a new connection that can be used to to run multiple
+					// queries on the same connection and must be released again
+					// manually.
+					connection = await db.connect();
 				} catch (error) {
 					return {
 						status: 'Error',
 						message: error.message,
 					};
+				} finally {
+					if (connection) {
+						// release connection
+						await connection.done();
+					}
 				}
 				return {
 					status: 'OK',
@@ -335,42 +329,19 @@ export class PostgresV1 implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const credentials = await this.getCredentials('postgres');
+		const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
 		const largeNumbersOutput = this.getNodeParameter(
 			'additionalFields.largeNumbersOutput',
 			0,
 			'',
 		) as string;
 
-		const pgp = pgPromise();
-
-		if (largeNumbersOutput === 'numbers') {
-			pgp.pg.types.setTypeParser(20, (value: string) => {
-				return parseInt(value, 10);
-			});
-			pgp.pg.types.setTypeParser(1700, (value: string) => {
-				return parseFloat(value);
-			});
-		}
-
-		const config: IDataObject = {
-			host: credentials.host as string,
-			port: credentials.port as number,
-			database: credentials.database as string,
-			user: credentials.user as string,
-			password: credentials.password as string,
-		};
-
-		if (credentials.allowUnauthorizedCerts === true) {
-			config.ssl = {
-				rejectUnauthorized: false,
-			};
-		} else {
-			config.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
-			config.sslmode = (credentials.ssl as string) || 'disable';
-		}
-
-		const db = pgp(config);
+		const { db, pgp } = await configurePostgres.call(this, credentials, {
+			largeNumbersOutput:
+				largeNumbersOutput === 'numbers' || largeNumbersOutput === 'text'
+					? largeNumbersOutput
+					: undefined,
+		});
 
 		let returnItems: INodeExecutionData[] = [];
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
index 7a43605d56..4a9567e5c2 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
@@ -285,7 +285,7 @@ export async function execute(
 			valuesLength = valuesLength + 1;
 			values.push(column);
 		});
-		const onConflict = ` ON CONFLICT (${conflictColumns.join(',')}) DO UPDATE `;
+		const onConflict = ` ON CONFLICT (${conflictColumns.join(',')})`;
 
 		const insertQuery = `INSERT INTO $1:name.$2:name($${valuesLength}:name) VALUES($${valuesLength}:csv)${onConflict}`;
 		valuesLength = valuesLength + 1;
@@ -300,7 +300,9 @@ export async function execute(
 			values.push(column, item[column] as string);
 		}
 
-		let query = `${insertQuery} SET ${updates.join(', ')}`;
+		const updateQuery =
+			updates?.length > 0 ? ` DO UPDATE  SET ${updates.join(', ')}` : ' DO NOTHING ';
+		let query = `${insertQuery}${updateQuery}`;
 
 		const outputColumns = this.getNodeParameter('options.outputColumns', i, ['*']) as string[];
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index 883aff090a..4d64a7bba1 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -3,9 +3,9 @@ import { NodeExecutionOutput, NodeOperationError } from 'n8n-workflow';
 
 import * as database from './database/Database.resource';
 import type { PostgresType } from './node.type';
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
 import { configureQueryRunner } from '../helpers/utils';
-import { configurePostgres } from '../transport';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
index 7ca5a93b2f..0cd3cfdb74 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
@@ -28,6 +28,7 @@ export type EnumInfo = {
 export type PgpClient = pgPromise.IMain<{}, pg.IClient>;
 export type PgpDatabase = pgPromise.IDatabase<{}, pg.IClient>;
 export type PgpConnectionParameters = pg.IConnectionParameters<pg.IClient>;
+export type PgpConnection = pgPromise.IConnected<{}, pg.IClient>;
 export type ConnectionsData = { db: PgpDatabase; pgp: PgpClient };
 
 export type QueriesRunner = (
@@ -57,6 +58,7 @@ export type PostgresNodeCredentials = {
 	database: string;
 	user: string;
 	password: string;
+	maxConnections: number;
 	allowUnauthorizedCerts?: boolean;
 	ssl?: 'disable' | 'allow' | 'require' | 'verify' | 'verify-full';
 } & (
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 289c8fe351..67c8e74f3f 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -19,7 +19,6 @@ import type {
 	SortRule,
 	WhereClause,
 } from './interfaces';
-import { generatePairedItemData } from '../../../../utils/utilities';
 
 export function isJSON(str: string) {
 	try {
@@ -252,17 +251,15 @@ export function configureQueryRunner(
 					.flat();
 
 				if (!returnData.length) {
-					const pairedItem = generatePairedItemData(queries.length);
-
 					if ((options?.nodeVersion as number) < 2.3) {
 						if (emptyReturnData.length) {
-							emptyReturnData[0].pairedItem = pairedItem;
+							emptyReturnData[0].pairedItem = undefined;
 						}
 						returnData = emptyReturnData;
 					} else {
 						returnData = queries.every((query) => isSelectQuery(query.query))
 							? []
-							: [{ json: { success: true }, pairedItem }];
+							: [{ json: { success: true } }];
 					}
 				}
 			} catch (err) {
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
index a9adf70a3e..103d25b9c4 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
@@ -4,8 +4,8 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import type { PgpClient, PostgresNodeCredentials } from '../helpers/interfaces';
-import { configurePostgres } from '../transport';
+import { configurePostgres } from '../../transport';
+import type { PgpConnection, PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function postgresConnectionTest(
 	this: ICredentialTestFunctions,
@@ -13,14 +13,12 @@ export async function postgresConnectionTest(
 ): Promise<INodeCredentialTestResult> {
 	const credentials = credential.data as PostgresNodeCredentials;
 
-	let pgpClientCreated: PgpClient | undefined;
+	let connection: PgpConnection | undefined;
 
 	try {
-		const { db, pgp } = await configurePostgres.call(this, credentials, {});
+		const { db } = await configurePostgres.call(this, credentials, {});
 
-		pgpClientCreated = pgp;
-
-		await db.connect();
+		connection = await db.connect();
 	} catch (error) {
 		let message = error.message as string;
 
@@ -41,8 +39,8 @@ export async function postgresConnectionTest(
 			message,
 		};
 	} finally {
-		if (pgpClientCreated) {
-			pgpClientCreated.end();
+		if (connection) {
+			await connection.done();
 		}
 	}
 	return {
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
index 67482d4381..f6d62c124e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
@@ -1,7 +1,7 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
 
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
-import { configurePostgres } from '../transport';
 
 export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
index c8fb75436d..ecd7f374f3 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
@@ -1,8 +1,8 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
 import { getTableSchema } from '../helpers/utils';
-import { configurePostgres } from '../transport';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
index acc44b5314..3319bdf2f6 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
@@ -1,8 +1,8 @@
 import type { ILoadOptionsFunctions, ResourceMapperFields, FieldType } from 'n8n-workflow';
 
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
 import { getEnumValues, getEnums, getTableSchema, uniqueColumns } from '../helpers/utils';
-import { configurePostgres } from '../transport';
 
 const fieldTypeMapping: Partial<Record<FieldType, string[]>> = {
 	string: ['text', 'varchar', 'character varying', 'character', 'char'],
diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
index d12b74076a..91659bb456 100644
--- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
+++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
@@ -31,6 +31,7 @@ export class ProfitWell implements INodeType {
 		defaults: {
 			name: 'ProfitWell',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 3217524e86..1a72b894be 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -24,6 +24,7 @@ export class Pushbullet implements INodeType {
 		defaults: {
 			name: 'Pushbullet',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
index 0e67a72c84..2f1cad52a6 100644
--- a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
@@ -24,6 +24,7 @@ export class Pushcut implements INodeType {
 		defaults: {
 			name: 'Pushcut',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Pushcut/__schema__/v1.0.0/notification/send.json b/packages/nodes-base/nodes/Pushcut/__schema__/v1.0.0/notification/send.json
new file mode 100644
index 0000000000..d2aeec5780
--- /dev/null
+++ b/packages/nodes-base/nodes/Pushcut/__schema__/v1.0.0/notification/send.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "message": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "notificationId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "message",
+        "id",
+        "notificationId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 4bde7d7e38..00212d9171 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -23,6 +23,7 @@ export class Pushover implements INodeType {
 		defaults: {
 			name: 'Pushover',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Pushover/__schema__/v1.0.0/message/push.json b/packages/nodes-base/nodes/Pushover/__schema__/v1.0.0/message/push.json
new file mode 100644
index 0000000000..029c520f62
--- /dev/null
+++ b/packages/nodes-base/nodes/Pushover/__schema__/v1.0.0/message/push.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "status": {
+            "type": "integer"
+        },
+        "request": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "status",
+        "request"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 677fe785e9..03bdb1e1c6 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -21,6 +21,7 @@ export class QuestDb implements INodeType {
 		defaults: {
 			name: 'QuestDB',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		parameterPane: 'wide',
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index 4e4b7d29ba..433233805e 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -19,7 +19,6 @@ import {
 } from './GenericFunctions';
 import { recordFields, recordOperations } from './RecordDescription';
 import { reportFields, reportOperations } from './ReportDescription';
-import { generatePairedItemData } from '../../utils/utilities';
 
 export class QuickBase implements INodeType {
 	description: INodeTypeDescription = {
@@ -34,6 +33,7 @@ export class QuickBase implements INodeType {
 		defaults: {
 			name: 'Quick Base',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -113,7 +113,6 @@ export class QuickBase implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const itemData = generatePairedItemData(items.length);
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
@@ -291,10 +290,7 @@ export class QuickBase implements INodeType {
 					}
 				}
 
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData },
-				);
+				const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 
 				returnData.push(...executionData);
 			}
@@ -461,10 +457,7 @@ export class QuickBase implements INodeType {
 					}
 				}
 
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData },
-				);
+				const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 
 				returnData.push(...executionData);
 			}
@@ -544,10 +537,7 @@ export class QuickBase implements INodeType {
 					}
 				}
 
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData as IDataObject[]),
-					{ itemData },
-				);
+				const executionData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 
 				returnData.push(...executionData);
 			}
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 2f73fe28e7..0f4420ee9d 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -59,6 +59,7 @@ export class QuickBooks implements INodeType {
 		defaults: {
 			name: 'QuickBooks Online',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/bill/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/bill/getAll.json
new file mode 100644
index 0000000000..f9f863e775
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/bill/getAll.json
@@ -0,0 +1,263 @@
+{
+    "type": "object",
+    "properties": {
+        "DueDate": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Id": {
+                        "type": "string"
+                    },
+                    "LineNum": {
+                        "type": "integer"
+                    },
+                    "Description": {
+                        "type": "string"
+                    },
+                    "DetailType": {
+                        "type": "string"
+                    },
+                    "AccountBasedExpenseLineDetail": {
+                        "type": "object",
+                        "properties": {
+                            "AccountRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "name"
+                                ]
+                            },
+                            "BillableStatus": {
+                                "type": "string"
+                            },
+                            "TaxCodeRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "AccountRef",
+                            "BillableStatus",
+                            "TaxCodeRef"
+                        ]
+                    }
+                },
+                "required": [
+                    "Id",
+                    "LineNum",
+                    "Amount",
+                    "DetailType"
+                ]
+            }
+        },
+        "VendorRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "APAccountRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "SalesTermRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "LinkedTxn": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "TxnId": {
+                        "type": "string"
+                    },
+                    "TxnType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "TxnId",
+                    "TxnType"
+                ]
+            }
+        },
+        "DocNumber": {
+            "type": "string"
+        },
+        "TxnTaxDetail": {
+            "type": "object",
+            "properties": {
+                "TotalTax": {
+                    "type": "number"
+                },
+                "TaxLine": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "Amount": {
+                                "type": "number"
+                            },
+                            "DetailType": {
+                                "type": "string"
+                            },
+                            "TaxLineDetail": {
+                                "type": "object",
+                                "properties": {
+                                    "TaxRateRef": {
+                                        "type": "object",
+                                        "properties": {
+                                            "value": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "value"
+                                        ]
+                                    },
+                                    "PercentBased": {
+                                        "type": "boolean"
+                                    },
+                                    "TaxPercent": {
+                                        "type": "integer"
+                                    },
+                                    "NetAmountTaxable": {
+                                        "type": "number"
+                                    }
+                                },
+                                "required": [
+                                    "TaxRateRef",
+                                    "PercentBased",
+                                    "TaxPercent",
+                                    "NetAmountTaxable"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "Amount",
+                            "DetailType",
+                            "TaxLineDetail"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "TotalTax",
+                "TaxLine"
+            ]
+        },
+        "GlobalTaxCalculation": {
+            "type": "string"
+        },
+        "PrivateNote": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "DueDate",
+        "Balance",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData",
+        "TxnDate",
+        "CurrencyRef",
+        "Line",
+        "VendorRef",
+        "APAccountRef",
+        "TotalAmt"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/create.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/create.json
new file mode 100644
index 0000000000..00efb340b9
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/create.json
@@ -0,0 +1,99 @@
+{
+    "type": "object",
+    "properties": {
+        "Taxable": {
+            "type": "boolean"
+        },
+        "Job": {
+            "type": "boolean"
+        },
+        "BillWithParent": {
+            "type": "boolean"
+        },
+        "Balance": {
+            "type": "integer"
+        },
+        "BalanceWithJobs": {
+            "type": "integer"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "PreferredDeliveryMethod": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "FullyQualifiedName": {
+            "type": "string"
+        },
+        "DisplayName": {
+            "type": "string"
+        },
+        "PrintOnCheckName": {
+            "type": "string"
+        },
+        "Active": {
+            "type": "boolean"
+        },
+        "PrimaryEmailAddr": {
+            "type": "object",
+            "properties": {
+                "Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address"
+            ]
+        },
+        "DefaultTaxCodeRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/get.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/get.json
new file mode 100644
index 0000000000..bfc5285b13
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/get.json
@@ -0,0 +1,143 @@
+{
+    "type": "object",
+    "properties": {
+        "Taxable": {
+            "type": "boolean"
+        },
+        "BillAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "City": {
+                    "type": "string"
+                },
+                "PostalCode": {
+                    "type": "string"
+                },
+                "CountrySubDivisionCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "Job": {
+            "type": "boolean"
+        },
+        "BillWithParent": {
+            "type": "boolean"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "PreferredDeliveryMethod": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "FullyQualifiedName": {
+            "type": "string"
+        },
+        "CompanyName": {
+            "type": "string"
+        },
+        "DisplayName": {
+            "type": "string"
+        },
+        "PrintOnCheckName": {
+            "type": "string"
+        },
+        "Active": {
+            "type": "boolean"
+        },
+        "PrimaryEmailAddr": {
+            "type": "object",
+            "properties": {
+                "Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address"
+            ]
+        },
+        "DefaultTaxCodeRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "GivenName": {
+            "type": "string"
+        },
+        "FamilyName": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Taxable",
+        "Job",
+        "BillWithParent",
+        "Balance",
+        "BalanceWithJobs",
+        "CurrencyRef",
+        "PreferredDeliveryMethod",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData",
+        "FullyQualifiedName",
+        "DisplayName",
+        "PrintOnCheckName",
+        "Active"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/getAll.json
new file mode 100644
index 0000000000..3f1c78ecfa
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/customer/getAll.json
@@ -0,0 +1,167 @@
+{
+    "type": "object",
+    "properties": {
+        "Taxable": {
+            "type": "boolean"
+        },
+        "BillAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "City": {
+                    "type": "string"
+                },
+                "CountrySubDivisionCode": {
+                    "type": "string"
+                },
+                "PostalCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "ShipAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "City": {
+                    "type": "string"
+                },
+                "CountrySubDivisionCode": {
+                    "type": "string"
+                },
+                "PostalCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "Job": {
+            "type": "boolean"
+        },
+        "BillWithParent": {
+            "type": "boolean"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "PreferredDeliveryMethod": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "FullyQualifiedName": {
+            "type": "string"
+        },
+        "CompanyName": {
+            "type": "string"
+        },
+        "DisplayName": {
+            "type": "string"
+        },
+        "PrintOnCheckName": {
+            "type": "string"
+        },
+        "Active": {
+            "type": "boolean"
+        },
+        "PrimaryPhone": {
+            "type": "object",
+            "properties": {
+                "FreeFormNumber": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FreeFormNumber"
+            ]
+        },
+        "PrimaryEmailAddr": {
+            "type": "object",
+            "properties": {
+                "Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address"
+            ]
+        },
+        "SalesTermRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "Notes": {
+            "type": "string"
+        },
+        "WebAddr": {
+            "type": "object",
+            "properties": {
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "URI"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/create.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/create.json
new file mode 100644
index 0000000000..16de403ab2
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/create.json
@@ -0,0 +1,213 @@
+{
+    "type": "object",
+    "properties": {
+        "AllowIPNPayment": {
+            "type": "boolean"
+        },
+        "AllowOnlinePayment": {
+            "type": "boolean"
+        },
+        "AllowOnlineCreditCardPayment": {
+            "type": "boolean"
+        },
+        "AllowOnlineACHPayment": {
+            "type": "boolean"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "CustomField": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "DefinitionId": {
+                        "type": "string"
+                    },
+                    "Name": {
+                        "type": "string"
+                    },
+                    "Type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "DefinitionId",
+                    "Name",
+                    "Type"
+                ]
+            }
+        },
+        "DocNumber": {
+            "type": "string"
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "LinkedTxn": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "TxnId": {
+                        "type": "string"
+                    },
+                    "TxnType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "TxnId",
+                    "TxnType"
+                ]
+            }
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Id": {
+                        "type": "string"
+                    },
+                    "LineNum": {
+                        "type": "integer"
+                    },
+                    "Description": {
+                        "type": "string"
+                    },
+                    "DetailType": {
+                        "type": "string"
+                    },
+                    "SalesItemLineDetail": {
+                        "type": "object",
+                        "properties": {
+                            "ItemRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "name"
+                                ]
+                            },
+                            "TaxCodeRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "ItemRef"
+                        ]
+                    }
+                },
+                "required": [
+                    "Amount",
+                    "DetailType"
+                ]
+            }
+        },
+        "CustomerRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "BillAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "City": {
+                    "type": "string"
+                },
+                "CountrySubDivisionCode": {
+                    "type": "string"
+                },
+                "PostalCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "DueDate": {
+            "type": "string"
+        },
+        "ApplyTaxAfterDiscount": {
+            "type": "boolean"
+        },
+        "PrintStatus": {
+            "type": "string"
+        },
+        "EmailStatus": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/get.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/get.json
new file mode 100644
index 0000000000..c7d15e43c8
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/get.json
@@ -0,0 +1,245 @@
+{
+    "type": "object",
+    "properties": {
+        "AllowIPNPayment": {
+            "type": "boolean"
+        },
+        "AllowOnlinePayment": {
+            "type": "boolean"
+        },
+        "AllowOnlineCreditCardPayment": {
+            "type": "boolean"
+        },
+        "AllowOnlineACHPayment": {
+            "type": "boolean"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "CustomField": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "DefinitionId": {
+                        "type": "string"
+                    },
+                    "Name": {
+                        "type": "string"
+                    },
+                    "Type": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "DefinitionId",
+                    "Name",
+                    "Type"
+                ]
+            }
+        },
+        "DocNumber": {
+            "type": "string"
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "LinkedTxn": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "TxnId": {
+                        "type": "string"
+                    },
+                    "TxnType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "TxnId",
+                    "TxnType"
+                ]
+            }
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Id": {
+                        "type": "string"
+                    },
+                    "LineNum": {
+                        "type": "integer"
+                    },
+                    "Description": {
+                        "type": "string"
+                    },
+                    "DetailType": {
+                        "type": "string"
+                    },
+                    "SalesItemLineDetail": {
+                        "type": "object",
+                        "properties": {
+                            "ItemRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value"
+                                ]
+                            },
+                            "TaxCodeRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "ItemRef"
+                        ]
+                    }
+                },
+                "required": [
+                    "Amount",
+                    "DetailType"
+                ]
+            }
+        },
+        "CustomerRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "BillAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "City": {
+                    "type": "string"
+                },
+                "PostalCode": {
+                    "type": "string"
+                },
+                "CountrySubDivisionCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "DueDate": {
+            "type": "string"
+        },
+        "ApplyTaxAfterDiscount": {
+            "type": "boolean"
+        },
+        "PrintStatus": {
+            "type": "string"
+        },
+        "EmailStatus": {
+            "type": "string"
+        },
+        "BillEmail": {
+            "type": "object",
+            "properties": {
+                "Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address"
+            ]
+        }
+    },
+    "required": [
+        "AllowIPNPayment",
+        "AllowOnlinePayment",
+        "AllowOnlineCreditCardPayment",
+        "AllowOnlineACHPayment",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData",
+        "CustomField",
+        "TxnDate",
+        "CurrencyRef",
+        "LinkedTxn",
+        "Line",
+        "CustomerRef",
+        "DueDate",
+        "TotalAmt",
+        "PrintStatus",
+        "EmailStatus",
+        "Balance"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/getAll.json
new file mode 100644
index 0000000000..a5d2d980f0
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/invoice/getAll.json
@@ -0,0 +1,329 @@
+{
+    "type": "object",
+    "properties": {
+        "AllowIPNPayment": {
+            "type": "boolean"
+        },
+        "AllowOnlinePayment": {
+            "type": "boolean"
+        },
+        "AllowOnlineCreditCardPayment": {
+            "type": "boolean"
+        },
+        "AllowOnlineACHPayment": {
+            "type": "boolean"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "CustomField": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "DefinitionId": {
+                        "type": "string"
+                    },
+                    "Name": {
+                        "type": "string"
+                    },
+                    "Type": {
+                        "type": "string"
+                    },
+                    "StringValue": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "DefinitionId",
+                    "Name",
+                    "Type"
+                ]
+            }
+        },
+        "DocNumber": {
+            "type": "string"
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "LinkedTxn": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "TxnId": {
+                        "type": "string"
+                    },
+                    "TxnType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "TxnId",
+                    "TxnType"
+                ]
+            }
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Id": {
+                        "type": "string"
+                    },
+                    "LineNum": {
+                        "type": "integer"
+                    },
+                    "Description": {
+                        "type": "string"
+                    },
+                    "DetailType": {
+                        "type": "string"
+                    },
+                    "SalesItemLineDetail": {
+                        "type": "object",
+                        "properties": {
+                            "ItemRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "name"
+                                ]
+                            },
+                            "TaxCodeRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "ItemRef",
+                            "TaxCodeRef"
+                        ]
+                    }
+                },
+                "required": [
+                    "DetailType"
+                ]
+            }
+        },
+        "TxnTaxDetail": {
+            "type": "object",
+            "properties": {
+                "TxnTaxCodeRef": {
+                    "type": "object",
+                    "properties": {
+                        "value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "value"
+                    ]
+                },
+                "TaxLine": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "DetailType": {
+                                "type": "string"
+                            },
+                            "TaxLineDetail": {
+                                "type": "object",
+                                "properties": {
+                                    "TaxRateRef": {
+                                        "type": "object",
+                                        "properties": {
+                                            "value": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "value"
+                                        ]
+                                    },
+                                    "PercentBased": {
+                                        "type": "boolean"
+                                    }
+                                },
+                                "required": [
+                                    "TaxRateRef",
+                                    "PercentBased",
+                                    "TaxPercent",
+                                    "NetAmountTaxable"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "Amount",
+                            "DetailType",
+                            "TaxLineDetail"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "TotalTax"
+            ]
+        },
+        "CustomerRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "CustomerMemo": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "BillAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "Line2": {
+                    "type": "string"
+                },
+                "Line3": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "ShipAddr": {
+            "type": "object",
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Line1": {
+                    "type": "string"
+                },
+                "City": {
+                    "type": "string"
+                },
+                "PostalCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ]
+        },
+        "SalesTermRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "DueDate": {
+            "type": "string"
+        },
+        "ApplyTaxAfterDiscount": {
+            "type": "boolean"
+        },
+        "PrintStatus": {
+            "type": "string"
+        },
+        "EmailStatus": {
+            "type": "string"
+        },
+        "BillEmail": {
+            "type": "object",
+            "properties": {
+                "Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/item/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/item/getAll.json
new file mode 100644
index 0000000000..fbd4491349
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/item/getAll.json
@@ -0,0 +1,94 @@
+{
+    "type": "object",
+    "properties": {
+        "Name": {
+            "type": "string"
+        },
+        "Active": {
+            "type": "boolean"
+        },
+        "FullyQualifiedName": {
+            "type": "string"
+        },
+        "Taxable": {
+            "type": "boolean"
+        },
+        "Type": {
+            "type": "string"
+        },
+        "IncomeAccountRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "PurchaseCost": {
+            "type": "integer"
+        },
+        "TrackQtyOnHand": {
+            "type": "boolean"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "ExpenseAccountRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        }
+    },
+    "required": [
+        "Name",
+        "Active",
+        "FullyQualifiedName",
+        "Type",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/payment/get.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/payment/get.json
new file mode 100644
index 0000000000..8c06ac1970
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/payment/get.json
@@ -0,0 +1,199 @@
+{
+    "type": "object",
+    "properties": {
+        "CustomerRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "DepositToAccountRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "UnappliedAmt": {
+            "type": "integer"
+        },
+        "ProcessPayment": {
+            "type": "boolean"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "LinkedTxn": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "TxnId": {
+                                    "type": "string"
+                                },
+                                "TxnType": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "TxnId",
+                                "TxnType"
+                            ]
+                        }
+                    },
+                    "LineEx": {
+                        "type": "object",
+                        "properties": {
+                            "any": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "declaredType": {
+                                            "type": "string"
+                                        },
+                                        "scope": {
+                                            "type": "string"
+                                        },
+                                        "value": {
+                                            "type": "object",
+                                            "properties": {
+                                                "Name": {
+                                                    "type": "string"
+                                                },
+                                                "Value": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "Name",
+                                                "Value"
+                                            ]
+                                        },
+                                        "nil": {
+                                            "type": "boolean"
+                                        },
+                                        "globalScope": {
+                                            "type": "boolean"
+                                        },
+                                        "typeSubstituted": {
+                                            "type": "boolean"
+                                        }
+                                    },
+                                    "required": [
+                                        "name",
+                                        "declaredType",
+                                        "scope",
+                                        "value",
+                                        "nil",
+                                        "globalScope",
+                                        "typeSubstituted"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "any"
+                        ]
+                    }
+                },
+                "required": [
+                    "Amount",
+                    "LinkedTxn",
+                    "LineEx"
+                ]
+            }
+        },
+        "PaymentMethodRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "PaymentRefNum": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "CustomerRef",
+        "TotalAmt",
+        "UnappliedAmt",
+        "ProcessPayment",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData",
+        "TxnDate",
+        "CurrencyRef",
+        "Line"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/payment/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/payment/getAll.json
new file mode 100644
index 0000000000..f8cc35e25c
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/payment/getAll.json
@@ -0,0 +1,211 @@
+{
+    "type": "object",
+    "properties": {
+        "CustomerRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "DepositToAccountRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        },
+        "ProcessPayment": {
+            "type": "boolean"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "LinkedTxn": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "TxnId": {
+                                    "type": "string"
+                                },
+                                "TxnType": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "TxnId",
+                                "TxnType"
+                            ]
+                        }
+                    },
+                    "LineEx": {
+                        "type": "object",
+                        "properties": {
+                            "any": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "declaredType": {
+                                            "type": "string"
+                                        },
+                                        "scope": {
+                                            "type": "string"
+                                        },
+                                        "value": {
+                                            "type": "object",
+                                            "properties": {
+                                                "Name": {
+                                                    "type": "string"
+                                                },
+                                                "Value": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "Name",
+                                                "Value"
+                                            ]
+                                        },
+                                        "nil": {
+                                            "type": "boolean"
+                                        },
+                                        "globalScope": {
+                                            "type": "boolean"
+                                        },
+                                        "typeSubstituted": {
+                                            "type": "boolean"
+                                        }
+                                    },
+                                    "required": [
+                                        "name",
+                                        "declaredType",
+                                        "scope",
+                                        "value",
+                                        "nil",
+                                        "globalScope",
+                                        "typeSubstituted"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "any"
+                        ]
+                    }
+                },
+                "required": [
+                    "Amount",
+                    "LinkedTxn",
+                    "LineEx"
+                ]
+            }
+        },
+        "LinkedTxn": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "TxnId": {
+                        "type": "string"
+                    },
+                    "TxnType": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "TxnId",
+                    "TxnType"
+                ]
+            }
+        },
+        "PaymentMethodRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value"
+            ]
+        }
+    },
+    "required": [
+        "CustomerRef",
+        "TotalAmt",
+        "UnappliedAmt",
+        "ProcessPayment",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData",
+        "TxnDate",
+        "CurrencyRef",
+        "Line"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/purchase/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/purchase/getAll.json
new file mode 100644
index 0000000000..4b377b76b2
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/purchase/getAll.json
@@ -0,0 +1,223 @@
+{
+    "type": "object",
+    "properties": {
+        "AccountRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "PaymentType": {
+            "type": "string"
+        },
+        "EntityRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name",
+                "type"
+            ]
+        },
+        "Credit": {
+            "type": "boolean"
+        },
+        "PurchaseEx": {
+            "type": "object",
+            "properties": {
+                "any": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "declaredType": {
+                                "type": "string"
+                            },
+                            "scope": {
+                                "type": "string"
+                            },
+                            "value": {
+                                "type": "object",
+                                "properties": {
+                                    "Name": {
+                                        "type": "string"
+                                    },
+                                    "Value": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "Name",
+                                    "Value"
+                                ]
+                            },
+                            "nil": {
+                                "type": "boolean"
+                            },
+                            "globalScope": {
+                                "type": "boolean"
+                            },
+                            "typeSubstituted": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "declaredType",
+                            "scope",
+                            "value",
+                            "nil",
+                            "globalScope",
+                            "typeSubstituted"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "any"
+            ]
+        },
+        "domain": {
+            "type": "string"
+        },
+        "sparse": {
+            "type": "boolean"
+        },
+        "Id": {
+            "type": "string"
+        },
+        "SyncToken": {
+            "type": "string"
+        },
+        "MetaData": {
+            "type": "object",
+            "properties": {
+                "CreateTime": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreateTime",
+                "LastUpdatedTime"
+            ]
+        },
+        "TxnDate": {
+            "type": "string"
+        },
+        "CurrencyRef": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "value",
+                "name"
+            ]
+        },
+        "Line": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Id": {
+                        "type": "string"
+                    },
+                    "Description": {
+                        "type": "string"
+                    },
+                    "DetailType": {
+                        "type": "string"
+                    },
+                    "AccountBasedExpenseLineDetail": {
+                        "type": "object",
+                        "properties": {
+                            "AccountRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value",
+                                    "name"
+                                ]
+                            },
+                            "BillableStatus": {
+                                "type": "string"
+                            },
+                            "TaxCodeRef": {
+                                "type": "object",
+                                "properties": {
+                                    "value": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "value"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "AccountRef",
+                            "BillableStatus",
+                            "TaxCodeRef"
+                        ]
+                    }
+                },
+                "required": [
+                    "Id",
+                    "Amount",
+                    "DetailType"
+                ]
+            }
+        }
+    },
+    "required": [
+        "AccountRef",
+        "PaymentType",
+        "TotalAmt",
+        "PurchaseEx",
+        "domain",
+        "sparse",
+        "Id",
+        "SyncToken",
+        "MetaData",
+        "TxnDate",
+        "CurrencyRef",
+        "Line"
+    ]
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/transaction/getReport.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/transaction/getReport.json
new file mode 100644
index 0000000000..16d5570da1
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/transaction/getReport.json
@@ -0,0 +1,139 @@
+{
+    "type": "object",
+    "properties": {
+        "Header": {
+            "type": "object",
+            "properties": {
+                "Time": {
+                    "type": "string"
+                },
+                "ReportName": {
+                    "type": "string"
+                },
+                "DateMacro": {
+                    "type": "string"
+                },
+                "StartPeriod": {
+                    "type": "string"
+                },
+                "EndPeriod": {
+                    "type": "string"
+                },
+                "Currency": {
+                    "type": "string"
+                },
+                "Option": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "Name": {
+                                "type": "string"
+                            },
+                            "Value": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "Name",
+                            "Value"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "Time",
+                "ReportName",
+                "DateMacro",
+                "StartPeriod",
+                "EndPeriod",
+                "Currency",
+                "Option"
+            ]
+        },
+        "Columns": {
+            "type": "object",
+            "properties": {
+                "Column": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "ColTitle": {
+                                "type": "string"
+                            },
+                            "ColType": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "ColTitle",
+                            "ColType"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "Column"
+            ]
+        },
+        "Rows": {
+            "type": "object",
+            "properties": {
+                "Row": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "ColData": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "value": {
+                                            "type": "string"
+                                        },
+                                        "id": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "value"
+                                    ]
+                                }
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "Summary": {
+                                "type": "object",
+                                "properties": {
+                                    "ColData": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "value": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "value"
+                                            ]
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "ColData"
+                                ]
+                            }
+                        }
+                    }
+                }
+            },
+            "required": [
+                "Row"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/vendor/getAll.json b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/vendor/getAll.json
new file mode 100644
index 0000000000..647cd3250e
--- /dev/null
+++ b/packages/nodes-base/nodes/QuickBooks/__schema__/v1.0.0/vendor/getAll.json
@@ -0,0 +1,168 @@
+{
+	"type": "object",
+	"properties": {
+		"Vendor1099": {
+			"type": "boolean"
+		},
+		"CurrencyRef": {
+			"type": "object",
+			"properties": {
+				"value": {
+					"type": "string"
+				},
+				"name": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"value",
+				"name"
+			]
+		},
+		"domain": {
+			"type": "string"
+		},
+		"sparse": {
+			"type": "boolean"
+		},
+		"Id": {
+			"type": "string"
+		},
+		"SyncToken": {
+			"type": "string"
+		},
+		"MetaData": {
+			"type": "object",
+			"properties": {
+				"CreateTime": {
+					"type": "string"
+				},
+				"LastUpdatedTime": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"CreateTime",
+				"LastUpdatedTime"
+			]
+		},
+		"DisplayName": {
+			"type": "string"
+		},
+		"PrintOnCheckName": {
+			"type": "string"
+		},
+		"Active": {
+			"type": "boolean"
+		},
+		"BillAddr": {
+			"type": "object",
+			"properties": {
+				"Id": {
+					"type": "string"
+				},
+				"Line1": {
+					"type": "string"
+				},
+				"City": {
+					"type": "string"
+				},
+				"CountrySubDivisionCode": {
+					"type": "string"
+				},
+				"PostalCode": {
+					"type": "string"
+				},
+				"Lat": {
+					"type": "string"
+				},
+				"Long": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"Id"
+			]
+		},
+		"AcctNum": {
+			"type": "string"
+		},
+		"GivenName": {
+			"type": "string"
+		},
+		"FamilyName": {
+			"type": "string"
+		},
+		"CompanyName": {
+			"type": "string"
+		},
+		"PrimaryPhone": {
+			"type": "object",
+			"properties": {
+				"FreeFormNumber": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"FreeFormNumber"
+			]
+		},
+		"PrimaryEmailAddr": {
+			"type": "object",
+			"properties": {
+				"Address": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"Address"
+			]
+		},
+		"WebAddr": {
+			"type": "object",
+			"properties": {
+				"URI": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"URI"
+			]
+		},
+		"Mobile": {
+			"type": "object",
+			"properties": {
+				"FreeFormNumber": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"FreeFormNumber"
+			]
+		},
+		"Fax": {
+			"type": "object",
+			"properties": {
+				"FreeFormNumber": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"FreeFormNumber"
+			]
+		}
+	},
+	"required": [
+		"Balance",
+		"Vendor1099",
+		"CurrencyRef",
+		"domain",
+		"sparse",
+		"Id",
+		"SyncToken",
+		"MetaData",
+		"DisplayName",
+		"PrintOnCheckName",
+		"Active"
+	]
+}
diff --git a/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts b/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
index c89249e84f..659cfa2965 100644
--- a/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
+++ b/packages/nodes-base/nodes/QuickChart/QuickChart.node.ts
@@ -29,6 +29,7 @@ export class QuickChart implements INodeType {
 		defaults: {
 			name: 'QuickChart',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
diff --git a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
index 1305611046..6a271d8722 100644
--- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
+++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
@@ -8,17 +8,12 @@ import type { WorkflowTestData } from '@test/nodes/types';
 describe('Test QuickChart Node', () => {
 	beforeEach(async () => {
 		await Helpers.initBinaryDataService();
-		nock.disableNetConnect();
 		nock('https://quickchart.io')
 			.persist()
 			.get(/chart.*/)
 			.reply(200, { success: true });
 	});
 
-	afterEach(() => {
-		nock.restore();
-	});
-
 	const workflow = Helpers.readJsonFileSync('nodes/QuickChart/test/QuickChart.workflow.json');
 
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index 28e802214f..5a7639ed5e 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -32,6 +32,7 @@ export class RabbitMQ implements INodeType {
 		defaults: {
 			name: 'RabbitMQ',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 8d6a96cd69..96026dbcbf 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -34,6 +34,7 @@ export class Raindrop implements INodeType {
 		defaults: {
 			name: 'Raindrop',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Raindrop/__schema__/v1.0.0/bookmark/getAll.json b/packages/nodes-base/nodes/Raindrop/__schema__/v1.0.0/bookmark/getAll.json
new file mode 100644
index 0000000000..f6c8e1cbfe
--- /dev/null
+++ b/packages/nodes-base/nodes/Raindrop/__schema__/v1.0.0/bookmark/getAll.json
@@ -0,0 +1,198 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "integer"
+        },
+        "link": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "excerpt": {
+            "type": "string"
+        },
+        "note": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "user": {
+            "type": "object",
+            "properties": {
+                "$ref": {
+                    "type": "string"
+                },
+                "$id": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "$ref",
+                "$id"
+            ]
+        },
+        "cover": {
+            "type": "string"
+        },
+        "media": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "link": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "type",
+                    "link"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "highlights": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "text": {
+                        "type": "string"
+                    },
+                    "note": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "created": {
+                        "type": "string"
+                    },
+                    "lastUpdate": {
+                        "type": "string"
+                    },
+                    "creatorRef": {
+                        "type": "integer"
+                    },
+                    "_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "text",
+                    "note",
+                    "color",
+                    "created",
+                    "lastUpdate",
+                    "creatorRef",
+                    "_id"
+                ]
+            }
+        },
+        "important": {
+            "type": "boolean"
+        },
+        "removed": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "string"
+        },
+        "collection": {
+            "type": "object",
+            "properties": {
+                "$ref": {
+                    "type": "string"
+                },
+                "$id": {
+                    "type": "integer"
+                },
+                "oid": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "$ref",
+                "$id",
+                "oid"
+            ]
+        },
+        "lastUpdate": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "creatorRef": {
+            "type": "object",
+            "properties": {
+                "_id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "avatar": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "_id",
+                "name",
+                "avatar",
+                "email"
+            ]
+        },
+        "sort": {
+            "type": "integer"
+        },
+        "collectionId": {
+            "type": "integer"
+        },
+        "reminder": {
+            "type": "object",
+            "properties": {
+                "date": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "date"
+            ]
+        }
+    },
+    "required": [
+        "_id",
+        "link",
+        "title",
+        "excerpt",
+        "note",
+        "type",
+        "user",
+        "cover",
+        "media",
+        "tags",
+        "highlights",
+        "removed",
+        "created",
+        "collection",
+        "lastUpdate",
+        "domain",
+        "creatorRef",
+        "sort",
+        "collectionId"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
index d3687a6557..e1c9fa1f70 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -7,8 +7,6 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../utils/utilities';
-
 export class ReadBinaryFiles implements INodeType {
 	description: INodeTypeDescription = {
 		hidden: true,
@@ -48,7 +46,6 @@ export class ReadBinaryFiles implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const fileSelector = this.getNodeParameter('fileSelector', 0) as string;
 		const dataPropertyName = this.getNodeParameter('dataPropertyName', 0);
-		const pairedItem = generatePairedItemData(this.getInputData().length);
 
 		const files = await glob(fileSelector);
 
@@ -60,7 +57,6 @@ export class ReadBinaryFiles implements INodeType {
 					[dataPropertyName]: await this.helpers.prepareBinaryData(stream, filePath),
 				},
 				json: {},
-				pairedItem,
 			});
 		}
 
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index d160daedfa..8ae9b87bb3 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -27,6 +27,7 @@ export class Reddit implements INodeType {
 		defaults: {
 			name: 'Reddit',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/create.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/create.json
new file mode 100644
index 0000000000..26d15b61b4
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/create.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "drafts_count": {
+            "type": "integer"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/delete.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/delete.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/delete.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/get.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/get.json
new file mode 100644
index 0000000000..3282cd5a4e
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/get.json
@@ -0,0 +1,371 @@
+{
+    "type": "object",
+    "properties": {
+        "approved_at_utc": {
+            "type": "null"
+        },
+        "subreddit": {
+            "type": "string"
+        },
+        "selftext": {
+            "type": "string"
+        },
+        "saved": {
+            "type": "boolean"
+        },
+        "mod_reason_title": {
+            "type": "null"
+        },
+        "gilded": {
+            "type": "integer"
+        },
+        "clicked": {
+            "type": "boolean"
+        },
+        "title": {
+            "type": "string"
+        },
+        "link_flair_richtext": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "e": {
+                        "type": "string"
+                    },
+                    "t": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "e",
+                    "t"
+                ]
+            }
+        },
+        "subreddit_name_prefixed": {
+            "type": "string"
+        },
+        "hidden": {
+            "type": "boolean"
+        },
+        "downs": {
+            "type": "integer"
+        },
+        "top_awarded_type": {
+            "type": "null"
+        },
+        "hide_score": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "quarantine": {
+            "type": "boolean"
+        },
+        "link_flair_text_color": {
+            "type": "string"
+        },
+        "subreddit_type": {
+            "type": "string"
+        },
+        "ups": {
+            "type": "integer"
+        },
+        "total_awards_received": {
+            "type": "integer"
+        },
+        "is_original_content": {
+            "type": "boolean"
+        },
+        "is_reddit_media_domain": {
+            "type": "boolean"
+        },
+        "is_meta": {
+            "type": "boolean"
+        },
+        "category": {
+            "type": "null"
+        },
+        "can_mod_post": {
+            "type": "boolean"
+        },
+        "score": {
+            "type": "integer"
+        },
+        "approved_by": {
+            "type": "null"
+        },
+        "is_created_from_ads_ui": {
+            "type": "boolean"
+        },
+        "thumbnail": {
+            "type": "string"
+        },
+        "content_categories": {
+            "type": "null"
+        },
+        "is_self": {
+            "type": "boolean"
+        },
+        "mod_note": {
+            "type": "null"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "link_flair_type": {
+            "type": "string"
+        },
+        "banned_by": {
+            "type": "null"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "allow_live_comments": {
+            "type": "boolean"
+        },
+        "banned_at_utc": {
+            "type": "null"
+        },
+        "view_count": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "no_follow": {
+            "type": "boolean"
+        },
+        "is_crosspostable": {
+            "type": "boolean"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "over_18": {
+            "type": "boolean"
+        },
+        "media_only": {
+            "type": "boolean"
+        },
+        "can_gild": {
+            "type": "boolean"
+        },
+        "spoiler": {
+            "type": "boolean"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "visited": {
+            "type": "boolean"
+        },
+        "removed_by": {
+            "type": "null"
+        },
+        "num_reports": {
+            "type": "null"
+        },
+        "subreddit_id": {
+            "type": "string"
+        },
+        "author_is_blocked": {
+            "type": "boolean"
+        },
+        "mod_reason_by": {
+            "type": "null"
+        },
+        "removal_reason": {
+            "type": "null"
+        },
+        "link_flair_background_color": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "is_robot_indexable": {
+            "type": "boolean"
+        },
+        "num_duplicates": {
+            "type": "integer"
+        },
+        "report_reasons": {
+            "type": "null"
+        },
+        "author": {
+            "type": "string"
+        },
+        "discussion_type": {
+            "type": "null"
+        },
+        "num_comments": {
+            "type": "integer"
+        },
+        "send_replies": {
+            "type": "boolean"
+        },
+        "contest_mode": {
+            "type": "boolean"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "stickied": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "subreddit_subscribers": {
+            "type": "integer"
+        },
+        "created_utc": {
+            "type": "integer"
+        },
+        "num_crossposts": {
+            "type": "integer"
+        },
+        "is_video": {
+            "type": "boolean"
+        },
+        "author_fullname": {
+            "type": "string"
+        },
+        "author_premium": {
+            "type": "boolean"
+        },
+        "author_flair_richtext": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "e": {
+                        "type": "string"
+                    },
+                    "t": {
+                        "type": "string"
+                    },
+                    "a": {
+                        "type": "string"
+                    },
+                    "u": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "e"
+                ]
+            }
+        },
+        "author_flair_type": {
+            "type": "string"
+        },
+        "author_patreon_flair": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "approved_at_utc",
+        "subreddit",
+        "selftext",
+        "user_reports",
+        "saved",
+        "mod_reason_title",
+        "gilded",
+        "clicked",
+        "title",
+        "link_flair_richtext",
+        "subreddit_name_prefixed",
+        "hidden",
+        "pwls",
+        "link_flair_css_class",
+        "downs",
+        "top_awarded_type",
+        "hide_score",
+        "name",
+        "quarantine",
+        "link_flair_text_color",
+        "upvote_ratio",
+        "author_flair_background_color",
+        "subreddit_type",
+        "ups",
+        "total_awards_received",
+        "media_embed",
+        "author_flair_template_id",
+        "is_original_content",
+        "secure_media",
+        "is_reddit_media_domain",
+        "is_meta",
+        "category",
+        "secure_media_embed",
+        "link_flair_text",
+        "can_mod_post",
+        "score",
+        "approved_by",
+        "is_created_from_ads_ui",
+        "thumbnail",
+        "edited",
+        "author_flair_css_class",
+        "gildings",
+        "content_categories",
+        "is_self",
+        "mod_note",
+        "created",
+        "link_flair_type",
+        "wls",
+        "removed_by_category",
+        "banned_by",
+        "domain",
+        "allow_live_comments",
+        "selftext_html",
+        "likes",
+        "suggested_sort",
+        "banned_at_utc",
+        "view_count",
+        "archived",
+        "no_follow",
+        "is_crosspostable",
+        "pinned",
+        "over_18",
+        "all_awardings",
+        "awarders",
+        "media_only",
+        "can_gild",
+        "spoiler",
+        "locked",
+        "author_flair_text",
+        "treatment_tags",
+        "visited",
+        "removed_by",
+        "num_reports",
+        "distinguished",
+        "subreddit_id",
+        "author_is_blocked",
+        "mod_reason_by",
+        "removal_reason",
+        "link_flair_background_color",
+        "id",
+        "is_robot_indexable",
+        "num_duplicates",
+        "report_reasons",
+        "author",
+        "discussion_type",
+        "num_comments",
+        "send_replies",
+        "media",
+        "contest_mode",
+        "author_flair_text_color",
+        "permalink",
+        "stickied",
+        "url",
+        "subreddit_subscribers",
+        "created_utc",
+        "num_crossposts",
+        "mod_reports",
+        "is_video"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/getAll.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/getAll.json
new file mode 100644
index 0000000000..e067cbb287
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/getAll.json
@@ -0,0 +1,344 @@
+{
+    "type": "object",
+    "properties": {
+        "subreddit": {
+            "type": "string"
+        },
+        "selftext": {
+            "type": "string"
+        },
+        "author_fullname": {
+            "type": "string"
+        },
+        "saved": {
+            "type": "boolean"
+        },
+        "mod_reason_title": {
+            "type": "null"
+        },
+        "gilded": {
+            "type": "integer"
+        },
+        "clicked": {
+            "type": "boolean"
+        },
+        "title": {
+            "type": "string"
+        },
+        "link_flair_richtext": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "e": {
+                        "type": "string"
+                    },
+                    "t": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "e"
+                ]
+            }
+        },
+        "subreddit_name_prefixed": {
+            "type": "string"
+        },
+        "hidden": {
+            "type": "boolean"
+        },
+        "downs": {
+            "type": "integer"
+        },
+        "top_awarded_type": {
+            "type": "null"
+        },
+        "hide_score": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "quarantine": {
+            "type": "boolean"
+        },
+        "subreddit_type": {
+            "type": "string"
+        },
+        "ups": {
+            "type": "integer"
+        },
+        "total_awards_received": {
+            "type": "integer"
+        },
+        "is_original_content": {
+            "type": "boolean"
+        },
+        "is_reddit_media_domain": {
+            "type": "boolean"
+        },
+        "is_meta": {
+            "type": "boolean"
+        },
+        "category": {
+            "type": "null"
+        },
+        "can_mod_post": {
+            "type": "boolean"
+        },
+        "score": {
+            "type": "integer"
+        },
+        "is_created_from_ads_ui": {
+            "type": "boolean"
+        },
+        "author_premium": {
+            "type": "boolean"
+        },
+        "thumbnail": {
+            "type": "string"
+        },
+        "author_flair_richtext": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "e": {
+                        "type": "string"
+                    },
+                    "t": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "e"
+                ]
+            }
+        },
+        "content_categories": {
+            "type": "null"
+        },
+        "is_self": {
+            "type": "boolean"
+        },
+        "mod_note": {
+            "type": "null"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "link_flair_type": {
+            "type": "string"
+        },
+        "banned_by": {
+            "type": "null"
+        },
+        "author_flair_type": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "allow_live_comments": {
+            "type": "boolean"
+        },
+        "banned_at_utc": {
+            "type": "null"
+        },
+        "view_count": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "no_follow": {
+            "type": "boolean"
+        },
+        "is_crosspostable": {
+            "type": "boolean"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "over_18": {
+            "type": "boolean"
+        },
+        "media_only": {
+            "type": "boolean"
+        },
+        "link_flair_template_id": {
+            "type": "string"
+        },
+        "can_gild": {
+            "type": "boolean"
+        },
+        "spoiler": {
+            "type": "boolean"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "visited": {
+            "type": "boolean"
+        },
+        "removed_by": {
+            "type": "null"
+        },
+        "subreddit_id": {
+            "type": "string"
+        },
+        "author_is_blocked": {
+            "type": "boolean"
+        },
+        "mod_reason_by": {
+            "type": "null"
+        },
+        "id": {
+            "type": "string"
+        },
+        "is_robot_indexable": {
+            "type": "boolean"
+        },
+        "author": {
+            "type": "string"
+        },
+        "num_comments": {
+            "type": "integer"
+        },
+        "send_replies": {
+            "type": "boolean"
+        },
+        "contest_mode": {
+            "type": "boolean"
+        },
+        "author_patreon_flair": {
+            "type": "boolean"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "stickied": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "subreddit_subscribers": {
+            "type": "integer"
+        },
+        "created_utc": {
+            "type": "integer"
+        },
+        "num_crossposts": {
+            "type": "integer"
+        },
+        "is_video": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "approved_at_utc",
+        "subreddit",
+        "selftext",
+        "author_fullname",
+        "saved",
+        "mod_reason_title",
+        "gilded",
+        "clicked",
+        "title",
+        "link_flair_richtext",
+        "subreddit_name_prefixed",
+        "hidden",
+        "pwls",
+        "link_flair_css_class",
+        "downs",
+        "top_awarded_type",
+        "hide_score",
+        "name",
+        "quarantine",
+        "link_flair_text_color",
+        "upvote_ratio",
+        "author_flair_background_color",
+        "subreddit_type",
+        "ups",
+        "total_awards_received",
+        "media_embed",
+        "author_flair_template_id",
+        "is_original_content",
+        "user_reports",
+        "secure_media",
+        "is_reddit_media_domain",
+        "is_meta",
+        "category",
+        "secure_media_embed",
+        "link_flair_text",
+        "can_mod_post",
+        "score",
+        "approved_by",
+        "is_created_from_ads_ui",
+        "author_premium",
+        "thumbnail",
+        "edited",
+        "author_flair_css_class",
+        "author_flair_richtext",
+        "gildings",
+        "content_categories",
+        "is_self",
+        "mod_note",
+        "created",
+        "link_flair_type",
+        "wls",
+        "removed_by_category",
+        "banned_by",
+        "author_flair_type",
+        "domain",
+        "allow_live_comments",
+        "selftext_html",
+        "likes",
+        "suggested_sort",
+        "banned_at_utc",
+        "view_count",
+        "archived",
+        "no_follow",
+        "is_crosspostable",
+        "pinned",
+        "over_18",
+        "all_awardings",
+        "awarders",
+        "media_only",
+        "can_gild",
+        "spoiler",
+        "locked",
+        "author_flair_text",
+        "treatment_tags",
+        "visited",
+        "removed_by",
+        "num_reports",
+        "distinguished",
+        "subreddit_id",
+        "author_is_blocked",
+        "mod_reason_by",
+        "removal_reason",
+        "link_flair_background_color",
+        "id",
+        "is_robot_indexable",
+        "report_reasons",
+        "author",
+        "discussion_type",
+        "num_comments",
+        "send_replies",
+        "contest_mode",
+        "mod_reports",
+        "author_patreon_flair",
+        "author_flair_text_color",
+        "permalink",
+        "stickied",
+        "url",
+        "subreddit_subscribers",
+        "created_utc",
+        "num_crossposts",
+        "media",
+        "is_video"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/search.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/search.json
new file mode 100644
index 0000000000..73751bcc03
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/post/search.json
@@ -0,0 +1,266 @@
+{
+    "type": "object",
+    "properties": {
+        "approved_at_utc": {
+            "type": "null"
+        },
+        "subreddit": {
+            "type": "string"
+        },
+        "selftext": {
+            "type": "string"
+        },
+        "author_fullname": {
+            "type": "string"
+        },
+        "saved": {
+            "type": "boolean"
+        },
+        "mod_reason_title": {
+            "type": "null"
+        },
+        "gilded": {
+            "type": "integer"
+        },
+        "clicked": {
+            "type": "boolean"
+        },
+        "title": {
+            "type": "string"
+        },
+        "link_flair_richtext": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "e": {
+                        "type": "string"
+                    },
+                    "t": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "e"
+                ]
+            }
+        },
+        "subreddit_name_prefixed": {
+            "type": "string"
+        },
+        "hidden": {
+            "type": "boolean"
+        },
+        "downs": {
+            "type": "integer"
+        },
+        "top_awarded_type": {
+            "type": "null"
+        },
+        "hide_score": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "quarantine": {
+            "type": "boolean"
+        },
+        "subreddit_type": {
+            "type": "string"
+        },
+        "ups": {
+            "type": "integer"
+        },
+        "total_awards_received": {
+            "type": "integer"
+        },
+        "is_original_content": {
+            "type": "boolean"
+        },
+        "is_reddit_media_domain": {
+            "type": "boolean"
+        },
+        "is_meta": {
+            "type": "boolean"
+        },
+        "category": {
+            "type": "null"
+        },
+        "can_mod_post": {
+            "type": "boolean"
+        },
+        "score": {
+            "type": "integer"
+        },
+        "approved_by": {
+            "type": "null"
+        },
+        "is_created_from_ads_ui": {
+            "type": "boolean"
+        },
+        "author_premium": {
+            "type": "boolean"
+        },
+        "thumbnail": {
+            "type": "string"
+        },
+        "author_flair_richtext": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "e": {
+                        "type": "string"
+                    },
+                    "t": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "e"
+                ]
+            }
+        },
+        "is_self": {
+            "type": "boolean"
+        },
+        "mod_note": {
+            "type": "null"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "link_flair_type": {
+            "type": "string"
+        },
+        "removed_by_category": {
+            "type": "null"
+        },
+        "banned_by": {
+            "type": "null"
+        },
+        "author_flair_type": {
+            "type": "string"
+        },
+        "domain": {
+            "type": "string"
+        },
+        "allow_live_comments": {
+            "type": "boolean"
+        },
+        "banned_at_utc": {
+            "type": "null"
+        },
+        "view_count": {
+            "type": "null"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "no_follow": {
+            "type": "boolean"
+        },
+        "is_crosspostable": {
+            "type": "boolean"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "over_18": {
+            "type": "boolean"
+        },
+        "media_only": {
+            "type": "boolean"
+        },
+        "can_gild": {
+            "type": "boolean"
+        },
+        "spoiler": {
+            "type": "boolean"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "visited": {
+            "type": "boolean"
+        },
+        "removed_by": {
+            "type": "null"
+        },
+        "num_reports": {
+            "type": "null"
+        },
+        "subreddit_id": {
+            "type": "string"
+        },
+        "author_is_blocked": {
+            "type": "boolean"
+        },
+        "mod_reason_by": {
+            "type": "null"
+        },
+        "removal_reason": {
+            "type": "null"
+        },
+        "id": {
+            "type": "string"
+        },
+        "is_robot_indexable": {
+            "type": "boolean"
+        },
+        "report_reasons": {
+            "type": "null"
+        },
+        "author": {
+            "type": "string"
+        },
+        "discussion_type": {
+            "type": "null"
+        },
+        "num_comments": {
+            "type": "integer"
+        },
+        "send_replies": {
+            "type": "boolean"
+        },
+        "contest_mode": {
+            "type": "boolean"
+        },
+        "author_patreon_flair": {
+            "type": "boolean"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "stickied": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "subreddit_subscribers": {
+            "type": "integer"
+        },
+        "created_utc": {
+            "type": "integer"
+        },
+        "num_crossposts": {
+            "type": "integer"
+        },
+        "is_video": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "title",
+        "name",
+        "quarantine",
+        "subreddit_type",
+        "created",
+        "wls",
+        "id",
+        "url",
+        "created_utc"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/postComment/create.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/postComment/create.json
new file mode 100644
index 0000000000..a9a07e3a89
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/postComment/create.json
@@ -0,0 +1,191 @@
+{
+    "type": "object",
+    "properties": {
+        "error": {
+            "type": "string"
+        },
+        "subreddit_id": {
+            "type": "string"
+        },
+        "approved_at_utc": {
+            "type": "null"
+        },
+        "author_is_blocked": {
+            "type": "boolean"
+        },
+        "comment_type": {
+            "type": "null"
+        },
+        "edited": {
+            "type": "boolean"
+        },
+        "mod_reason_by": {
+            "type": "null"
+        },
+        "banned_by": {
+            "type": "null"
+        },
+        "ups": {
+            "type": "integer"
+        },
+        "author_flair_type": {
+            "type": "string"
+        },
+        "total_awards_received": {
+            "type": "integer"
+        },
+        "subreddit": {
+            "type": "string"
+        },
+        "author_flair_template_id": {
+            "type": "null"
+        },
+        "likes": {
+            "type": "boolean"
+        },
+        "replies": {
+            "type": "string"
+        },
+        "saved": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "banned_at_utc": {
+            "type": "null"
+        },
+        "mod_reason_title": {
+            "type": "null"
+        },
+        "gilded": {
+            "type": "integer"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "collapsed_reason_code": {
+            "type": "null"
+        },
+        "no_follow": {
+            "type": "boolean"
+        },
+        "author": {
+            "type": "string"
+        },
+        "can_mod_post": {
+            "type": "boolean"
+        },
+        "created_utc": {
+            "type": "integer"
+        },
+        "send_replies": {
+            "type": "boolean"
+        },
+        "parent_id": {
+            "type": "string"
+        },
+        "score": {
+            "type": "integer"
+        },
+        "author_fullname": {
+            "type": "string"
+        },
+        "approved_by": {
+            "type": "null"
+        },
+        "collapsed": {
+            "type": "boolean"
+        },
+        "body": {
+            "type": "string"
+        },
+        "top_awarded_type": {
+            "type": "null"
+        },
+        "author_flair_css_class": {
+            "type": "null"
+        },
+        "author_patreon_flair": {
+            "type": "boolean"
+        },
+        "downs": {
+            "type": "integer"
+        },
+        "is_submitter": {
+            "type": "boolean"
+        },
+        "body_html": {
+            "type": "string"
+        },
+        "removal_reason": {
+            "type": "null"
+        },
+        "collapsed_reason": {
+            "type": "null"
+        },
+        "associated_award": {
+            "type": "null"
+        },
+        "stickied": {
+            "type": "boolean"
+        },
+        "author_premium": {
+            "type": "boolean"
+        },
+        "can_gild": {
+            "type": "boolean"
+        },
+        "unrepliable_reason": {
+            "type": "null"
+        },
+        "author_flair_text_color": {
+            "type": "null"
+        },
+        "score_hidden": {
+            "type": "boolean"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "subreddit_type": {
+            "type": "string"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "author_flair_text": {
+            "type": "null"
+        },
+        "rte_mode": {
+            "type": "string"
+        },
+        "link_id": {
+            "type": "string"
+        },
+        "subreddit_name_prefixed": {
+            "type": "string"
+        },
+        "controversiality": {
+            "type": "integer"
+        },
+        "author_flair_background_color": {
+            "type": "null"
+        },
+        "collapsed_because_crowd_control": {
+            "type": "null"
+        },
+        "mod_note": {
+            "type": "null"
+        },
+        "distinguished": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/postComment/getAll.json b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/postComment/getAll.json
new file mode 100644
index 0000000000..6e0a44e218
--- /dev/null
+++ b/packages/nodes-base/nodes/Reddit/__schema__/v1.0.0/postComment/getAll.json
@@ -0,0 +1,231 @@
+{
+    "type": "object",
+    "properties": {
+        "subreddit_id": {
+            "type": "string"
+        },
+        "approved_at_utc": {
+            "type": "null"
+        },
+        "author_is_blocked": {
+            "type": "boolean"
+        },
+        "comment_type": {
+            "type": "null"
+        },
+        "mod_reason_by": {
+            "type": "null"
+        },
+        "banned_by": {
+            "type": "null"
+        },
+        "author_flair_type": {
+            "type": "string"
+        },
+        "total_awards_received": {
+            "type": "integer"
+        },
+        "subreddit": {
+            "type": "string"
+        },
+        "saved": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "banned_at_utc": {
+            "type": "null"
+        },
+        "mod_reason_title": {
+            "type": "null"
+        },
+        "gilded": {
+            "type": "integer"
+        },
+        "archived": {
+            "type": "boolean"
+        },
+        "no_follow": {
+            "type": "boolean"
+        },
+        "author": {
+            "type": "string"
+        },
+        "can_mod_post": {
+            "type": "boolean"
+        },
+        "created_utc": {
+            "type": "integer"
+        },
+        "send_replies": {
+            "type": "boolean"
+        },
+        "parent_id": {
+            "type": "string"
+        },
+        "score": {
+            "type": "integer"
+        },
+        "author_fullname": {
+            "type": "string"
+        },
+        "approved_by": {
+            "type": "null"
+        },
+        "mod_note": {
+            "type": "null"
+        },
+        "collapsed": {
+            "type": "boolean"
+        },
+        "body": {
+            "type": "string"
+        },
+        "top_awarded_type": {
+            "type": "null"
+        },
+        "name": {
+            "type": "string"
+        },
+        "is_submitter": {
+            "type": "boolean"
+        },
+        "downs": {
+            "type": "integer"
+        },
+        "author_patreon_flair": {
+            "type": "boolean"
+        },
+        "body_html": {
+            "type": "string"
+        },
+        "removal_reason": {
+            "type": "null"
+        },
+        "collapsed_reason": {
+            "type": "null"
+        },
+        "associated_award": {
+            "type": "null"
+        },
+        "stickied": {
+            "type": "boolean"
+        },
+        "author_premium": {
+            "type": "boolean"
+        },
+        "can_gild": {
+            "type": "boolean"
+        },
+        "unrepliable_reason": {
+            "type": "null"
+        },
+        "score_hidden": {
+            "type": "boolean"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "subreddit_type": {
+            "type": "string"
+        },
+        "locked": {
+            "type": "boolean"
+        },
+        "report_reasons": {
+            "type": "null"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "link_id": {
+            "type": "string"
+        },
+        "subreddit_name_prefixed": {
+            "type": "string"
+        },
+        "controversiality": {
+            "type": "integer"
+        },
+        "depth": {
+            "type": "integer"
+        },
+        "collapsed_because_crowd_control": {
+            "type": "null"
+        },
+        "num_reports": {
+            "type": "null"
+        },
+        "ups": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "subreddit_id",
+        "approved_at_utc",
+        "author_is_blocked",
+        "comment_type",
+        "awarders",
+        "mod_reason_by",
+        "banned_by",
+        "total_awards_received",
+        "subreddit",
+        "author_flair_template_id",
+        "likes",
+        "replies",
+        "user_reports",
+        "saved",
+        "id",
+        "banned_at_utc",
+        "mod_reason_title",
+        "gilded",
+        "archived",
+        "collapsed_reason_code",
+        "no_follow",
+        "author",
+        "can_mod_post",
+        "created_utc",
+        "send_replies",
+        "parent_id",
+        "score",
+        "approved_by",
+        "mod_note",
+        "all_awardings",
+        "collapsed",
+        "body",
+        "edited",
+        "top_awarded_type",
+        "author_flair_css_class",
+        "name",
+        "is_submitter",
+        "downs",
+        "body_html",
+        "removal_reason",
+        "collapsed_reason",
+        "distinguished",
+        "associated_award",
+        "stickied",
+        "can_gild",
+        "gildings",
+        "unrepliable_reason",
+        "author_flair_text_color",
+        "score_hidden",
+        "permalink",
+        "subreddit_type",
+        "locked",
+        "report_reasons",
+        "created",
+        "author_flair_text",
+        "treatment_tags",
+        "link_id",
+        "subreddit_name_prefixed",
+        "controversiality",
+        "depth",
+        "author_flair_background_color",
+        "collapsed_because_crowd_control",
+        "mod_reports",
+        "num_reports",
+        "ups"
+    ]
+}
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index b8038d9163..a765777288 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -21,7 +21,7 @@ import {
 } from 'n8n-workflow';
 import type { Readable } from 'stream';
 
-import { formatPrivateKey, generatePairedItemData } from '../../utils/utilities';
+import { formatPrivateKey } from '../../utils/utilities';
 
 export class RespondToWebhook implements INodeType {
 	description: INodeTypeDescription = {
@@ -443,11 +443,7 @@ export class RespondToWebhook implements INodeType {
 			this.sendResponse(response);
 		} catch (error) {
 			if (this.continueOnFail()) {
-				const itemData = generatePairedItemData(items.length);
-				const returnData = this.helpers.constructExecutionMetaData(
-					[{ json: { error: error.message } }],
-					{ itemData },
-				);
+				const returnData = [{ json: { error: error.message } }];
 				return [returnData];
 			}
 
diff --git a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
index 797d1ea304..e014512b60 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
@@ -253,7 +253,6 @@ describe('RespondToWebhook Node', () => {
 				[
 					{
 						json: { error: 'The Response Data option "notSupportedRespondWith" is not supported!' },
-						pairedItem: [{ item: 0 }],
 					},
 				],
 			]);
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 274aae41ab..8e78d2fecb 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -55,6 +55,7 @@ export class Rocketchat implements INodeType {
 		defaults: {
 			name: 'RocketChat',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Rocketchat/__schema__/v1.0.0/chat/postMessage.json b/packages/nodes-base/nodes/Rocketchat/__schema__/v1.0.0/chat/postMessage.json
new file mode 100644
index 0000000000..ada7f33164
--- /dev/null
+++ b/packages/nodes-base/nodes/Rocketchat/__schema__/v1.0.0/chat/postMessage.json
@@ -0,0 +1,189 @@
+{
+    "type": "object",
+    "properties": {
+        "ts": {
+            "type": "integer"
+        },
+        "channel": {
+            "type": "string"
+        },
+        "message": {
+            "type": "object",
+            "properties": {
+                "alias": {
+                    "type": "string"
+                },
+                "msg": {
+                    "type": "string"
+                },
+                "attachments": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "text": {
+                                "type": "string"
+                            },
+                            "ts": {
+                                "type": "string"
+                            },
+                            "title": {
+                                "type": "string"
+                            },
+                            "fields": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "short": {
+                                            "type": "boolean"
+                                        },
+                                        "title": {
+                                            "type": "string"
+                                        },
+                                        "value": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "short",
+                                        "title"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "ts"
+                        ]
+                    }
+                },
+                "parseUrls": {
+                    "type": "boolean"
+                },
+                "groupable": {
+                    "type": "boolean"
+                },
+                "ts": {
+                    "type": "string"
+                },
+                "u": {
+                    "type": "object",
+                    "properties": {
+                        "_id": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "_id",
+                        "username",
+                        "name"
+                    ]
+                },
+                "rid": {
+                    "type": "string"
+                },
+                "unread": {
+                    "type": "boolean"
+                },
+                "_id": {
+                    "type": "string"
+                },
+                "_updatedAt": {
+                    "type": "string"
+                },
+                "mentions": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "_id": {
+                                "type": "string"
+                            },
+                            "username": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "_id",
+                            "username",
+                            "name",
+                            "type"
+                        ]
+                    }
+                },
+                "md": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "value": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "required": [
+                                        "type"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "type"
+                        ]
+                    }
+                },
+                "urls": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "url": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "url",
+                            "meta"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "alias",
+                "msg",
+                "attachments",
+                "parseUrls",
+                "groupable",
+                "ts",
+                "u",
+                "rid",
+                "_id",
+                "_updatedAt",
+                "mentions",
+                "channels"
+            ]
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index b29255d34a..8218414f26 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -4,13 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	IPairedItemData,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import Parser from 'rss-parser';
 import { URL } from 'url';
 
-import { generatePairedItemData } from '../../utils/utilities';
-
 // Utility function
 
 function validateURL(url: string) {
@@ -35,6 +34,7 @@ export class RssFeedRead implements INodeType {
 			name: 'RSS Read',
 			color: '#b02020',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		properties: [
@@ -76,7 +76,7 @@ export class RssFeedRead implements INodeType {
 		if (nodeVersion >= 1.1) {
 			itemsLength = items.length;
 		} else {
-			fallbackPairedItems = generatePairedItemData(items.length);
+			fallbackPairedItems = [] as IPairedItemData[];
 		}
 
 		for (let i = 0; i < itemsLength; i++) {
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
index f68c8db965..451ab65bef 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
@@ -10,15 +10,8 @@ describe('Test RSS Feed Trigger Node', () => {
 	const tests = workflowToTests(workflows);
 
 	beforeAll(() => {
-		nock.disableNetConnect();
-
 		nock('https://lorem-rss.herokuapp.com').get('/feed?length=3').reply(200, feed);
 	});
-
-	afterAll(() => {
-		nock.restore();
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index bd36d74e16..38d192093c 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -22,6 +22,7 @@ export class Rundeck implements INodeType {
 		defaults: {
 			name: 'Rundeck',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index d7e9d5d75c..94e90ee070 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -29,6 +29,7 @@ export class S3 implements INodeType {
 		defaults: {
 			name: 'S3',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/S3/__schema__/v1.0.0/bucket/search.json b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/bucket/search.json
new file mode 100644
index 0000000000..722997ebf4
--- /dev/null
+++ b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/bucket/search.json
@@ -0,0 +1,30 @@
+{
+    "type": "object",
+    "properties": {
+        "Key": {
+            "type": "string"
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        },
+        "Size": {
+            "type": "string"
+        },
+        "StorageClass": {
+            "type": "string"
+        },
+        "Type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Key",
+        "LastModified",
+        "ETag",
+        "Size",
+        "StorageClass"
+    ]
+}
diff --git a/packages/nodes-base/nodes/S3/__schema__/v1.0.0/file/getAll.json b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/file/getAll.json
new file mode 100644
index 0000000000..071bb9b505
--- /dev/null
+++ b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/file/getAll.json
@@ -0,0 +1,27 @@
+{
+    "type": "object",
+    "properties": {
+        "Key": {
+            "type": "string"
+        },
+        "Size": {
+            "type": "string"
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        },
+        "StorageClass": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Key",
+        "Size",
+        "LastModified",
+        "ETag",
+        "StorageClass"
+    ]
+}
diff --git a/packages/nodes-base/nodes/S3/__schema__/v1.0.0/file/upload.json b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/file/upload.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/file/upload.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/S3/__schema__/v1.0.0/folder/create.json b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/folder/create.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/folder/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/S3/__schema__/v1.0.0/folder/getAll.json b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/folder/getAll.json
new file mode 100644
index 0000000000..722997ebf4
--- /dev/null
+++ b/packages/nodes-base/nodes/S3/__schema__/v1.0.0/folder/getAll.json
@@ -0,0 +1,30 @@
+{
+    "type": "object",
+    "properties": {
+        "Key": {
+            "type": "string"
+        },
+        "LastModified": {
+            "type": "string"
+        },
+        "ETag": {
+            "type": "string"
+        },
+        "Size": {
+            "type": "string"
+        },
+        "StorageClass": {
+            "type": "string"
+        },
+        "Type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Key",
+        "LastModified",
+        "ETag",
+        "Size",
+        "StorageClass"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 351c6f27a2..1a2c8ee7e2 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -51,6 +51,7 @@ export class Salesforce implements INodeType {
 		defaults: {
 			name: 'Salesforce',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/create.json
new file mode 100644
index 0000000000..c0d4713018
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/get.json
new file mode 100644
index 0000000000..11abcec874
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/get.json
@@ -0,0 +1,77 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "MasterRecordId": {
+            "type": "null"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "ShippingLatitude": {
+            "type": "null"
+        },
+        "ShippingLongitude": {
+            "type": "null"
+        },
+        "ShippingGeocodeAccuracy": {
+            "type": "null"
+        },
+        "Fax": {
+            "type": "null"
+        },
+        "PhotoUrl": {
+            "type": "string"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        },
+        "JigsawCompanyId": {
+            "type": "null"
+        },
+        "SicDesc": {
+            "type": "null"
+        },
+        "Sic": {
+            "type": "null"
+        },
+        "AnnualRevenue": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/getAll.json
new file mode 100644
index 0000000000..e30faea6d9
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/getAll.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Name": {
+            "type": "string"
+        },
+        "Id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/update.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/update.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/account/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/create.json
new file mode 100644
index 0000000000..c0d4713018
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/get.json
new file mode 100644
index 0000000000..4b82a652d9
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/get.json
@@ -0,0 +1,132 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "MasterRecordId": {
+            "type": "null"
+        },
+        "CaseNumber": {
+            "type": "string"
+        },
+        "RecordTypeId": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        },
+        "Language": {
+            "type": "null"
+        },
+        "Priority": {
+            "type": "string"
+        },
+        "IsClosed": {
+            "type": "boolean"
+        },
+        "IsEscalated": {
+            "type": "boolean"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        },
+        "Comments": {
+            "type": "null"
+        },
+        "ProductId": {
+            "type": "null"
+        },
+        "BusinessHoursId": {
+            "type": "string"
+        },
+        "ServiceContractId": {
+            "type": "null"
+        },
+        "AssetId": {
+            "type": "null"
+        },
+        "IsClosedOnCreate": {
+            "type": "boolean"
+        },
+        "IsStopped": {
+            "type": "boolean"
+        },
+        "StopStartDate": {
+            "type": "null"
+        },
+        "MilestoneStatus": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes",
+        "Id",
+        "IsDeleted",
+        "MasterRecordId",
+        "CaseNumber",
+        "ContactId",
+        "AccountId",
+        "ParentId",
+        "SuppliedName",
+        "SuppliedEmail",
+        "SuppliedPhone",
+        "SuppliedCompany",
+        "Type",
+        "Status",
+        "Reason",
+        "Origin",
+        "Subject",
+        "Priority",
+        "Description",
+        "IsClosed",
+        "ClosedDate",
+        "IsEscalated",
+        "OwnerId",
+        "CreatedDate",
+        "CreatedById",
+        "LastModifiedDate",
+        "LastModifiedById",
+        "SystemModstamp",
+        "ContactPhone",
+        "ContactMobile",
+        "ContactEmail",
+        "ContactFax",
+        "Comments",
+        "LastViewedDate",
+        "LastReferencedDate"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/getAll.json
new file mode 100644
index 0000000000..1e10a8db85
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/getAll.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/update.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/update.json
new file mode 100644
index 0000000000..36eb1aeed9
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/case/update.json
@@ -0,0 +1,12 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "errors",
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/create.json
new file mode 100644
index 0000000000..c0d4713018
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/get.json
new file mode 100644
index 0000000000..6ee3da938c
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/get.json
@@ -0,0 +1,110 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "MasterRecordId": {
+            "type": "null"
+        },
+        "LastName": {
+            "type": "string"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "MailingLatitude": {
+            "type": "null"
+        },
+        "MailingLongitude": {
+            "type": "null"
+        },
+        "MailingGeocodeAccuracy": {
+            "type": "null"
+        },
+        "ReportsToId": {
+            "type": "null"
+        },
+        "Department": {
+            "type": "null"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        },
+        "LastCURequestDate": {
+            "type": "null"
+        },
+        "LastCUUpdateDate": {
+            "type": "null"
+        },
+        "IsEmailBounced": {
+            "type": "boolean"
+        },
+        "Jigsaw": {
+            "type": "null"
+        },
+        "JigsawContactId": {
+            "type": "null"
+        },
+        "MiddleName": {
+            "type": "null"
+        },
+        "Suffix": {
+            "type": "null"
+        },
+        "MailingStateCode": {
+            "type": "null"
+        },
+        "IsPriorityRecord": {
+            "type": "boolean"
+        },
+        "LID__Level__c": {
+            "type": "null"
+        },
+        "LID__LinkedIn_Company_Id__c": {
+            "type": "null"
+        },
+        "LID__LinkedIn_Member_Token__c": {
+            "type": "null"
+        },
+        "LID__No_longer_at_Company__c": {
+            "type": "null"
+        },
+        "LID__Session_Id__c": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..5551929e4a
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "LastName": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/update.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/update.json
new file mode 100644
index 0000000000..36eb1aeed9
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/update.json
@@ -0,0 +1,12 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "errors",
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/upsert.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/upsert.json
new file mode 100644
index 0000000000..753b151871
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/contact/upsert.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/create.json
new file mode 100644
index 0000000000..c0d4713018
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/delete.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/delete.json
new file mode 100644
index 0000000000..36eb1aeed9
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/delete.json
@@ -0,0 +1,12 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "errors",
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/get.json
new file mode 100644
index 0000000000..47f2c662ec
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/get.json
@@ -0,0 +1,47 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/getAll.json
new file mode 100644
index 0000000000..59454d3aea
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/getAll.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/update.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/update.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/upsert.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/upsert.json
new file mode 100644
index 0000000000..753b151871
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/customObject/upsert.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/addNote.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/addNote.json
new file mode 100644
index 0000000000..7e3b41a086
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/addNote.json
@@ -0,0 +1,16 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "success",
+        "errors"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/create.json
new file mode 100644
index 0000000000..c0d4713018
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/create.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/get.json
new file mode 100644
index 0000000000..ea838b13cc
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/get.json
@@ -0,0 +1,149 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "MasterRecordId": {
+            "type": "null"
+        },
+        "LastName": {
+            "type": "string"
+        },
+        "MiddleName": {
+            "type": "null"
+        },
+        "Suffix": {
+            "type": "null"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "Company": {
+            "type": "string"
+        },
+        "Latitude": {
+            "type": "null"
+        },
+        "Longitude": {
+            "type": "null"
+        },
+        "GeocodeAccuracy": {
+            "type": "null"
+        },
+        "Address": {
+            "type": "object",
+            "properties": {
+                "geocodeAccuracy": {
+                    "type": "null"
+                },
+                "latitude": {
+                    "type": "null"
+                },
+                "longitude": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "city",
+                "country",
+                "geocodeAccuracy",
+                "latitude",
+                "longitude",
+                "postalCode",
+                "state",
+                "street"
+            ]
+        },
+        "Fax": {
+            "type": "null"
+        },
+        "PhotoUrl": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        },
+        "AnnualRevenue": {
+            "type": "null"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "HasOptedOutOfEmail": {
+            "type": "boolean"
+        },
+        "IsConverted": {
+            "type": "boolean"
+        },
+        "IsUnreadByOwner": {
+            "type": "boolean"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        },
+        "DoNotCall": {
+            "type": "boolean"
+        },
+        "HasOptedOutOfFax": {
+            "type": "boolean"
+        },
+        "LastTransferDate": {
+            "type": "string"
+        },
+        "Jigsaw": {
+            "type": "null"
+        },
+        "JigsawContactId": {
+            "type": "null"
+        },
+        "EmailBouncedReason": {
+            "type": "null"
+        },
+        "EmailBouncedDate": {
+            "type": "null"
+        },
+        "IndividualId": {
+            "type": "null"
+        },
+        "Pronouns": {
+            "type": "null"
+        },
+        "GenderIdentity": {
+            "type": "null"
+        },
+        "IsPriorityRecord": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/getAll.json
new file mode 100644
index 0000000000..0455d17ef2
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/getAll.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "LastName": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/update.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/update.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/upsert.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/upsert.json
new file mode 100644
index 0000000000..753b151871
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/lead/upsert.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/create.json
new file mode 100644
index 0000000000..7e3b41a086
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/create.json
@@ -0,0 +1,16 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "success",
+        "errors"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/get.json
new file mode 100644
index 0000000000..e89aa31189
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/get.json
@@ -0,0 +1,182 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "AccountId": {
+            "type": "string"
+        },
+        "IsPrivate": {
+            "type": "boolean"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "StageName": {
+            "type": "string"
+        },
+        "Probability": {
+            "type": "integer"
+        },
+        "CloseDate": {
+            "type": "string"
+        },
+        "IsClosed": {
+            "type": "boolean"
+        },
+        "IsWon": {
+            "type": "boolean"
+        },
+        "ForecastCategory": {
+            "type": "string"
+        },
+        "ForecastCategoryName": {
+            "type": "string"
+        },
+        "HasOpportunityLineItem": {
+            "type": "boolean"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "AgeInDays": {
+            "type": "integer"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        },
+        "PushCount": {
+            "type": "integer"
+        },
+        "LastStageChangeInDays": {
+            "type": "integer"
+        },
+        "FiscalQuarter": {
+            "type": "integer"
+        },
+        "FiscalYear": {
+            "type": "integer"
+        },
+        "Fiscal": {
+            "type": "string"
+        },
+        "PartnerAccountId": {
+            "type": "null"
+        },
+        "SyncedQuoteId": {
+            "type": "null"
+        },
+        "ContractId": {
+            "type": "null"
+        },
+        "HasOpenActivity": {
+            "type": "boolean"
+        },
+        "HasOverdueTask": {
+            "type": "boolean"
+        },
+        "IsPriorityRecord": {
+            "type": "boolean"
+        },
+        "HasUnlikelyToCloseInsight": {
+            "type": "boolean"
+        },
+        "ActivityMetricId": {
+            "type": "string"
+        },
+        "Budget_Confirmed__c": {
+            "type": "boolean"
+        },
+        "Discovery_Completed__c": {
+            "type": "boolean"
+        },
+        "ROI_Analysis_Completed__c": {
+            "type": "boolean"
+        },
+        "Loss_Reason__c": {
+            "type": "null"
+        },
+        "Campagne_lead__c": {
+            "type": "null"
+        },
+        "Opmerking__c": {
+            "type": "null"
+        },
+        "Partner_land__c": {
+            "type": "null"
+        },
+        "Demo_gegeven__c": {
+            "type": "boolean"
+        },
+        "Partner__c": {
+            "type": "null"
+        },
+        "LID__CurrentGenerators__c": {
+            "type": "null"
+        },
+        "LID__DeliveryInstallationStatus__c": {
+            "type": "null"
+        },
+        "LID__Is_Influenced__c": {
+            "type": "boolean"
+        },
+        "LID__LinkedIn_Company_Id__c": {
+            "type": "null"
+        },
+        "LID__MainCompetitors__c": {
+            "type": "null"
+        },
+        "LID__My_DateTime__c": {
+            "type": "null"
+        },
+        "LID__My_Geolocation__Latitude__s": {
+            "type": "null"
+        },
+        "LID__My_Geolocation__Longitude__s": {
+            "type": "null"
+        },
+        "LID__My_Geolocation__c": {
+            "type": "null"
+        },
+        "LID__OrderNumber__c": {
+            "type": "null"
+        },
+        "LID__TrackingNumber__c": {
+            "type": "null"
+        },
+        "Einstein_scores__c": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/getAll.json
new file mode 100644
index 0000000000..4baa1308a5
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/getAll.json
@@ -0,0 +1,29 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "AccountId": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/update.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/update.json
new file mode 100644
index 0000000000..36eb1aeed9
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/opportunity/update.json
@@ -0,0 +1,12 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "errors",
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/search/query.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/search/query.json
new file mode 100644
index 0000000000..5f7a1540d8
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/search/query.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/create.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/create.json
new file mode 100644
index 0000000000..7e3b41a086
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/create.json
@@ -0,0 +1,16 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "success",
+        "errors"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/get.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/get.json
new file mode 100644
index 0000000000..3f28ba445d
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/get.json
@@ -0,0 +1,139 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        },
+        "Priority": {
+            "type": "string"
+        },
+        "IsHighPriority": {
+            "type": "boolean"
+        },
+        "OwnerId": {
+            "type": "string"
+        },
+        "IsDeleted": {
+            "type": "boolean"
+        },
+        "IsClosed": {
+            "type": "boolean"
+        },
+        "CreatedDate": {
+            "type": "string"
+        },
+        "CreatedById": {
+            "type": "string"
+        },
+        "LastModifiedDate": {
+            "type": "string"
+        },
+        "LastModifiedById": {
+            "type": "string"
+        },
+        "SystemModstamp": {
+            "type": "string"
+        },
+        "IsArchived": {
+            "type": "boolean"
+        },
+        "CallDisposition": {
+            "type": "null"
+        },
+        "CallObject": {
+            "type": "null"
+        },
+        "ReminderDateTime": {
+            "type": "null"
+        },
+        "IsReminderSet": {
+            "type": "boolean"
+        },
+        "IsRecurrence": {
+            "type": "boolean"
+        },
+        "RecurrenceDayOfMonth": {
+            "type": "null"
+        },
+        "RecurrenceInstance": {
+            "type": "null"
+        },
+        "RecurrenceMonthOfYear": {
+            "type": "null"
+        },
+        "RecurrenceRegeneratedType": {
+            "type": "null"
+        },
+        "TaskSubtype": {
+            "type": "string"
+        },
+        "WhoCount": {
+            "type": "integer"
+        },
+        "WhatCount": {
+            "type": "integer"
+        },
+        "ActionCadenceStepTrackerId": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "attributes",
+        "Id",
+        "WhoId",
+        "WhatId",
+        "Subject",
+        "ActivityDate",
+        "Status",
+        "Priority",
+        "IsHighPriority",
+        "OwnerId",
+        "Description",
+        "IsDeleted",
+        "AccountId",
+        "IsClosed",
+        "CreatedDate",
+        "CreatedById",
+        "LastModifiedDate",
+        "LastModifiedById",
+        "SystemModstamp",
+        "IsArchived",
+        "CallDurationInSeconds",
+        "CallType",
+        "CallDisposition",
+        "CallObject",
+        "ReminderDateTime",
+        "IsReminderSet",
+        "RecurrenceActivityId",
+        "IsRecurrence",
+        "RecurrenceStartDateOnly",
+        "RecurrenceEndDateOnly",
+        "RecurrenceTimeZoneSidKey",
+        "RecurrenceType",
+        "RecurrenceInterval",
+        "RecurrenceDayOfWeekMask",
+        "RecurrenceDayOfMonth",
+        "RecurrenceInstance",
+        "RecurrenceMonthOfYear",
+        "RecurrenceRegeneratedType",
+        "TaskSubtype"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/getAll.json
new file mode 100644
index 0000000000..5f7a1540d8
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/task/getAll.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..769ce651e7
--- /dev/null
+++ b/packages/nodes-base/nodes/Salesforce/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,32 @@
+{
+    "type": "object",
+    "properties": {
+        "attributes": {
+            "type": "object",
+            "properties": {
+                "type": {
+                    "type": "string"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "url"
+            ]
+        },
+        "Id": {
+            "type": "string"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "Email": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "attributes"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index f3f7f406db..bec676ed7c 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -35,6 +35,7 @@ export class Salesmate implements INodeType {
 		defaults: {
 			name: 'Salesmate',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
index 6e86475c66..a9f4a48726 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
@@ -36,6 +36,7 @@ export class SeaTable implements INodeType {
 		defaults: {
 			name: 'SeaTable',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/create.json b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/create.json
new file mode 100644
index 0000000000..ea78c1c187
--- /dev/null
+++ b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/create.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "string"
+        },
+        "_ctime": {
+            "type": "string"
+        },
+        "_mtime": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "_id",
+        "_ctime",
+        "_mtime"
+    ]
+}
diff --git a/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/get.json b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/get.json
new file mode 100644
index 0000000000..71f0d6bdf3
--- /dev/null
+++ b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/get.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "_archived": {
+            "type": "boolean"
+        },
+        "_id": {
+            "type": "string"
+        },
+        "_locked": {
+            "type": "null"
+        },
+        "_locked_by": {
+            "type": "null"
+        },
+        "_ctime": {
+            "type": "string"
+        },
+        "_mtime": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/getAll.json b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/getAll.json
new file mode 100644
index 0000000000..9dc99e9c7c
--- /dev/null
+++ b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/getAll.json
@@ -0,0 +1,13 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "_id",
+        "_ctime",
+        "_mtime"
+    ]
+}
diff --git a/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/update.json b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/update.json
new file mode 100644
index 0000000000..749391b14b
--- /dev/null
+++ b/packages/nodes-base/nodes/SeaTable/__schema__/v1.0.0/row/update.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "_id": {
+            "type": "string"
+        },
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "_id",
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index 520489b524..6553bd47c2 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -31,6 +31,7 @@ export class SecurityScorecard implements INodeType {
 		defaults: {
 			name: 'SecurityScorecard',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index 5699e22535..5d55af6337 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -27,6 +27,7 @@ export class Segment implements INodeType {
 		defaults: {
 			name: 'Segment',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Segment/__schema__/v1.0.0/track/event.json b/packages/nodes-base/nodes/Segment/__schema__/v1.0.0/track/event.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Segment/__schema__/v1.0.0/track/event.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index 560f1f36b3..82a42f1e43 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -29,6 +29,7 @@ export class SendGrid implements INodeType {
 		defaults: {
 			name: 'SendGrid',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/SendGrid/__schema__/v1.0.0/mail/send.json b/packages/nodes-base/nodes/SendGrid/__schema__/v1.0.0/mail/send.json
new file mode 100644
index 0000000000..efce3a11cc
--- /dev/null
+++ b/packages/nodes-base/nodes/SendGrid/__schema__/v1.0.0/mail/send.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "messageId": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index 6ca6b76bd3..483bea3d5d 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -25,6 +25,7 @@ export class Sendy implements INodeType {
 		defaults: {
 			name: 'Sendy',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index edd53b83ea..20bfcd1320 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -30,6 +30,7 @@ export class SentryIo implements INodeType {
 		defaults: {
 			name: 'Sentry.io',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/SentryIo/__schema__/v1.0.0/issue/getAll.json b/packages/nodes-base/nodes/SentryIo/__schema__/v1.0.0/issue/getAll.json
new file mode 100644
index 0000000000..6176e198b5
--- /dev/null
+++ b/packages/nodes-base/nodes/SentryIo/__schema__/v1.0.0/issue/getAll.json
@@ -0,0 +1,160 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "shareId": {
+            "type": "null"
+        },
+        "shortId": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "culprit": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "level": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "substatus": {
+            "type": "string"
+        },
+        "isPublic": {
+            "type": "boolean"
+        },
+        "platform": {
+            "type": "string"
+        },
+        "project": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "slug": {
+                    "type": "string"
+                },
+                "platform": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "name",
+                "slug",
+                "platform"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "initial_priority": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "initial_priority"
+            ]
+        },
+        "numComments": {
+            "type": "integer"
+        },
+        "isBookmarked": {
+            "type": "boolean"
+        },
+        "isSubscribed": {
+            "type": "boolean"
+        },
+        "hasSeen": {
+            "type": "boolean"
+        },
+        "issueType": {
+            "type": "string"
+        },
+        "issueCategory": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "string"
+        },
+        "isUnhandled": {
+            "type": "boolean"
+        },
+        "count": {
+            "type": "string"
+        },
+        "userCount": {
+            "type": "integer"
+        },
+        "firstSeen": {
+            "type": "string"
+        },
+        "lastSeen": {
+            "type": "string"
+        },
+        "stats": {
+            "type": "object",
+            "properties": {
+                "24h": {
+                    "type": "array",
+                    "items": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "required": [
+        "id",
+        "shareId",
+        "shortId",
+        "title",
+        "culprit",
+        "permalink",
+        "logger",
+        "level",
+        "status",
+        "statusDetails",
+        "substatus",
+        "isPublic",
+        "platform",
+        "project",
+        "type",
+        "metadata",
+        "numComments",
+        "assignedTo",
+        "isBookmarked",
+        "isSubscribed",
+        "subscriptionDetails",
+        "hasSeen",
+        "annotations",
+        "issueType",
+        "issueCategory",
+        "priority",
+        "priorityLockedAt",
+        "isUnhandled",
+        "count",
+        "userCount",
+        "firstSeen",
+        "lastSeen",
+        "stats"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index 15ef436497..a865b228da 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -42,6 +42,7 @@ export class ServiceNow implements INodeType {
 		defaults: {
 			name: 'ServiceNow',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/incident/create.json b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/incident/create.json
new file mode 100644
index 0000000000..581a908edf
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/incident/create.json
@@ -0,0 +1,454 @@
+{
+    "type": "object",
+    "properties": {
+        "parent": {
+            "type": "string"
+        },
+        "made_sla": {
+            "type": "string"
+        },
+        "caused_by": {
+            "type": "string"
+        },
+        "watch_list": {
+            "type": "string"
+        },
+        "upon_reject": {
+            "type": "string"
+        },
+        "sys_updated_on": {
+            "type": "string"
+        },
+        "child_incidents": {
+            "type": "string"
+        },
+        "hold_reason": {
+            "type": "string"
+        },
+        "origin_table": {
+            "type": "string"
+        },
+        "task_effective_number": {
+            "type": "string"
+        },
+        "approval_history": {
+            "type": "string"
+        },
+        "number": {
+            "type": "string"
+        },
+        "sys_updated_by": {
+            "type": "string"
+        },
+        "opened_by": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link",
+                "value"
+            ]
+        },
+        "user_input": {
+            "type": "string"
+        },
+        "sys_created_on": {
+            "type": "string"
+        },
+        "sys_domain": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link",
+                "value"
+            ]
+        },
+        "state": {
+            "type": "string"
+        },
+        "route_reason": {
+            "type": "string"
+        },
+        "sys_created_by": {
+            "type": "string"
+        },
+        "knowledge": {
+            "type": "string"
+        },
+        "order": {
+            "type": "string"
+        },
+        "calendar_stc": {
+            "type": "string"
+        },
+        "closed_at": {
+            "type": "string"
+        },
+        "cmdb_ci": {
+            "type": "string"
+        },
+        "delivery_plan": {
+            "type": "string"
+        },
+        "contract": {
+            "type": "string"
+        },
+        "impact": {
+            "type": "string"
+        },
+        "active": {
+            "type": "string"
+        },
+        "work_notes_list": {
+            "type": "string"
+        },
+        "business_service": {
+            "type": "string"
+        },
+        "business_impact": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "string"
+        },
+        "sys_domain_path": {
+            "type": "string"
+        },
+        "rfc": {
+            "type": "string"
+        },
+        "time_worked": {
+            "type": "string"
+        },
+        "expected_start": {
+            "type": "string"
+        },
+        "opened_at": {
+            "type": "string"
+        },
+        "business_duration": {
+            "type": "string"
+        },
+        "group_list": {
+            "type": "string"
+        },
+        "work_end": {
+            "type": "string"
+        },
+        "caller_id": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link",
+                "value"
+            ]
+        },
+        "reopened_time": {
+            "type": "string"
+        },
+        "resolved_at": {
+            "type": "string"
+        },
+        "approval_set": {
+            "type": "string"
+        },
+        "subcategory": {
+            "type": "string"
+        },
+        "work_notes": {
+            "type": "string"
+        },
+        "universal_request": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "close_code": {
+            "type": "string"
+        },
+        "correlation_display": {
+            "type": "string"
+        },
+        "delivery_task": {
+            "type": "string"
+        },
+        "work_start": {
+            "type": "string"
+        },
+        "additional_assignee_list": {
+            "type": "string"
+        },
+        "business_stc": {
+            "type": "string"
+        },
+        "cause": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "origin_id": {
+            "type": "string"
+        },
+        "calendar_duration": {
+            "type": "string"
+        },
+        "close_notes": {
+            "type": "string"
+        },
+        "notify": {
+            "type": "string"
+        },
+        "service_offering": {
+            "type": "string"
+        },
+        "sys_class_name": {
+            "type": "string"
+        },
+        "closed_by": {
+            "type": "string"
+        },
+        "follow_up": {
+            "type": "string"
+        },
+        "parent_incident": {
+            "type": "string"
+        },
+        "sys_id": {
+            "type": "string"
+        },
+        "contact_type": {
+            "type": "string"
+        },
+        "reopened_by": {
+            "type": "string"
+        },
+        "incident_state": {
+            "type": "string"
+        },
+        "urgency": {
+            "type": "string"
+        },
+        "problem_id": {
+            "type": "string"
+        },
+        "reassignment_count": {
+            "type": "string"
+        },
+        "activity_due": {
+            "type": "string"
+        },
+        "severity": {
+            "type": "string"
+        },
+        "comments": {
+            "type": "string"
+        },
+        "approval": {
+            "type": "string"
+        },
+        "sla_due": {
+            "type": "string"
+        },
+        "comments_and_work_notes": {
+            "type": "string"
+        },
+        "due_date": {
+            "type": "string"
+        },
+        "sys_mod_count": {
+            "type": "string"
+        },
+        "reopen_count": {
+            "type": "string"
+        },
+        "sys_tags": {
+            "type": "string"
+        },
+        "escalation": {
+            "type": "string"
+        },
+        "upon_approval": {
+            "type": "string"
+        },
+        "correlation_id": {
+            "type": "string"
+        },
+        "location": {
+            "type": "string"
+        },
+        "category": {
+            "type": "string"
+        },
+        "promoted_by": {
+            "type": "string"
+        },
+        "skills": {
+            "type": "string"
+        },
+        "proposed_by": {
+            "type": "string"
+        },
+        "lessons_learned": {
+            "type": "string"
+        },
+        "major_incident_state": {
+            "type": "string"
+        },
+        "trigger_rule": {
+            "type": "string"
+        },
+        "timeline": {
+            "type": "string"
+        },
+        "promoted_on": {
+            "type": "string"
+        },
+        "proposed_on": {
+            "type": "string"
+        },
+        "actions_taken": {
+            "type": "string"
+        },
+        "overview": {
+            "type": "string"
+        },
+        "needs_attention": {
+            "type": "string"
+        },
+        "task_for": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link",
+                "value"
+            ]
+        },
+        "action_status": {
+            "type": "string"
+        },
+        "x_caci_sg_meraki_device_alert": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "parent",
+        "made_sla",
+        "caused_by",
+        "watch_list",
+        "upon_reject",
+        "sys_updated_on",
+        "child_incidents",
+        "hold_reason",
+        "origin_table",
+        "task_effective_number",
+        "approval_history",
+        "number",
+        "resolved_by",
+        "sys_updated_by",
+        "opened_by",
+        "user_input",
+        "sys_created_on",
+        "sys_domain",
+        "state",
+        "route_reason",
+        "sys_created_by",
+        "knowledge",
+        "order",
+        "calendar_stc",
+        "closed_at",
+        "cmdb_ci",
+        "contract",
+        "impact",
+        "active",
+        "work_notes_list",
+        "business_service",
+        "business_impact",
+        "priority",
+        "sys_domain_path",
+        "rfc",
+        "time_worked",
+        "expected_start",
+        "opened_at",
+        "business_duration",
+        "group_list",
+        "work_end",
+        "caller_id",
+        "reopened_time",
+        "resolved_at",
+        "approval_set",
+        "subcategory",
+        "work_notes",
+        "universal_request",
+        "short_description",
+        "close_code",
+        "correlation_display",
+        "work_start",
+        "assignment_group",
+        "additional_assignee_list",
+        "business_stc",
+        "cause",
+        "description",
+        "origin_id",
+        "calendar_duration",
+        "close_notes",
+        "notify",
+        "service_offering",
+        "sys_class_name",
+        "closed_by",
+        "follow_up",
+        "parent_incident",
+        "sys_id",
+        "contact_type",
+        "reopened_by",
+        "incident_state",
+        "urgency",
+        "problem_id",
+        "company",
+        "reassignment_count",
+        "activity_due",
+        "assigned_to",
+        "severity",
+        "comments",
+        "approval",
+        "sla_due",
+        "comments_and_work_notes",
+        "due_date",
+        "sys_mod_count",
+        "reopen_count",
+        "sys_tags",
+        "escalation",
+        "upon_approval",
+        "correlation_id",
+        "location",
+        "category"
+    ]
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/incident/getAll.json b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/incident/getAll.json
new file mode 100644
index 0000000000..cb884066ea
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/incident/getAll.json
@@ -0,0 +1,278 @@
+{
+    "type": "object",
+    "properties": {
+        "parent": {
+            "type": "string"
+        },
+        "caused_by": {
+            "type": "string"
+        },
+        "watch_list": {
+            "type": "string"
+        },
+        "upon_reject": {
+            "type": "string"
+        },
+        "sys_updated_on": {
+            "type": "string"
+        },
+        "origin_table": {
+            "type": "string"
+        },
+        "approval_history": {
+            "type": "string"
+        },
+        "number": {
+            "type": "string"
+        },
+        "state": {
+            "type": "string"
+        },
+        "sys_created_by": {
+            "type": "string"
+        },
+        "knowledge": {
+            "type": "string"
+        },
+        "order": {
+            "type": "string"
+        },
+        "delivery_plan": {
+            "type": "string"
+        },
+        "contract": {
+            "type": "string"
+        },
+        "impact": {
+            "type": "string"
+        },
+        "active": {
+            "type": "string"
+        },
+        "work_notes_list": {
+            "type": "string"
+        },
+        "priority": {
+            "type": "string"
+        },
+        "sys_domain_path": {
+            "type": "string"
+        },
+        "business_duration": {
+            "type": "string"
+        },
+        "group_list": {
+            "type": "string"
+        },
+        "approval_set": {
+            "type": "string"
+        },
+        "universal_request": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "correlation_display": {
+            "type": "string"
+        },
+        "delivery_task": {
+            "type": "string"
+        },
+        "work_start": {
+            "type": "string"
+        },
+        "additional_assignee_list": {
+            "type": "string"
+        },
+        "notify": {
+            "type": "string"
+        },
+        "sys_class_name": {
+            "type": "string"
+        },
+        "follow_up": {
+            "type": "string"
+        },
+        "reopened_by": {
+            "type": "string"
+        },
+        "reassignment_count": {
+            "type": "string"
+        },
+        "sla_due": {
+            "type": "string"
+        },
+        "comments_and_work_notes": {
+            "type": "string"
+        },
+        "escalation": {
+            "type": "string"
+        },
+        "upon_approval": {
+            "type": "string"
+        },
+        "correlation_id": {
+            "type": "string"
+        },
+        "made_sla": {
+            "type": "string"
+        },
+        "child_incidents": {
+            "type": "string"
+        },
+        "task_effective_number": {
+            "type": "string"
+        },
+        "sys_updated_by": {
+            "type": "string"
+        },
+        "opened_by": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link"
+            ]
+        },
+        "user_input": {
+            "type": "string"
+        },
+        "sys_created_on": {
+            "type": "string"
+        },
+        "sys_domain": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link"
+            ]
+        },
+        "route_reason": {
+            "type": "string"
+        },
+        "calendar_stc": {
+            "type": "string"
+        },
+        "closed_at": {
+            "type": "string"
+        },
+        "business_impact": {
+            "type": "string"
+        },
+        "rfc": {
+            "type": "string"
+        },
+        "time_worked": {
+            "type": "string"
+        },
+        "expected_start": {
+            "type": "string"
+        },
+        "opened_at": {
+            "type": "string"
+        },
+        "work_end": {
+            "type": "string"
+        },
+        "caller_id": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link"
+            ]
+        },
+        "reopened_time": {
+            "type": "string"
+        },
+        "resolved_at": {
+            "type": "string"
+        },
+        "subcategory": {
+            "type": "string"
+        },
+        "work_notes": {
+            "type": "string"
+        },
+        "business_stc": {
+            "type": "string"
+        },
+        "cause": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "origin_id": {
+            "type": "string"
+        },
+        "calendar_duration": {
+            "type": "string"
+        },
+        "close_notes": {
+            "type": "string"
+        },
+        "sys_id": {
+            "type": "string"
+        },
+        "incident_state": {
+            "type": "string"
+        },
+        "urgency": {
+            "type": "string"
+        },
+        "problem_id": {
+            "type": "string"
+        },
+        "activity_due": {
+            "type": "string"
+        },
+        "severity": {
+            "type": "string"
+        },
+        "comments": {
+            "type": "string"
+        },
+        "approval": {
+            "type": "string"
+        },
+        "due_date": {
+            "type": "string"
+        },
+        "sys_mod_count": {
+            "type": "string"
+        },
+        "reopen_count": {
+            "type": "string"
+        },
+        "sys_tags": {
+            "type": "string"
+        },
+        "category": {
+            "type": "string"
+        },
+        "hold_reason": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/tableRecord/getAll.json b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/tableRecord/getAll.json
new file mode 100644
index 0000000000..042fdbfec6
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/tableRecord/getAll.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "number": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "sys_id": {
+            "type": "string"
+        },
+        "author": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link",
+                "value"
+            ]
+        },
+        "rating": {
+            "type": "string"
+        },
+        "language": {
+            "type": "string"
+        },
+        "embedded_media": {
+            "type": "string"
+        },
+        "content": {
+            "type": "string"
+        },
+        "helpful_text": {
+            "type": "string"
+        },
+        "last_updated_on": {
+            "type": "string"
+        },
+        "last_helpful_rating": {
+            "type": "string"
+        },
+        "last_rating": {
+            "type": "string"
+        },
+        "view_count": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/user/get.json b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/user/get.json
new file mode 100644
index 0000000000..79d1bb0493
--- /dev/null
+++ b/packages/nodes-base/nodes/ServiceNow/__schema__/v1.0.0/user/get.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "sys_domain": {
+            "type": "object",
+            "properties": {
+                "link": {
+                    "type": "string"
+                },
+                "value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "link"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index 830dc051c2..e965a400cd 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -27,6 +27,7 @@ export class Shopify implements INodeType {
 		defaults: {
 			name: 'Shopify',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/order/getAll.json b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/order/getAll.json
new file mode 100644
index 0000000000..83ebeb5a70
--- /dev/null
+++ b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/order/getAll.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/create.json b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/create.json
new file mode 100644
index 0000000000..8ba87f67a8
--- /dev/null
+++ b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/create.json
@@ -0,0 +1,259 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "vendor": {
+            "type": "string"
+        },
+        "product_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "handle": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "template_suffix": {
+            "type": "null"
+        },
+        "published_scope": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "admin_graphql_api_id": {
+            "type": "string"
+        },
+        "variants": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "price": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "inventory_policy": {
+                        "type": "string"
+                    },
+                    "compare_at_price": {
+                        "type": "null"
+                    },
+                    "option1": {
+                        "type": "string"
+                    },
+                    "option2": {
+                        "type": "null"
+                    },
+                    "option3": {
+                        "type": "null"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "taxable": {
+                        "type": "boolean"
+                    },
+                    "barcode": {
+                        "type": "null"
+                    },
+                    "fulfillment_service": {
+                        "type": "string"
+                    },
+                    "grams": {
+                        "type": "integer"
+                    },
+                    "inventory_management": {
+                        "type": "null"
+                    },
+                    "requires_shipping": {
+                        "type": "boolean"
+                    },
+                    "sku": {
+                        "type": "string"
+                    },
+                    "weight": {
+                        "type": "integer"
+                    },
+                    "weight_unit": {
+                        "type": "string"
+                    },
+                    "inventory_item_id": {
+                        "type": "integer"
+                    },
+                    "inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "old_inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    },
+                    "image_id": {
+                        "type": "null"
+                    }
+                },
+                "required": [
+                    "id",
+                    "product_id",
+                    "title",
+                    "price",
+                    "position",
+                    "inventory_policy",
+                    "compare_at_price",
+                    "option1",
+                    "option2",
+                    "option3",
+                    "created_at",
+                    "updated_at",
+                    "taxable",
+                    "barcode",
+                    "fulfillment_service",
+                    "grams",
+                    "inventory_management",
+                    "requires_shipping",
+                    "sku",
+                    "weight",
+                    "weight_unit",
+                    "inventory_item_id",
+                    "inventory_quantity",
+                    "old_inventory_quantity",
+                    "admin_graphql_api_id",
+                    "image_id"
+                ]
+            }
+        },
+        "options": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "values": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "product_id",
+                    "name",
+                    "position",
+                    "values"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "alt": {
+                        "type": "null"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    },
+                    "width": {
+                        "type": "integer"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "src": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "alt",
+                    "position",
+                    "product_id",
+                    "created_at",
+                    "updated_at",
+                    "admin_graphql_api_id",
+                    "width",
+                    "height",
+                    "src",
+                    "variant_ids"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "title",
+        "body_html",
+        "vendor",
+        "product_type",
+        "created_at",
+        "handle",
+        "updated_at",
+        "published_at",
+        "template_suffix",
+        "published_scope",
+        "tags",
+        "status",
+        "admin_graphql_api_id",
+        "variants",
+        "options",
+        "images",
+        "image"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/get.json b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/get.json
new file mode 100644
index 0000000000..ddc4c11700
--- /dev/null
+++ b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/get.json
@@ -0,0 +1,221 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "vendor": {
+            "type": "string"
+        },
+        "product_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "handle": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "published_scope": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "admin_graphql_api_id": {
+            "type": "string"
+        },
+        "variants": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "price": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "inventory_policy": {
+                        "type": "string"
+                    },
+                    "option1": {
+                        "type": "string"
+                    },
+                    "option3": {
+                        "type": "null"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "taxable": {
+                        "type": "boolean"
+                    },
+                    "fulfillment_service": {
+                        "type": "string"
+                    },
+                    "grams": {
+                        "type": "integer"
+                    },
+                    "requires_shipping": {
+                        "type": "boolean"
+                    },
+                    "weight_unit": {
+                        "type": "string"
+                    },
+                    "inventory_item_id": {
+                        "type": "integer"
+                    },
+                    "inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "old_inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "product_id",
+                    "title",
+                    "price",
+                    "position",
+                    "inventory_policy",
+                    "compare_at_price",
+                    "option1",
+                    "option2",
+                    "option3",
+                    "created_at",
+                    "updated_at",
+                    "taxable",
+                    "barcode",
+                    "fulfillment_service",
+                    "grams",
+                    "inventory_management",
+                    "requires_shipping",
+                    "sku",
+                    "weight",
+                    "weight_unit",
+                    "inventory_item_id",
+                    "inventory_quantity",
+                    "old_inventory_quantity",
+                    "admin_graphql_api_id",
+                    "image_id"
+                ]
+            }
+        },
+        "options": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "values": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "product_id",
+                    "name",
+                    "position",
+                    "values"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    },
+                    "width": {
+                        "type": "integer"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "variant_ids": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "alt",
+                    "position",
+                    "product_id",
+                    "created_at",
+                    "updated_at",
+                    "admin_graphql_api_id",
+                    "width",
+                    "height",
+                    "src",
+                    "variant_ids"
+                ]
+            }
+        }
+    },
+    "required": [
+        "title"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/getAll.json b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/getAll.json
new file mode 100644
index 0000000000..cbaf092869
--- /dev/null
+++ b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/getAll.json
@@ -0,0 +1,266 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "vendor": {
+            "type": "string"
+        },
+        "product_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "handle": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "published_scope": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "admin_graphql_api_id": {
+            "type": "string"
+        },
+        "variants": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "price": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "inventory_policy": {
+                        "type": "string"
+                    },
+                    "option1": {
+                        "type": "string"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "taxable": {
+                        "type": "boolean"
+                    },
+                    "fulfillment_service": {
+                        "type": "string"
+                    },
+                    "grams": {
+                        "type": "integer"
+                    },
+                    "requires_shipping": {
+                        "type": "boolean"
+                    },
+                    "weight_unit": {
+                        "type": "string"
+                    },
+                    "inventory_item_id": {
+                        "type": "integer"
+                    },
+                    "inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "old_inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "product_id",
+                    "id",
+                    "title",
+                    "price",
+                    "position",
+                    "inventory_policy",
+                    "compare_at_price",
+                    "option1",
+                    "option2",
+                    "option3",
+                    "created_at",
+                    "updated_at",
+                    "taxable",
+                    "barcode",
+                    "fulfillment_service",
+                    "grams",
+                    "inventory_management",
+                    "requires_shipping",
+                    "sku",
+                    "weight",
+                    "weight_unit",
+                    "inventory_item_id",
+                    "inventory_quantity",
+                    "old_inventory_quantity",
+                    "admin_graphql_api_id",
+                    "image_id"
+                ]
+            }
+        },
+        "options": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "values": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "product_id",
+                    "id",
+                    "name",
+                    "position",
+                    "values"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    },
+                    "width": {
+                        "type": "integer"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "variant_ids": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "alt",
+                    "position",
+                    "product_id",
+                    "created_at",
+                    "updated_at",
+                    "admin_graphql_api_id",
+                    "width",
+                    "height",
+                    "src",
+                    "variant_ids"
+                ]
+            }
+        },
+        "image": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "position": {
+                    "type": "integer"
+                },
+                "product_id": {
+                    "type": "integer"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                },
+                "admin_graphql_api_id": {
+                    "type": "string"
+                },
+                "width": {
+                    "type": "integer"
+                },
+                "height": {
+                    "type": "integer"
+                },
+                "src": {
+                    "type": "string"
+                },
+                "variant_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "required": [
+                "id",
+                "alt",
+                "position",
+                "product_id",
+                "created_at",
+                "updated_at",
+                "admin_graphql_api_id",
+                "width",
+                "height",
+                "src",
+                "variant_ids"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/update.json b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/update.json
new file mode 100644
index 0000000000..90be48fabc
--- /dev/null
+++ b/packages/nodes-base/nodes/Shopify/__schema__/v1.0.0/product/update.json
@@ -0,0 +1,272 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "title": {
+            "type": "string"
+        },
+        "body_html": {
+            "type": "string"
+        },
+        "vendor": {
+            "type": "string"
+        },
+        "product_type": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "handle": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "published_scope": {
+            "type": "string"
+        },
+        "tags": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "admin_graphql_api_id": {
+            "type": "string"
+        },
+        "variants": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "price": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "inventory_policy": {
+                        "type": "string"
+                    },
+                    "option1": {
+                        "type": "string"
+                    },
+                    "option3": {
+                        "type": "null"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "taxable": {
+                        "type": "boolean"
+                    },
+                    "fulfillment_service": {
+                        "type": "string"
+                    },
+                    "grams": {
+                        "type": "integer"
+                    },
+                    "requires_shipping": {
+                        "type": "boolean"
+                    },
+                    "weight_unit": {
+                        "type": "string"
+                    },
+                    "inventory_item_id": {
+                        "type": "integer"
+                    },
+                    "inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "old_inventory_quantity": {
+                        "type": "integer"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "product_id",
+                    "title",
+                    "price",
+                    "position",
+                    "inventory_policy",
+                    "compare_at_price",
+                    "option1",
+                    "option2",
+                    "option3",
+                    "created_at",
+                    "updated_at",
+                    "taxable",
+                    "barcode",
+                    "fulfillment_service",
+                    "grams",
+                    "inventory_management",
+                    "requires_shipping",
+                    "sku",
+                    "weight",
+                    "weight_unit",
+                    "inventory_item_id",
+                    "inventory_quantity",
+                    "old_inventory_quantity",
+                    "admin_graphql_api_id",
+                    "image_id"
+                ]
+            }
+        },
+        "options": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "values": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "product_id",
+                    "name",
+                    "position",
+                    "values"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "admin_graphql_api_id": {
+                        "type": "string"
+                    },
+                    "width": {
+                        "type": "integer"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "variant_ids": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "alt",
+                    "position",
+                    "product_id",
+                    "created_at",
+                    "updated_at",
+                    "admin_graphql_api_id",
+                    "width",
+                    "height",
+                    "src",
+                    "variant_ids"
+                ]
+            }
+        },
+        "image": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "position": {
+                    "type": "integer"
+                },
+                "product_id": {
+                    "type": "integer"
+                },
+                "created_at": {
+                    "type": "string"
+                },
+                "updated_at": {
+                    "type": "string"
+                },
+                "admin_graphql_api_id": {
+                    "type": "string"
+                },
+                "width": {
+                    "type": "integer"
+                },
+                "height": {
+                    "type": "integer"
+                },
+                "src": {
+                    "type": "string"
+                },
+                "variant_ids": {
+                    "type": "array",
+                    "items": {
+                        "type": "integer"
+                    }
+                }
+            },
+            "required": [
+                "id",
+                "alt",
+                "position",
+                "product_id",
+                "created_at",
+                "updated_at",
+                "admin_graphql_api_id",
+                "width",
+                "height",
+                "src",
+                "variant_ids"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index 6aa599b120..b4ed05570e 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -22,6 +22,7 @@ export class Signl4 implements INodeType {
 		defaults: {
 			name: 'SIGNL4',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.json b/packages/nodes-base/nodes/Slack/Slack.node.json
index 3ac416b245..43aaf48936 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.json
+++ b/packages/nodes-base/nodes/Slack/Slack.node.json
@@ -2,8 +2,11 @@
 	"node": "n8n-nodes-base.slack",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
-	"alias": ["human", "form", "wait"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
+	"alias": ["human", "form", "wait", "hitl", "approval"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 524a36d7b5..15d8e7bfbd 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -18,7 +18,6 @@ import {
 	NodeConnectionType,
 	NodeOperationError,
 	SEND_AND_WAIT_OPERATION,
-	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 import type { Readable } from 'stream';
 
@@ -42,7 +41,12 @@ import { reactionFields, reactionOperations } from './ReactionDescription';
 import { starFields, starOperations } from './StarDescription';
 import { userFields, userOperations } from './UserDescription';
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
-import { getSendAndWaitProperties, sendAndWaitWebhook } from '../../../utils/sendAndWait/utils';
+import { sendAndWaitWebhooksDescription } from '../../../utils/sendAndWait/descriptions';
+import {
+	configureWaitTillDate,
+	getSendAndWaitProperties,
+	sendAndWaitWebhook,
+} from '../../../utils/sendAndWait/utils';
 
 export class SlackV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -77,26 +81,7 @@ export class SlackV2 implements INodeType {
 					},
 				},
 			],
-			webhooks: [
-				{
-					name: 'default',
-					httpMethod: 'GET',
-					responseMode: 'onReceived',
-					responseData: '',
-					path: '={{ $nodeId }}',
-					restartWebhook: true,
-					isFullPath: true,
-				},
-				{
-					name: 'default',
-					httpMethod: 'POST',
-					responseMode: 'onReceived',
-					responseData: '',
-					path: '={{ $nodeId }}',
-					restartWebhook: true,
-					isFullPath: true,
-				},
-			],
+			webhooks: sendAndWaitWebhooksDescription,
 			properties: [
 				{
 					displayName: 'Authentication',
@@ -386,7 +371,9 @@ export class SlackV2 implements INodeType {
 				createSendAndWaitMessageBody(this),
 			);
 
-			await this.putExecutionToWait(WAIT_INDEFINITELY);
+			const waitTill = configureWaitTillDate(this);
+
+			await this.putExecutionToWait(waitTill);
 			return [this.getInputData()];
 		}
 
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/create.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/create.json
new file mode 100644
index 0000000000..5f658c7671
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/create.json
@@ -0,0 +1,118 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "is_channel": {
+            "type": "boolean"
+        },
+        "is_group": {
+            "type": "boolean"
+        },
+        "is_im": {
+            "type": "boolean"
+        },
+        "is_mpim": {
+            "type": "boolean"
+        },
+        "is_private": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "is_general": {
+            "type": "boolean"
+        },
+        "unlinked": {
+            "type": "integer"
+        },
+        "name_normalized": {
+            "type": "string"
+        },
+        "is_shared": {
+            "type": "boolean"
+        },
+        "is_org_shared": {
+            "type": "boolean"
+        },
+        "is_pending_ext_shared": {
+            "type": "boolean"
+        },
+        "context_team_id": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "parent_conversation": {
+            "type": "null"
+        },
+        "creator": {
+            "type": "string"
+        },
+        "is_ext_shared": {
+            "type": "boolean"
+        },
+        "shared_team_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_member": {
+            "type": "boolean"
+        },
+        "last_read": {
+            "type": "string"
+        },
+        "topic": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "purpose": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "priority": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/get.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/get.json
new file mode 100644
index 0000000000..422fc8c4c5
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/get.json
@@ -0,0 +1,121 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "is_channel": {
+            "type": "boolean"
+        },
+        "is_group": {
+            "type": "boolean"
+        },
+        "is_im": {
+            "type": "boolean"
+        },
+        "is_mpim": {
+            "type": "boolean"
+        },
+        "is_private": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "is_general": {
+            "type": "boolean"
+        },
+        "unlinked": {
+            "type": "integer"
+        },
+        "name_normalized": {
+            "type": "string"
+        },
+        "is_shared": {
+            "type": "boolean"
+        },
+        "is_org_shared": {
+            "type": "boolean"
+        },
+        "is_pending_ext_shared": {
+            "type": "boolean"
+        },
+        "context_team_id": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "parent_conversation": {
+            "type": "null"
+        },
+        "creator": {
+            "type": "string"
+        },
+        "is_ext_shared": {
+            "type": "boolean"
+        },
+        "shared_team_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_member": {
+            "type": "boolean"
+        },
+        "last_read": {
+            "type": "string"
+        },
+        "topic": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "purpose": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "previous_names": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/getAll.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/getAll.json
new file mode 100644
index 0000000000..110a65556f
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/getAll.json
@@ -0,0 +1,156 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "is_channel": {
+            "type": "boolean"
+        },
+        "is_group": {
+            "type": "boolean"
+        },
+        "is_im": {
+            "type": "boolean"
+        },
+        "is_mpim": {
+            "type": "boolean"
+        },
+        "is_private": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "is_general": {
+            "type": "boolean"
+        },
+        "unlinked": {
+            "type": "integer"
+        },
+        "name_normalized": {
+            "type": "string"
+        },
+        "is_shared": {
+            "type": "boolean"
+        },
+        "is_org_shared": {
+            "type": "boolean"
+        },
+        "is_pending_ext_shared": {
+            "type": "boolean"
+        },
+        "context_team_id": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "parent_conversation": {
+            "type": "null"
+        },
+        "creator": {
+            "type": "string"
+        },
+        "is_ext_shared": {
+            "type": "boolean"
+        },
+        "shared_team_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_member": {
+            "type": "boolean"
+        },
+        "topic": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "purpose": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "properties": {
+            "type": "object",
+            "properties": {
+                "canvas": {
+                    "type": "object",
+                    "properties": {
+                        "file_id": {
+                            "type": "string"
+                        },
+                        "is_empty": {
+                            "type": "boolean"
+                        },
+                        "quip_thread_id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "file_id",
+                        "quip_thread_id"
+                    ]
+                },
+                "use_case": {
+                    "type": "string"
+                }
+            }
+        },
+        "previous_names": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "num_members": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "is_im",
+        "created",
+        "is_archived",
+        "is_org_shared",
+        "context_team_id",
+        "updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/history.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/history.json
new file mode 100644
index 0000000000..83e7c110a3
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/history.json
@@ -0,0 +1,96 @@
+{
+    "type": "object",
+    "properties": {
+        "user": {
+            "type": "string"
+        },
+        "text": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "ts": {
+            "type": "string"
+        },
+        "thread_ts": {
+            "type": "string"
+        },
+        "reply_count": {
+            "type": "integer"
+        },
+        "reply_users_count": {
+            "type": "integer"
+        },
+        "latest_reply": {
+            "type": "string"
+        },
+        "reply_users": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_locked": {
+            "type": "boolean"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "blocks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "block_id": {
+                        "type": "string"
+                    },
+                    "elements": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "elements": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "type": {
+                                                "type": "string"
+                                            },
+                                            "text": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "type"
+                                        ]
+                                    }
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "type",
+                    "block_id"
+                ]
+            }
+        },
+        "client_msg_id": {
+            "type": "string"
+        },
+        "team": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/invite.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/invite.json
new file mode 100644
index 0000000000..422fc8c4c5
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/invite.json
@@ -0,0 +1,121 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "is_channel": {
+            "type": "boolean"
+        },
+        "is_group": {
+            "type": "boolean"
+        },
+        "is_im": {
+            "type": "boolean"
+        },
+        "is_mpim": {
+            "type": "boolean"
+        },
+        "is_private": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "is_archived": {
+            "type": "boolean"
+        },
+        "is_general": {
+            "type": "boolean"
+        },
+        "unlinked": {
+            "type": "integer"
+        },
+        "name_normalized": {
+            "type": "string"
+        },
+        "is_shared": {
+            "type": "boolean"
+        },
+        "is_org_shared": {
+            "type": "boolean"
+        },
+        "is_pending_ext_shared": {
+            "type": "boolean"
+        },
+        "context_team_id": {
+            "type": "string"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "parent_conversation": {
+            "type": "null"
+        },
+        "creator": {
+            "type": "string"
+        },
+        "is_ext_shared": {
+            "type": "boolean"
+        },
+        "shared_team_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_member": {
+            "type": "boolean"
+        },
+        "last_read": {
+            "type": "string"
+        },
+        "topic": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "purpose": {
+            "type": "object",
+            "properties": {
+                "value": {
+                    "type": "string"
+                },
+                "creator": {
+                    "type": "string"
+                },
+                "last_set": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "value",
+                "creator",
+                "last_set"
+            ]
+        },
+        "previous_names": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/member.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/member.json
new file mode 100644
index 0000000000..5a8028518b
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/member.json
@@ -0,0 +1,192 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "color": {
+            "type": "string"
+        },
+        "real_name": {
+            "type": "string"
+        },
+        "tz": {
+            "type": "string"
+        },
+        "tz_label": {
+            "type": "string"
+        },
+        "tz_offset": {
+            "type": "integer"
+        },
+        "profile": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                },
+                "skype": {
+                    "type": "string"
+                },
+                "real_name": {
+                    "type": "string"
+                },
+                "real_name_normalized": {
+                    "type": "string"
+                },
+                "display_name": {
+                    "type": "string"
+                },
+                "display_name_normalized": {
+                    "type": "string"
+                },
+                "fields": {
+                    "type": "null"
+                },
+                "status_text": {
+                    "type": "string"
+                },
+                "status_emoji": {
+                    "type": "string"
+                },
+                "status_emoji_display_info": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "emoji_name": {
+                                "type": "string"
+                            },
+                            "display_url": {
+                                "type": "string"
+                            },
+                            "unicode": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "emoji_name",
+                            "display_url",
+                            "unicode"
+                        ]
+                    }
+                },
+                "status_expiration": {
+                    "type": "integer"
+                },
+                "avatar_hash": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "image_24": {
+                    "type": "string"
+                },
+                "image_32": {
+                    "type": "string"
+                },
+                "image_48": {
+                    "type": "string"
+                },
+                "image_72": {
+                    "type": "string"
+                },
+                "image_192": {
+                    "type": "string"
+                },
+                "image_512": {
+                    "type": "string"
+                },
+                "status_text_canonical": {
+                    "type": "string"
+                },
+                "team": {
+                    "type": "string"
+                },
+                "api_app_id": {
+                    "type": "string"
+                },
+                "always_active": {
+                    "type": "boolean"
+                },
+                "bot_id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "title",
+                "phone",
+                "skype",
+                "real_name",
+                "real_name_normalized",
+                "display_name",
+                "display_name_normalized",
+                "fields",
+                "status_text",
+                "status_emoji",
+                "status_emoji_display_info",
+                "status_expiration",
+                "avatar_hash",
+                "first_name",
+                "last_name",
+                "image_24",
+                "image_32",
+                "image_48",
+                "image_72",
+                "image_192",
+                "image_512",
+                "status_text_canonical",
+                "team"
+            ]
+        },
+        "is_admin": {
+            "type": "boolean"
+        },
+        "is_owner": {
+            "type": "boolean"
+        },
+        "is_primary_owner": {
+            "type": "boolean"
+        },
+        "is_restricted": {
+            "type": "boolean"
+        },
+        "is_ultra_restricted": {
+            "type": "boolean"
+        },
+        "is_bot": {
+            "type": "boolean"
+        },
+        "is_app_user": {
+            "type": "boolean"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "is_email_confirmed": {
+            "type": "boolean"
+        },
+        "who_can_share_contact_card": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/replies.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/replies.json
new file mode 100644
index 0000000000..5d99a2d273
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/channel/replies.json
@@ -0,0 +1,75 @@
+{
+    "type": "object",
+    "properties": {
+        "text": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "ts": {
+            "type": "string"
+        },
+        "thread_ts": {
+            "type": "string"
+        },
+        "blocks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "block_id": {
+                        "type": "string"
+                    },
+                    "elements": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "elements": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "type": {
+                                                "type": "string"
+                                            },
+                                            "text": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "type"
+                                        ]
+                                    }
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "type",
+                    "block_id"
+                ]
+            }
+        },
+        "user": {
+            "type": "string"
+        },
+        "client_msg_id": {
+            "type": "string"
+        },
+        "team": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/get.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/get.json
new file mode 100644
index 0000000000..c0cac728fa
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/get.json
@@ -0,0 +1,110 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "timestamp": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "mimetype": {
+            "type": "string"
+        },
+        "filetype": {
+            "type": "string"
+        },
+        "pretty_type": {
+            "type": "string"
+        },
+        "user": {
+            "type": "string"
+        },
+        "user_team": {
+            "type": "string"
+        },
+        "editable": {
+            "type": "boolean"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "mode": {
+            "type": "string"
+        },
+        "is_external": {
+            "type": "boolean"
+        },
+        "external_type": {
+            "type": "string"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "public_url_shared": {
+            "type": "boolean"
+        },
+        "display_as_bot": {
+            "type": "boolean"
+        },
+        "username": {
+            "type": "string"
+        },
+        "url_private": {
+            "type": "string"
+        },
+        "url_private_download": {
+            "type": "string"
+        },
+        "media_display_type": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "permalink_public": {
+            "type": "string"
+        },
+        "is_starred": {
+            "type": "boolean"
+        },
+        "channels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "groups": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "ims": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "has_more_shares": {
+            "type": "boolean"
+        },
+        "has_rich_preview": {
+            "type": "boolean"
+        },
+        "file_access": {
+            "type": "string"
+        },
+        "comments_count": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/getAll.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/getAll.json
new file mode 100644
index 0000000000..223b570b6c
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/getAll.json
@@ -0,0 +1,117 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "timestamp": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "mimetype": {
+            "type": "string"
+        },
+        "filetype": {
+            "type": "string"
+        },
+        "pretty_type": {
+            "type": "string"
+        },
+        "user": {
+            "type": "string"
+        },
+        "user_team": {
+            "type": "string"
+        },
+        "editable": {
+            "type": "boolean"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "mode": {
+            "type": "string"
+        },
+        "is_external": {
+            "type": "boolean"
+        },
+        "external_type": {
+            "type": "string"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "public_url_shared": {
+            "type": "boolean"
+        },
+        "display_as_bot": {
+            "type": "boolean"
+        },
+        "username": {
+            "type": "string"
+        },
+        "url_private": {
+            "type": "string"
+        },
+        "url_private_download": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "channels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "ims": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "comments_count": {
+            "type": "integer"
+        },
+        "media_display_type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "created",
+        "timestamp",
+        "name",
+        "title",
+        "mimetype",
+        "filetype",
+        "pretty_type",
+        "user",
+        "user_team",
+        "editable",
+        "size",
+        "mode",
+        "is_external",
+        "external_type",
+        "is_public",
+        "public_url_shared",
+        "display_as_bot",
+        "username",
+        "url_private",
+        "url_private_download",
+        "permalink",
+        "channels",
+        "groups",
+        "ims",
+        "comments_count"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/upload.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/upload.json
new file mode 100644
index 0000000000..f7d310271d
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/file/upload.json
@@ -0,0 +1,92 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "timestamp": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "mimetype": {
+            "type": "string"
+        },
+        "filetype": {
+            "type": "string"
+        },
+        "pretty_type": {
+            "type": "string"
+        },
+        "user": {
+            "type": "string"
+        },
+        "user_team": {
+            "type": "string"
+        },
+        "editable": {
+            "type": "boolean"
+        },
+        "size": {
+            "type": "integer"
+        },
+        "mode": {
+            "type": "string"
+        },
+        "is_external": {
+            "type": "boolean"
+        },
+        "external_type": {
+            "type": "string"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "public_url_shared": {
+            "type": "boolean"
+        },
+        "display_as_bot": {
+            "type": "boolean"
+        },
+        "username": {
+            "type": "string"
+        },
+        "url_private": {
+            "type": "string"
+        },
+        "url_private_download": {
+            "type": "string"
+        },
+        "media_display_type": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "permalink_public": {
+            "type": "string"
+        },
+        "comments_count": {
+            "type": "integer"
+        },
+        "is_starred": {
+            "type": "boolean"
+        },
+        "has_more_shares": {
+            "type": "boolean"
+        },
+        "has_rich_preview": {
+            "type": "boolean"
+        },
+        "file_access": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/delete.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/delete.json
new file mode 100644
index 0000000000..64f167c461
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/delete.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "channel": {
+            "type": "string"
+        },
+        "message_timestamp": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/post.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/post.json
new file mode 100644
index 0000000000..75deef4096
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/post.json
@@ -0,0 +1,164 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "channel": {
+            "type": "string"
+        },
+        "message": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "ts": {
+                    "type": "string"
+                },
+                "bot_id": {
+                    "type": "string"
+                },
+                "app_id": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                },
+                "team": {
+                    "type": "string"
+                },
+                "bot_profile": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "app_id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "icons": {
+                            "type": "object",
+                            "properties": {
+                                "image_36": {
+                                    "type": "string"
+                                },
+                                "image_48": {
+                                    "type": "string"
+                                },
+                                "image_72": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "image_36",
+                                "image_48",
+                                "image_72"
+                            ]
+                        },
+                        "deleted": {
+                            "type": "boolean"
+                        },
+                        "updated": {
+                            "type": "integer"
+                        },
+                        "team_id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "app_id",
+                        "name",
+                        "icons",
+                        "deleted",
+                        "updated",
+                        "team_id"
+                    ]
+                },
+                "blocks": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "block_id": {
+                                "type": "string"
+                            },
+                            "elements": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "elements": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "type": {
+                                                        "type": "string"
+                                                    },
+                                                    "text": {
+                                                        "type": "string"
+                                                    },
+                                                    "url": {
+                                                        "type": "string"
+                                                    },
+                                                    "style": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "italic": {
+                                                                "type": "boolean"
+                                                            }
+                                                        }
+                                                    }
+                                                },
+                                                "required": [
+                                                    "type"
+                                                ]
+                                            }
+                                        }
+                                    },
+                                    "required": [
+                                        "type"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "block_id"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "type",
+                "ts",
+                "bot_id",
+                "app_id",
+                "text"
+            ]
+        },
+        "message_timestamp": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "ok",
+        "channel",
+        "message",
+        "message_timestamp"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/search.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/search.json
new file mode 100644
index 0000000000..399acb33a7
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/search.json
@@ -0,0 +1,152 @@
+{
+    "type": "object",
+    "properties": {
+        "iid": {
+            "type": "string"
+        },
+        "team": {
+            "type": "string"
+        },
+        "score": {
+            "type": "integer"
+        },
+        "channel": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "is_channel": {
+                    "type": "boolean"
+                },
+                "is_group": {
+                    "type": "boolean"
+                },
+                "is_im": {
+                    "type": "boolean"
+                },
+                "is_mpim": {
+                    "type": "boolean"
+                },
+                "is_shared": {
+                    "type": "boolean"
+                },
+                "is_org_shared": {
+                    "type": "boolean"
+                },
+                "is_ext_shared": {
+                    "type": "boolean"
+                },
+                "is_private": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "is_pending_ext_shared": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "id",
+                "is_channel",
+                "is_group",
+                "is_im",
+                "is_mpim",
+                "is_shared",
+                "is_org_shared",
+                "is_ext_shared",
+                "is_private",
+                "name"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "username": {
+            "type": "string"
+        },
+        "ts": {
+            "type": "string"
+        },
+        "blocks": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "block_id": {
+                        "type": "string"
+                    },
+                    "elements": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "elements": {
+                                    "type": "array",
+                                    "items": {
+                                        "type": "object",
+                                        "properties": {
+                                            "type": {
+                                                "type": "string"
+                                            },
+                                            "user_id": {
+                                                "type": "string"
+                                            },
+                                            "text": {
+                                                "type": "string"
+                                            },
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "unicode": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "type"
+                                        ]
+                                    }
+                                }
+                            },
+                            "required": [
+                                "type"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "type",
+                    "block_id"
+                ]
+            }
+        },
+        "text": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "no_reactions": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "iid",
+        "team",
+        "score",
+        "channel",
+        "type",
+        "user",
+        "username",
+        "ts",
+        "text",
+        "permalink"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/sendAndWait.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/sendAndWait.json
new file mode 100644
index 0000000000..ef2c004121
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/sendAndWait.json
@@ -0,0 +1,13 @@
+{
+    "type": "object",
+    "properties": {
+        "data": {
+            "type": "object",
+            "properties": {
+                "approved": {
+                    "type": "boolean"
+                }
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/update.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/update.json
new file mode 100644
index 0000000000..d618658dac
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/message/update.json
@@ -0,0 +1,189 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "channel": {
+            "type": "string"
+        },
+        "text": {
+            "type": "string"
+        },
+        "message": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "edited": {
+                    "type": "object",
+                    "properties": {
+                        "user": {
+                            "type": "string"
+                        },
+                        "ts": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "user",
+                        "ts"
+                    ]
+                },
+                "bot_id": {
+                    "type": "string"
+                },
+                "app_id": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                },
+                "team": {
+                    "type": "string"
+                },
+                "bot_profile": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "app_id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "icons": {
+                            "type": "object",
+                            "properties": {
+                                "image_36": {
+                                    "type": "string"
+                                },
+                                "image_48": {
+                                    "type": "string"
+                                },
+                                "image_72": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "image_36",
+                                "image_48",
+                                "image_72"
+                            ]
+                        },
+                        "deleted": {
+                            "type": "boolean"
+                        },
+                        "updated": {
+                            "type": "integer"
+                        },
+                        "team_id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "app_id",
+                        "name",
+                        "icons",
+                        "deleted",
+                        "updated",
+                        "team_id"
+                    ]
+                },
+                "blocks": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "block_id": {
+                                "type": "string"
+                            },
+                            "elements": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "elements": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "type": {
+                                                        "type": "string"
+                                                    },
+                                                    "text": {
+                                                        "type": "string"
+                                                    },
+                                                    "style": {
+                                                        "type": "object",
+                                                        "properties": {
+                                                            "italic": {
+                                                                "type": "boolean"
+                                                            },
+                                                            "bold": {
+                                                                "type": "boolean"
+                                                            }
+                                                        },
+                                                        "required": [
+                                                            "italic"
+                                                        ]
+                                                    },
+                                                    "url": {
+                                                        "type": "string"
+                                                    },
+                                                    "name": {
+                                                        "type": "string"
+                                                    },
+                                                    "unicode": {
+                                                        "type": "string"
+                                                    },
+                                                    "user_id": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "type"
+                                                ]
+                                            }
+                                        }
+                                    },
+                                    "required": [
+                                        "type"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "block_id"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "user",
+                "type",
+                "edited",
+                "text",
+                "team",
+                "blocks"
+            ]
+        },
+        "message_timestamp": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/reaction/add.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/reaction/add.json
new file mode 100644
index 0000000000..8c80c7e5a4
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/reaction/add.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/reaction/get.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/reaction/get.json
new file mode 100644
index 0000000000..fee8b88ece
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/reaction/get.json
@@ -0,0 +1,164 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "string"
+        },
+        "message": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "ts": {
+                    "type": "string"
+                },
+                "client_msg_id": {
+                    "type": "string"
+                },
+                "text": {
+                    "type": "string"
+                },
+                "team": {
+                    "type": "string"
+                },
+                "thread_ts": {
+                    "type": "string"
+                },
+                "blocks": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "block_id": {
+                                "type": "string"
+                            },
+                            "elements": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object",
+                                    "properties": {
+                                        "type": {
+                                            "type": "string"
+                                        },
+                                        "elements": {
+                                            "type": "array",
+                                            "items": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "type": {
+                                                        "type": "string"
+                                                    },
+                                                    "user_id": {
+                                                        "type": "string"
+                                                    },
+                                                    "text": {
+                                                        "type": "string"
+                                                    },
+                                                    "elements": {
+                                                        "type": "array",
+                                                        "items": {
+                                                            "type": "object",
+                                                            "properties": {
+                                                                "type": {
+                                                                    "type": "string"
+                                                                },
+                                                                "text": {
+                                                                    "type": "string"
+                                                                },
+                                                                "style": {
+                                                                    "type": "object",
+                                                                    "properties": {
+                                                                        "bold": {
+                                                                            "type": "boolean"
+                                                                        }
+                                                                    },
+                                                                    "required": [
+                                                                        "bold"
+                                                                    ]
+                                                                }
+                                                            },
+                                                            "required": [
+                                                                "type"
+                                                            ]
+                                                        }
+                                                    },
+                                                    "url": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "type"
+                                                ]
+                                            }
+                                        }
+                                    },
+                                    "required": [
+                                        "type"
+                                    ]
+                                }
+                            }
+                        },
+                        "required": [
+                            "type",
+                            "block_id"
+                        ]
+                    }
+                },
+                "reactions": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "users": {
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
+                            },
+                            "count": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "users",
+                            "count"
+                        ]
+                    }
+                },
+                "permalink": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type",
+                "ts",
+                "text",
+                "blocks",
+                "reactions"
+            ]
+        },
+        "channel": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "ok",
+        "type",
+        "message",
+        "channel"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/getAll.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/getAll.json
new file mode 100644
index 0000000000..0dcd084839
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/getAll.json
@@ -0,0 +1,209 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "color": {
+            "type": "string"
+        },
+        "real_name": {
+            "type": "string"
+        },
+        "tz": {
+            "type": "string"
+        },
+        "tz_label": {
+            "type": "string"
+        },
+        "tz_offset": {
+            "type": "integer"
+        },
+        "profile": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                },
+                "skype": {
+                    "type": "string"
+                },
+                "real_name": {
+                    "type": "string"
+                },
+                "real_name_normalized": {
+                    "type": "string"
+                },
+                "display_name": {
+                    "type": "string"
+                },
+                "display_name_normalized": {
+                    "type": "string"
+                },
+                "status_text": {
+                    "type": "string"
+                },
+                "status_emoji": {
+                    "type": "string"
+                },
+                "status_emoji_display_info": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "emoji_name": {
+                                "type": "string"
+                            },
+                            "display_url": {
+                                "type": "string"
+                            },
+                            "unicode": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "emoji_name",
+                            "display_url",
+                            "unicode"
+                        ]
+                    }
+                },
+                "status_expiration": {
+                    "type": "integer"
+                },
+                "avatar_hash": {
+                    "type": "string"
+                },
+                "always_active": {
+                    "type": "boolean"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "image_24": {
+                    "type": "string"
+                },
+                "image_32": {
+                    "type": "string"
+                },
+                "image_48": {
+                    "type": "string"
+                },
+                "image_72": {
+                    "type": "string"
+                },
+                "image_192": {
+                    "type": "string"
+                },
+                "image_512": {
+                    "type": "string"
+                },
+                "status_text_canonical": {
+                    "type": "string"
+                },
+                "team": {
+                    "type": "string"
+                },
+                "image_original": {
+                    "type": "string"
+                },
+                "is_custom_image": {
+                    "type": "boolean"
+                },
+                "huddle_state": {
+                    "type": "string"
+                },
+                "huddle_state_expiration_ts": {
+                    "type": "integer"
+                },
+                "image_1024": {
+                    "type": "string"
+                },
+                "api_app_id": {
+                    "type": "string"
+                },
+                "bot_id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "title",
+                "phone",
+                "skype",
+                "real_name",
+                "real_name_normalized",
+                "display_name",
+                "display_name_normalized",
+                "fields",
+                "status_text",
+                "status_emoji",
+                "status_emoji_display_info",
+                "status_expiration",
+                "avatar_hash",
+                "image_24",
+                "image_32",
+                "image_48",
+                "image_72",
+                "image_192",
+                "image_512",
+                "status_text_canonical",
+                "team"
+            ]
+        },
+        "is_admin": {
+            "type": "boolean"
+        },
+        "is_owner": {
+            "type": "boolean"
+        },
+        "is_primary_owner": {
+            "type": "boolean"
+        },
+        "is_restricted": {
+            "type": "boolean"
+        },
+        "is_ultra_restricted": {
+            "type": "boolean"
+        },
+        "is_bot": {
+            "type": "boolean"
+        },
+        "is_app_user": {
+            "type": "boolean"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "is_email_confirmed": {
+            "type": "boolean"
+        },
+        "who_can_share_contact_card": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "team_id",
+        "name",
+        "deleted",
+        "profile",
+        "is_bot",
+        "is_app_user",
+        "updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/getProfile.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/getProfile.json
new file mode 100644
index 0000000000..8e853ddd0e
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/getProfile.json
@@ -0,0 +1,126 @@
+{
+    "type": "object",
+    "properties": {
+        "title": {
+            "type": "string"
+        },
+        "phone": {
+            "type": "string"
+        },
+        "skype": {
+            "type": "string"
+        },
+        "real_name": {
+            "type": "string"
+        },
+        "real_name_normalized": {
+            "type": "string"
+        },
+        "display_name": {
+            "type": "string"
+        },
+        "display_name_normalized": {
+            "type": "string"
+        },
+        "status_text": {
+            "type": "string"
+        },
+        "status_emoji": {
+            "type": "string"
+        },
+        "status_emoji_display_info": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "emoji_name": {
+                        "type": "string"
+                    },
+                    "display_url": {
+                        "type": "string"
+                    },
+                    "unicode": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "emoji_name",
+                    "display_url"
+                ]
+            }
+        },
+        "status_expiration": {
+            "type": "integer"
+        },
+        "avatar_hash": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "last_name": {
+            "type": "string"
+        },
+        "image_24": {
+            "type": "string"
+        },
+        "image_32": {
+            "type": "string"
+        },
+        "image_48": {
+            "type": "string"
+        },
+        "image_72": {
+            "type": "string"
+        },
+        "image_192": {
+            "type": "string"
+        },
+        "image_512": {
+            "type": "string"
+        },
+        "status_text_canonical": {
+            "type": "string"
+        },
+        "image_original": {
+            "type": "string"
+        },
+        "is_custom_image": {
+            "type": "boolean"
+        },
+        "image_1024": {
+            "type": "string"
+        },
+        "huddle_state": {
+            "type": "string"
+        },
+        "huddle_state_expiration_ts": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "title",
+        "phone",
+        "skype",
+        "real_name",
+        "real_name_normalized",
+        "display_name",
+        "display_name_normalized",
+        "fields",
+        "status_text",
+        "status_emoji",
+        "status_emoji_display_info",
+        "status_expiration",
+        "avatar_hash",
+        "image_24",
+        "image_32",
+        "image_48",
+        "image_72",
+        "image_192",
+        "image_512",
+        "status_text_canonical"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/info.json b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/info.json
new file mode 100644
index 0000000000..b3b5ae12e9
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/__schema__/v2.3.0/user/info.json
@@ -0,0 +1,208 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "team_id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "deleted": {
+            "type": "boolean"
+        },
+        "color": {
+            "type": "string"
+        },
+        "real_name": {
+            "type": "string"
+        },
+        "tz": {
+            "type": "string"
+        },
+        "tz_label": {
+            "type": "string"
+        },
+        "tz_offset": {
+            "type": "integer"
+        },
+        "profile": {
+            "type": "object",
+            "properties": {
+                "title": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                },
+                "skype": {
+                    "type": "string"
+                },
+                "real_name": {
+                    "type": "string"
+                },
+                "real_name_normalized": {
+                    "type": "string"
+                },
+                "display_name": {
+                    "type": "string"
+                },
+                "display_name_normalized": {
+                    "type": "string"
+                },
+                "fields": {
+                    "type": "null"
+                },
+                "status_text": {
+                    "type": "string"
+                },
+                "status_emoji": {
+                    "type": "string"
+                },
+                "status_emoji_display_info": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "emoji_name": {
+                                "type": "string"
+                            },
+                            "display_url": {
+                                "type": "string"
+                            },
+                            "unicode": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "emoji_name",
+                            "display_url",
+                            "unicode"
+                        ]
+                    }
+                },
+                "status_expiration": {
+                    "type": "integer"
+                },
+                "avatar_hash": {
+                    "type": "string"
+                },
+                "image_original": {
+                    "type": "string"
+                },
+                "is_custom_image": {
+                    "type": "boolean"
+                },
+                "huddle_state": {
+                    "type": "string"
+                },
+                "huddle_state_expiration_ts": {
+                    "type": "integer"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "image_24": {
+                    "type": "string"
+                },
+                "image_32": {
+                    "type": "string"
+                },
+                "image_48": {
+                    "type": "string"
+                },
+                "image_72": {
+                    "type": "string"
+                },
+                "image_192": {
+                    "type": "string"
+                },
+                "image_512": {
+                    "type": "string"
+                },
+                "image_1024": {
+                    "type": "string"
+                },
+                "status_text_canonical": {
+                    "type": "string"
+                },
+                "team": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "title",
+                "phone",
+                "skype",
+                "real_name",
+                "real_name_normalized",
+                "display_name",
+                "display_name_normalized",
+                "fields",
+                "status_text",
+                "status_emoji",
+                "status_emoji_display_info",
+                "status_expiration",
+                "avatar_hash",
+                "first_name",
+                "last_name",
+                "image_24",
+                "image_32",
+                "image_48",
+                "image_72",
+                "image_192",
+                "image_512",
+                "status_text_canonical",
+                "team"
+            ]
+        },
+        "is_admin": {
+            "type": "boolean"
+        },
+        "is_owner": {
+            "type": "boolean"
+        },
+        "is_primary_owner": {
+            "type": "boolean"
+        },
+        "is_restricted": {
+            "type": "boolean"
+        },
+        "is_ultra_restricted": {
+            "type": "boolean"
+        },
+        "is_bot": {
+            "type": "boolean"
+        },
+        "is_app_user": {
+            "type": "boolean"
+        },
+        "updated": {
+            "type": "integer"
+        },
+        "is_email_confirmed": {
+            "type": "boolean"
+        },
+        "has_2fa": {
+            "type": "boolean"
+        },
+        "who_can_share_contact_card": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "team_id",
+        "name",
+        "deleted",
+        "profile",
+        "is_bot",
+        "is_app_user",
+        "updated"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
index f3eefc4bfa..8ad2fee93d 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods } from 'n8n-workflow';
-import nock from 'nock';
 
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -22,16 +21,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, channel => append', () => {
 	const workflows = ['nodes/Slack/test/v2/node/channel/archive.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
index 81f23e284f..239c5d611a 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -64,16 +63,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, channel => create', () => {
 	const workflows = ['nodes/Slack/test/v2/node/channel/create.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
index 9e53394c33..87759f2e44 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -63,16 +62,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, channel => get', () => {
 	const workflows = ['nodes/Slack/test/v2/node/channel/get.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
index 4b816693ba..5d93684dca 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -126,16 +125,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, channel => getAll', () => {
 	const workflows = ['nodes/Slack/test/v2/node/channel/getAll.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
index 99878cb691..9d371ecb34 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -182,16 +181,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, channel => history', () => {
 	const workflows = ['nodes/Slack/test/v2/node/channel/history.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
index 154b137bfc..6ad731e710 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -26,16 +25,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, file => upload', () => {
 	const workflows = ['nodes/Slack/test/v2/node/file/upload.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
index c18f17ba54..1e75a1ae9c 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -27,16 +26,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, message => delete', () => {
 	const workflows = ['nodes/Slack/test/v2/node/message/delete.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
index 78735d0fc6..a16003cdc3 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -27,16 +26,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, message => getPermalink', () => {
 	const workflows = ['nodes/Slack/test/v2/node/message/getPermalink.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
index 2cfff4b6d0..e5f4216946 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -66,16 +65,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, message => post', () => {
 	const workflows = ['nodes/Slack/test/v2/node/message/post.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
index 03179ebede..a8d0426e57 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -219,16 +218,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, message => search', () => {
 	const workflows = ['nodes/Slack/test/v2/node/message/search.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
index acf00fbd95..c6484c4e5c 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
@@ -1,5 +1,4 @@
 import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -70,16 +69,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, message => update', () => {
 	const workflows = ['nodes/Slack/test/v2/node/message/update.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
index 62577de3b9..19820cedb6 100644
--- a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
@@ -1,5 +1,4 @@
 import type { INodeTypes, WorkflowTestData } from 'n8n-workflow';
-import nock from 'nock';
 
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 
@@ -21,16 +20,6 @@ jest.mock('../../../../V2/GenericFunctions', () => {
 describe('Test SlackV2, user => updateProfile', () => {
 	const workflows = ['nodes/Slack/test/v2/node/user/updateProfile.workflow.json'];
 	const tests = workflowToTests(workflows);
-
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../../../../V2/GenericFunctions');
-	});
-
 	const nodeTypes = setup(tests);
 
 	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
index a59f1ea217..a98e4ccdc6 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
@@ -21,6 +21,7 @@ export class Sms77 implements INodeType {
 		defaults: {
 			name: 'seven',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index 475d27fff0..84747c2fb6 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -23,6 +23,7 @@ export class Snowflake implements INodeType {
 		defaults: {
 			name: 'Snowflake',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		parameterPane: 'wide',
diff --git a/packages/nodes-base/nodes/Splunk/v2/SplunkV2.node.ts b/packages/nodes-base/nodes/Splunk/v2/SplunkV2.node.ts
index de80d113ea..8dad9d604b 100644
--- a/packages/nodes-base/nodes/Splunk/v2/SplunkV2.node.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/SplunkV2.node.ts
@@ -16,6 +16,7 @@ export class SplunkV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
index cb2ad23db5..4a2824697e 100644
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts
+++ b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
@@ -24,6 +24,7 @@ export class Spontit implements INodeType {
 		defaults: {
 			name: 'Spontit',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 7210a70e17..3fe3bcf948 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IHookFunctions,
 	JsonObject,
 	IHttpRequestMethods,
-	IRequestOptions,
+	IHttpRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -21,7 +21,7 @@ export async function spotifyApiRequest(
 	query?: IDataObject,
 	uri?: string,
 ): Promise<any> {
-	const options: IRequestOptions = {
+	const options: IHttpRequestOptions = {
 		method,
 		headers: {
 			'User-Agent': 'n8n',
@@ -29,7 +29,7 @@ export async function spotifyApiRequest(
 			Accept: ' application/json',
 		},
 		qs: query,
-		uri: uri || `https://api.spotify.com/v1${endpoint}`,
+		url: uri ?? `https://api.spotify.com/v1${endpoint}`,
 		json: true,
 	};
 
@@ -37,7 +37,7 @@ export async function spotifyApiRequest(
 		options.body = body;
 	}
 	try {
-		return await this.helpers.requestOAuth2.call(this, 'spotifyOAuth2Api', options);
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'spotifyOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index b9c792a564..8f0d0f055b 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -24,6 +24,7 @@ export class Spotify implements INodeType {
 		defaults: {
 			name: 'Spotify',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -1308,6 +1309,10 @@ export class Spotify implements INodeType {
 					);
 				}
 
+				// Remove null values from the response
+				if (operation === 'getUserPlaylists') {
+					responseData = responseData.filter((item: IDataObject) => item !== null);
+				}
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/album/search.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/album/search.json
new file mode 100644
index 0000000000..f4c3db2258
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/album/search.json
@@ -0,0 +1,127 @@
+{
+	"type": "object",
+	"properties": {
+		"album_type": {
+			"type": "string"
+		},
+		"total_tracks": {
+			"type": "integer"
+		},
+		"available_markets": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"external_urls": {
+			"type": "object",
+			"properties": {
+				"spotify": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"spotify"
+			]
+		},
+		"href": {
+			"type": "string"
+		},
+		"id": {
+			"type": "string"
+		},
+		"images": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"height": {
+						"type": "integer"
+					},
+					"url": {
+						"type": "string"
+					},
+					"width": {
+						"type": "integer"
+					}
+				},
+				"required": [
+					"height",
+					"url",
+					"width"
+				]
+			}
+		},
+		"name": {
+			"type": "string"
+		},
+		"release_date": {
+			"type": "string"
+		},
+		"release_date_precision": {
+			"type": "string"
+		},
+		"type": {
+			"type": "string"
+		},
+		"uri": {
+			"type": "string"
+		},
+		"artists": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"external_urls": {
+						"type": "object",
+						"properties": {
+							"spotify": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"spotify"
+						]
+					},
+					"href": {
+						"type": "string"
+					},
+					"id": {
+						"type": "string"
+					},
+					"name": {
+						"type": "string"
+					},
+					"type": {
+						"type": "string"
+					},
+					"uri": {
+						"type": "string"
+					}
+				},
+				"required": [
+					"external_urls",
+					"href",
+					"id",
+					"name",
+					"type",
+					"uri"
+				]
+			}
+		}
+	},
+	"required": [
+		"album_type",
+		"total_tracks",
+		"external_urls",
+		"href",
+		"id",
+		"images",
+		"name",
+		"release_date",
+		"release_date_precision",
+		"type",
+		"uri",
+		"artists"
+	]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/get.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/get.json
new file mode 100644
index 0000000000..78b629ca85
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/get.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "followers": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "null"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "genres": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "width": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "url",
+                    "height",
+                    "width"
+                ]
+            }
+        },
+        "name": {
+            "type": "string"
+        },
+        "popularity": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "external_urls",
+        "followers",
+        "genres",
+        "href",
+        "id",
+        "images",
+        "name",
+        "popularity",
+        "type",
+        "uri"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/getTopTracks.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/getTopTracks.json
new file mode 100644
index 0000000000..20fc675d35
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/getTopTracks.json
@@ -0,0 +1,263 @@
+{
+	"type": "object",
+	"properties": {
+		"album": {
+			"type": "object",
+			"properties": {
+				"album_type": {
+					"type": "string"
+				},
+				"artists": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"external_urls": {
+								"type": "object",
+								"properties": {
+									"spotify": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"spotify"
+								]
+							},
+							"href": {
+								"type": "string"
+							},
+							"id": {
+								"type": "string"
+							},
+							"name": {
+								"type": "string"
+							},
+							"type": {
+								"type": "string"
+							},
+							"uri": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"external_urls",
+							"href",
+							"id",
+							"name",
+							"type",
+							"uri"
+						]
+					}
+				},
+				"available_markets": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				"external_urls": {
+					"type": "object",
+					"properties": {
+						"spotify": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"spotify"
+					]
+				},
+				"href": {
+					"type": "string"
+				},
+				"id": {
+					"type": "string"
+				},
+				"images": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"url": {
+								"type": "string"
+							},
+							"height": {
+								"type": "integer"
+							},
+							"width": {
+								"type": "integer"
+							}
+						},
+						"required": [
+							"url",
+							"height",
+							"width"
+						]
+					}
+				},
+				"is_playable": {
+					"type": "boolean"
+				},
+				"name": {
+					"type": "string"
+				},
+				"release_date": {
+					"type": "string"
+				},
+				"release_date_precision": {
+					"type": "string"
+				},
+				"total_tracks": {
+					"type": "integer"
+				},
+				"type": {
+					"type": "string"
+				},
+				"uri": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"album_type",
+				"artists",
+				"available_markets",
+				"external_urls",
+				"href",
+				"id",
+				"images",
+				"is_playable",
+				"name",
+				"release_date",
+				"release_date_precision",
+				"total_tracks",
+				"type",
+				"uri"
+			]
+		},
+		"artists": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"external_urls": {
+						"type": "object",
+						"properties": {
+							"spotify": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"spotify"
+						]
+					},
+					"href": {
+						"type": "string"
+					},
+					"id": {
+						"type": "string"
+					},
+					"name": {
+						"type": "string"
+					},
+					"type": {
+						"type": "string"
+					},
+					"uri": {
+						"type": "string"
+					}
+				},
+				"required": [
+					"external_urls",
+					"href",
+					"id",
+					"name",
+					"type",
+					"uri"
+				]
+			}
+		},
+		"available_markets": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"disc_number": {
+			"type": "integer"
+		},
+		"duration_ms": {
+			"type": "integer"
+		},
+		"explicit": {
+			"type": "boolean"
+		},
+		"external_ids": {
+			"type": "object",
+			"properties": {
+				"isrc": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"isrc"
+			]
+		},
+		"external_urls": {
+			"type": "object",
+			"properties": {
+				"spotify": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"spotify"
+			]
+		},
+		"href": {
+			"type": "string"
+		},
+		"id": {
+			"type": "string"
+		},
+		"is_local": {
+			"type": "boolean"
+		},
+		"is_playable": {
+			"type": "boolean"
+		},
+		"name": {
+			"type": "string"
+		},
+		"popularity": {
+			"type": "integer"
+		},
+		"track_number": {
+			"type": "integer"
+		},
+		"type": {
+			"type": "string"
+		},
+		"uri": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"album",
+		"artists",
+		"available_markets",
+		"disc_number",
+		"duration_ms",
+		"explicit",
+		"external_ids",
+		"external_urls",
+		"href",
+		"id",
+		"is_local",
+		"is_playable",
+		"name",
+		"popularity",
+		"preview_url",
+		"track_number",
+		"type",
+		"uri"
+	]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/search.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/search.json
new file mode 100644
index 0000000000..78b629ca85
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/artist/search.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "followers": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "null"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "genres": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "width": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "url",
+                    "height",
+                    "width"
+                ]
+            }
+        },
+        "name": {
+            "type": "string"
+        },
+        "popularity": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "external_urls",
+        "followers",
+        "genres",
+        "href",
+        "id",
+        "images",
+        "name",
+        "popularity",
+        "type",
+        "uri"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/library/getLikedTracks.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/library/getLikedTracks.json
new file mode 100644
index 0000000000..d6094daa0a
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/library/getLikedTracks.json
@@ -0,0 +1,273 @@
+{
+    "type": "object",
+    "properties": {
+        "added_at": {
+            "type": "string"
+        },
+        "track": {
+            "type": "object",
+            "properties": {
+                "album": {
+                    "type": "object",
+                    "properties": {
+                        "album_type": {
+                            "type": "string"
+                        },
+                        "artists": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "external_urls": {
+                                        "type": "object",
+                                        "properties": {
+                                            "spotify": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "spotify"
+                                        ]
+                                    },
+                                    "href": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "uri": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "external_urls",
+                                    "href",
+                                    "id",
+                                    "name",
+                                    "type",
+                                    "uri"
+                                ]
+                            }
+                        },
+                        "available_markets": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "external_urls": {
+                            "type": "object",
+                            "properties": {
+                                "spotify": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "spotify"
+                            ]
+                        },
+                        "href": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "images": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "height": {
+                                        "type": "integer"
+                                    },
+                                    "width": {
+                                        "type": "integer"
+                                    },
+                                    "url": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "height",
+                                    "width",
+                                    "url"
+                                ]
+                            }
+                        },
+                        "is_playable": {
+                            "type": "boolean"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "release_date": {
+                            "type": "string"
+                        },
+                        "release_date_precision": {
+                            "type": "string"
+                        },
+                        "total_tracks": {
+                            "type": "integer"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "album_type",
+                        "artists",
+                        "available_markets",
+                        "external_urls",
+                        "href",
+                        "id",
+                        "images",
+                        "name",
+                        "release_date",
+                        "release_date_precision",
+                        "total_tracks",
+                        "type",
+                        "uri"
+                    ]
+                },
+                "artists": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "external_urls": {
+                                "type": "object",
+                                "properties": {
+                                    "spotify": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "spotify"
+                                ]
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "uri": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "external_urls",
+                            "href",
+                            "id",
+                            "name",
+                            "type",
+                            "uri"
+                        ]
+                    }
+                },
+                "available_markets": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "disc_number": {
+                    "type": "integer"
+                },
+                "duration_ms": {
+                    "type": "integer"
+                },
+                "explicit": {
+                    "type": "boolean"
+                },
+                "external_ids": {
+                    "type": "object",
+                    "properties": {
+                        "isrc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "isrc"
+                    ]
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "is_local": {
+                    "type": "boolean"
+                },
+                "is_playable": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "popularity": {
+                    "type": "integer"
+                },
+                "track_number": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "album",
+                "artists",
+                "available_markets",
+                "disc_number",
+                "duration_ms",
+                "explicit",
+                "external_ids",
+                "external_urls",
+                "href",
+                "id",
+                "is_local",
+                "name",
+                "popularity",
+                "preview_url",
+                "track_number",
+                "type",
+                "uri"
+            ]
+        }
+    },
+    "required": [
+        "added_at",
+        "track"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/myData/getFollowingArtists.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/myData/getFollowingArtists.json
new file mode 100644
index 0000000000..78b629ca85
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/myData/getFollowingArtists.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "followers": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "null"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "genres": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "width": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "url",
+                    "height",
+                    "width"
+                ]
+            }
+        },
+        "name": {
+            "type": "string"
+        },
+        "popularity": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "external_urls",
+        "followers",
+        "genres",
+        "href",
+        "id",
+        "images",
+        "name",
+        "popularity",
+        "type",
+        "uri"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/addSongToQueue.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/addSongToQueue.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/addSongToQueue.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/currentlyPlaying.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/currentlyPlaying.json
new file mode 100644
index 0000000000..3d2c20cb1c
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/currentlyPlaying.json
@@ -0,0 +1,294 @@
+{
+    "type": "object",
+    "properties": {
+        "timestamp": {
+            "type": "integer"
+        },
+        "context": {
+            "type": "object",
+            "properties": {
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "external_urls",
+                "href",
+                "type",
+                "uri"
+            ]
+        },
+        "progress_ms": {
+            "type": "integer"
+        },
+        "item": {
+            "type": "object",
+            "properties": {
+                "album": {
+                    "type": "object",
+                    "properties": {
+                        "artists": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "external_urls": {
+                                        "type": "object",
+                                        "properties": {
+                                            "spotify": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "spotify"
+                                        ]
+                                    },
+                                    "href": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "uri": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "external_urls",
+                                    "href",
+                                    "id",
+                                    "name",
+                                    "type",
+                                    "uri"
+                                ]
+                            }
+                        },
+                        "available_markets": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "external_urls": {
+                            "type": "object",
+                            "properties": {
+                                "spotify": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "spotify"
+                            ]
+                        },
+                        "images": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "height": {
+                                        "type": "integer"
+                                    },
+                                    "url": {
+                                        "type": "string"
+                                    },
+                                    "width": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "height",
+                                    "url",
+                                    "width"
+                                ]
+                            }
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "total_tracks": {
+                            "type": "integer"
+                        },
+                        "type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "album_type",
+                        "artists",
+                        "available_markets",
+                        "external_urls",
+                        "href",
+                        "id",
+                        "images",
+                        "name",
+                        "release_date",
+                        "release_date_precision",
+                        "type",
+                        "uri"
+                    ]
+                },
+                "artists": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "external_urls": {
+                                "type": "object",
+                                "properties": {
+                                    "spotify": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "spotify"
+                                ]
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "external_urls",
+                            "href",
+                            "id",
+                            "name",
+                            "type",
+                            "uri"
+                        ]
+                    }
+                },
+                "available_markets": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "disc_number": {
+                    "type": "integer"
+                },
+                "duration_ms": {
+                    "type": "integer"
+                },
+                "explicit": {
+                    "type": "boolean"
+                },
+                "external_ids": {
+                    "type": "object",
+                    "properties": {
+                        "isrc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "isrc"
+                    ]
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "is_local": {
+                    "type": "boolean"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "popularity": {
+                    "type": "integer"
+                },
+                "track_number": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "album",
+                "artists",
+                "available_markets",
+                "disc_number",
+                "duration_ms",
+                "explicit",
+                "external_ids",
+                "external_urls",
+                "href",
+                "id",
+                "is_local",
+                "name",
+                "popularity",
+                "preview_url",
+                "track_number",
+                "type",
+                "uri"
+            ]
+        },
+        "currently_playing_type": {
+            "type": "string"
+        },
+        "actions": {
+            "type": "object",
+            "properties": {
+                "disallows": {
+                    "type": "object",
+                    "properties": {
+                        "resuming": {
+                            "type": "boolean"
+                        }
+                    }
+                }
+            },
+            "required": [
+                "disallows"
+            ]
+        },
+        "is_playing": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "timestamp",
+        "context",
+        "progress_ms",
+        "item",
+        "currently_playing_type",
+        "actions",
+        "is_playing"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/nextSong.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/nextSong.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/nextSong.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/pause.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/pause.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/pause.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/recentlyPlayed.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/recentlyPlayed.json
new file mode 100644
index 0000000000..c426f08774
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/recentlyPlayed.json
@@ -0,0 +1,268 @@
+{
+	"type": "object",
+	"properties": {
+		"track": {
+			"type": "object",
+			"properties": {
+				"album": {
+					"type": "object",
+					"properties": {
+						"album_type": {
+							"type": "string"
+						},
+						"artists": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"external_urls": {
+										"type": "object",
+										"properties": {
+											"spotify": {
+												"type": "string"
+											}
+										},
+										"required": [
+											"spotify"
+										]
+									},
+									"href": {
+										"type": "string"
+									},
+									"id": {
+										"type": "string"
+									},
+									"name": {
+										"type": "string"
+									},
+									"type": {
+										"type": "string"
+									},
+									"uri": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"external_urls",
+									"href",
+									"id",
+									"name",
+									"type",
+									"uri"
+								]
+							}
+						},
+						"available_markets": {
+							"type": "array",
+							"items": {
+								"type": "string"
+							}
+						},
+						"external_urls": {
+							"type": "object",
+							"properties": {
+								"spotify": {
+									"type": "string"
+								}
+							},
+							"required": [
+								"spotify"
+							]
+						},
+						"href": {
+							"type": "string"
+						},
+						"id": {
+							"type": "string"
+						},
+						"images": {
+							"type": "array",
+							"items": {
+								"type": "object",
+								"properties": {
+									"height": {
+										"type": "integer"
+									},
+									"url": {
+										"type": "string"
+									},
+									"width": {
+										"type": "integer"
+									}
+								},
+								"required": [
+									"height",
+									"url",
+									"width"
+								]
+							}
+						},
+						"name": {
+							"type": "string"
+						},
+						"release_date": {
+							"type": "string"
+						},
+						"release_date_precision": {
+							"type": "string"
+						},
+						"total_tracks": {
+							"type": "integer"
+						},
+						"type": {
+							"type": "string"
+						},
+						"uri": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"album_type",
+						"artists",
+						"available_markets",
+						"external_urls",
+						"href",
+						"id",
+						"images",
+						"name",
+						"release_date",
+						"release_date_precision",
+						"total_tracks",
+						"type",
+						"uri"
+					]
+				},
+				"artists": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"external_urls": {
+								"type": "object",
+								"properties": {
+									"spotify": {
+										"type": "string"
+									}
+								},
+								"required": [
+									"spotify"
+								]
+							},
+							"href": {
+								"type": "string"
+							},
+							"id": {
+								"type": "string"
+							},
+							"name": {
+								"type": "string"
+							},
+							"type": {
+								"type": "string"
+							},
+							"uri": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"external_urls",
+							"href",
+							"id",
+							"name",
+							"type",
+							"uri"
+						]
+					}
+				},
+				"available_markets": {
+					"type": "array",
+					"items": {
+						"type": "string"
+					}
+				},
+				"disc_number": {
+					"type": "integer"
+				},
+				"duration_ms": {
+					"type": "integer"
+				},
+				"explicit": {
+					"type": "boolean"
+				},
+				"external_ids": {
+					"type": "object",
+					"properties": {
+						"isrc": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"isrc"
+					]
+				},
+				"external_urls": {
+					"type": "object",
+					"properties": {
+						"spotify": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"spotify"
+					]
+				},
+				"href": {
+					"type": "string"
+				},
+				"id": {
+					"type": "string"
+				},
+				"is_local": {
+					"type": "boolean"
+				},
+				"name": {
+					"type": "string"
+				},
+				"popularity": {
+					"type": "integer"
+				},
+				"track_number": {
+					"type": "integer"
+				},
+				"type": {
+					"type": "string"
+				},
+				"uri": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"album",
+				"artists",
+				"available_markets",
+				"disc_number",
+				"duration_ms",
+				"explicit",
+				"external_ids",
+				"external_urls",
+				"href",
+				"id",
+				"is_local",
+				"name",
+				"popularity",
+				"preview_url",
+				"track_number",
+				"type",
+				"uri"
+			]
+		},
+		"played_at": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"track",
+		"played_at",
+		"context"
+	]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/resume.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/resume.json
new file mode 100644
index 0000000000..9f6e8389bd
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/resume.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        },
+        "error": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/startMusic.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/startMusic.json
new file mode 100644
index 0000000000..7283b69893
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/startMusic.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/volume.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/volume.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/player/volume.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/add.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/add.json
new file mode 100644
index 0000000000..05d5c9536b
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/add.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "snapshot_id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/create.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/create.json
new file mode 100644
index 0000000000..9613f22c18
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/create.json
@@ -0,0 +1,149 @@
+{
+    "type": "object",
+    "properties": {
+        "collaborative": {
+            "type": "boolean"
+        },
+        "description": {
+            "type": "string"
+        },
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "followers": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "null"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "primary_color": {
+            "type": "null"
+        },
+        "name": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                },
+                "display_name": {
+                    "type": "null"
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                }
+            },
+            "required": [
+                "href",
+                "id",
+                "type",
+                "uri",
+                "display_name",
+                "external_urls"
+            ]
+        },
+        "public": {
+            "type": "boolean"
+        },
+        "snapshot_id": {
+            "type": "string"
+        },
+        "tracks": {
+            "type": "object",
+            "properties": {
+                "limit": {
+                    "type": "integer"
+                },
+                "next": {
+                    "type": "null"
+                },
+                "offset": {
+                    "type": "integer"
+                },
+                "previous": {
+                    "type": "null"
+                },
+                "href": {
+                    "type": "string"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "limit",
+                "next",
+                "offset",
+                "previous",
+                "href",
+                "total",
+                "items"
+            ]
+        }
+    },
+    "required": [
+        "collaborative",
+        "description",
+        "external_urls",
+        "followers",
+        "href",
+        "id",
+        "images",
+        "primary_color",
+        "name",
+        "type",
+        "uri",
+        "owner",
+        "public",
+        "snapshot_id",
+        "tracks"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/get.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/get.json
new file mode 100644
index 0000000000..bdd5dba1f9
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/get.json
@@ -0,0 +1,477 @@
+{
+    "type": "object",
+    "properties": {
+        "collaborative": {
+            "type": "boolean"
+        },
+        "description": {
+            "type": "string"
+        },
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "followers": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "null"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "display_name": {
+                    "type": "string"
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "display_name",
+                "external_urls",
+                "href",
+                "id",
+                "type",
+                "uri"
+            ]
+        },
+        "public": {
+            "type": "boolean"
+        },
+        "snapshot_id": {
+            "type": "string"
+        },
+        "tracks": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "string"
+                },
+                "items": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "added_at": {
+                                "type": "string"
+                            },
+                            "added_by": {
+                                "type": "object",
+                                "properties": {
+                                    "external_urls": {
+                                        "type": "object",
+                                        "properties": {
+                                            "spotify": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "spotify"
+                                        ]
+                                    },
+                                    "href": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "uri": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "external_urls",
+                                    "href",
+                                    "id",
+                                    "type",
+                                    "uri"
+                                ]
+                            },
+                            "is_local": {
+                                "type": "boolean"
+                            },
+                            "primary_color": {
+                                "type": "null"
+                            },
+                            "track": {
+                                "type": "object",
+                                "properties": {
+                                    "available_markets": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "explicit": {
+                                        "type": "boolean"
+                                    },
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "episode": {
+                                        "type": "boolean"
+                                    },
+                                    "track": {
+                                        "type": "boolean"
+                                    },
+                                    "album": {
+                                        "type": "object",
+                                        "properties": {
+                                            "available_markets": {
+                                                "type": "array",
+                                                "items": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "type": {
+                                                "type": "string"
+                                            },
+                                            "album_type": {
+                                                "type": "string"
+                                            },
+                                            "href": {
+                                                "type": "string"
+                                            },
+                                            "id": {
+                                                "type": "string"
+                                            },
+                                            "images": {
+                                                "type": "array",
+                                                "items": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "url": {
+                                                            "type": "string"
+                                                        },
+                                                        "width": {
+                                                            "type": "integer"
+                                                        },
+                                                        "height": {
+                                                            "type": "integer"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "url",
+                                                        "width",
+                                                        "height"
+                                                    ]
+                                                }
+                                            },
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "release_date": {
+                                                "type": "string"
+                                            },
+                                            "release_date_precision": {
+                                                "type": "string"
+                                            },
+                                            "uri": {
+                                                "type": "string"
+                                            },
+                                            "artists": {
+                                                "type": "array",
+                                                "items": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "external_urls": {
+                                                            "type": "object",
+                                                            "properties": {
+                                                                "spotify": {
+                                                                    "type": "string"
+                                                                }
+                                                            },
+                                                            "required": [
+                                                                "spotify"
+                                                            ]
+                                                        },
+                                                        "href": {
+                                                            "type": "string"
+                                                        },
+                                                        "id": {
+                                                            "type": "string"
+                                                        },
+                                                        "name": {
+                                                            "type": "string"
+                                                        },
+                                                        "type": {
+                                                            "type": "string"
+                                                        },
+                                                        "uri": {
+                                                            "type": "string"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "external_urls",
+                                                        "href",
+                                                        "id",
+                                                        "name",
+                                                        "type",
+                                                        "uri"
+                                                    ]
+                                                }
+                                            },
+                                            "external_urls": {
+                                                "type": "object",
+                                                "properties": {
+                                                    "spotify": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "required": [
+                                                    "spotify"
+                                                ]
+                                            },
+                                            "total_tracks": {
+                                                "type": "integer"
+                                            }
+                                        },
+                                        "required": [
+                                            "available_markets",
+                                            "type",
+                                            "album_type",
+                                            "href",
+                                            "id",
+                                            "images",
+                                            "name",
+                                            "release_date",
+                                            "release_date_precision",
+                                            "uri",
+                                            "artists",
+                                            "external_urls",
+                                            "total_tracks"
+                                        ]
+                                    },
+                                    "artists": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object",
+                                            "properties": {
+                                                "external_urls": {
+                                                    "type": "object",
+                                                    "properties": {
+                                                        "spotify": {
+                                                            "type": "string"
+                                                        }
+                                                    },
+                                                    "required": [
+                                                        "spotify"
+                                                    ]
+                                                },
+                                                "href": {
+                                                    "type": "string"
+                                                },
+                                                "id": {
+                                                    "type": "string"
+                                                },
+                                                "name": {
+                                                    "type": "string"
+                                                },
+                                                "type": {
+                                                    "type": "string"
+                                                },
+                                                "uri": {
+                                                    "type": "string"
+                                                }
+                                            },
+                                            "required": [
+                                                "external_urls",
+                                                "href",
+                                                "id",
+                                                "name",
+                                                "type",
+                                                "uri"
+                                            ]
+                                        }
+                                    },
+                                    "disc_number": {
+                                        "type": "integer"
+                                    },
+                                    "track_number": {
+                                        "type": "integer"
+                                    },
+                                    "duration_ms": {
+                                        "type": "integer"
+                                    },
+                                    "external_ids": {
+                                        "type": "object",
+                                        "properties": {
+                                            "isrc": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "isrc"
+                                        ]
+                                    },
+                                    "external_urls": {
+                                        "type": "object",
+                                        "properties": {
+                                            "spotify": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "spotify"
+                                        ]
+                                    },
+                                    "href": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "popularity": {
+                                        "type": "integer"
+                                    },
+                                    "uri": {
+                                        "type": "string"
+                                    },
+                                    "is_local": {
+                                        "type": "boolean"
+                                    }
+                                },
+                                "required": [
+                                    "preview_url",
+                                    "available_markets",
+                                    "explicit",
+                                    "type",
+                                    "episode",
+                                    "track",
+                                    "album",
+                                    "artists",
+                                    "disc_number",
+                                    "track_number",
+                                    "duration_ms",
+                                    "external_ids",
+                                    "external_urls",
+                                    "href",
+                                    "id",
+                                    "name",
+                                    "popularity",
+                                    "uri",
+                                    "is_local"
+                                ]
+                            },
+                            "video_thumbnail": {
+                                "type": "object",
+                                "properties": {
+                                    "url": {
+                                        "type": "null"
+                                    }
+                                },
+                                "required": [
+                                    "url"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "added_at",
+                            "added_by",
+                            "is_local",
+                            "primary_color",
+                            "track",
+                            "video_thumbnail"
+                        ]
+                    }
+                },
+                "limit": {
+                    "type": "integer"
+                },
+                "offset": {
+                    "type": "integer"
+                },
+                "previous": {
+                    "type": "null"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "items",
+                "limit",
+                "next",
+                "offset",
+                "previous",
+                "total"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "collaborative",
+        "description",
+        "external_urls",
+        "followers",
+        "href",
+        "id",
+        "images",
+        "name",
+        "owner",
+        "primary_color",
+        "public",
+        "snapshot_id",
+        "tracks",
+        "type",
+        "uri"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/getTracks.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/getTracks.json
new file mode 100644
index 0000000000..bb6d160151
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/getTracks.json
@@ -0,0 +1,325 @@
+{
+    "type": "object",
+    "properties": {
+        "added_at": {
+            "type": "string"
+        },
+        "added_by": {
+            "type": "object",
+            "properties": {
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "external_urls",
+                "href",
+                "id",
+                "type",
+                "uri"
+            ]
+        },
+        "is_local": {
+            "type": "boolean"
+        },
+        "primary_color": {
+            "type": "null"
+        },
+        "track": {
+            "type": "object",
+            "properties": {
+                "available_markets": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "explicit": {
+                    "type": "boolean"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "episode": {
+                    "type": "boolean"
+                },
+                "track": {
+                    "type": "boolean"
+                },
+                "album": {
+                    "type": "object",
+                    "properties": {
+                        "available_markets": {
+                            "type": "array",
+                            "items": {
+                                "type": "string"
+                            }
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "album_type": {
+                            "type": "string"
+                        },
+                        "href": {
+                            "type": "string"
+                        },
+                        "id": {
+                            "type": "string"
+                        },
+                        "images": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "height": {
+                                        "type": "integer"
+                                    },
+                                    "url": {
+                                        "type": "string"
+                                    },
+                                    "width": {
+                                        "type": "integer"
+                                    }
+                                },
+                                "required": [
+                                    "height",
+                                    "url",
+                                    "width"
+                                ]
+                            }
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "release_date": {
+                            "type": "string"
+                        },
+                        "release_date_precision": {
+                            "type": "string"
+                        },
+                        "uri": {
+                            "type": "string"
+                        },
+                        "artists": {
+                            "type": "array",
+                            "items": {
+                                "type": "object",
+                                "properties": {
+                                    "external_urls": {
+                                        "type": "object",
+                                        "properties": {
+                                            "spotify": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "spotify"
+                                        ]
+                                    },
+                                    "href": {
+                                        "type": "string"
+                                    },
+                                    "id": {
+                                        "type": "string"
+                                    },
+                                    "name": {
+                                        "type": "string"
+                                    },
+                                    "type": {
+                                        "type": "string"
+                                    },
+                                    "uri": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "external_urls",
+                                    "href",
+                                    "id",
+                                    "name",
+                                    "type",
+                                    "uri"
+                                ]
+                            }
+                        },
+                        "external_urls": {
+                            "type": "object",
+                            "properties": {
+                                "spotify": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "spotify"
+                            ]
+                        },
+                        "total_tracks": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "available_markets",
+                        "type",
+                        "album_type",
+                        "href",
+                        "id",
+                        "images",
+                        "name",
+                        "release_date",
+                        "release_date_precision",
+                        "uri",
+                        "artists",
+                        "external_urls",
+                        "total_tracks"
+                    ]
+                },
+                "artists": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "external_urls": {
+                                "type": "object",
+                                "properties": {
+                                    "spotify": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "spotify"
+                                ]
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "uri": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "external_urls",
+                            "href",
+                            "id",
+                            "name",
+                            "type",
+                            "uri"
+                        ]
+                    }
+                },
+                "disc_number": {
+                    "type": "integer"
+                },
+                "track_number": {
+                    "type": "integer"
+                },
+                "duration_ms": {
+                    "type": "integer"
+                },
+                "external_ids": {
+                    "type": "object",
+                    "properties": {
+                        "isrc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "isrc"
+                    ]
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "name": {
+                    "type": "string"
+                },
+                "popularity": {
+                    "type": "integer"
+                },
+                "uri": {
+                    "type": "string"
+                },
+                "is_local": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "preview_url",
+                "available_markets",
+                "explicit",
+                "type",
+                "episode",
+                "track",
+                "album",
+                "artists",
+                "disc_number",
+                "track_number",
+                "duration_ms",
+                "external_ids",
+                "external_urls",
+                "href",
+                "id",
+                "name",
+                "popularity",
+                "uri",
+                "is_local"
+            ]
+        },
+        "video_thumbnail": {
+            "type": "object",
+            "properties": {
+                "url": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "url"
+            ]
+        }
+    },
+    "required": [
+        "added_at",
+        "added_by",
+        "is_local",
+        "primary_color",
+        "track",
+        "video_thumbnail"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/getUserPlaylists.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/getUserPlaylists.json
new file mode 100644
index 0000000000..1ec8c4bf5c
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/getUserPlaylists.json
@@ -0,0 +1,100 @@
+{
+    "type": "object",
+    "properties": {
+        "collaborative": {
+            "type": "boolean"
+        },
+        "description": {
+            "type": "string"
+        },
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "display_name": {
+                    "type": "string"
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "display_name",
+                "external_urls",
+                "href",
+                "id",
+                "type",
+                "uri"
+            ]
+        },
+        "public": {
+            "type": "boolean"
+        },
+        "snapshot_id": {
+            "type": "string"
+        },
+        "tracks": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "string"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "primary_color"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/search.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/search.json
new file mode 100644
index 0000000000..b31726da45
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/playlist/search.json
@@ -0,0 +1,113 @@
+{
+    "type": "object",
+    "properties": {
+        "collaborative": {
+            "type": "boolean"
+        },
+        "description": {
+            "type": "string"
+        },
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "height",
+                    "url",
+                    "width"
+                ]
+            }
+        },
+        "name": {
+            "type": "string"
+        },
+        "owner": {
+            "type": "object",
+            "properties": {
+                "display_name": {
+                    "type": "string"
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "display_name",
+                "external_urls",
+                "href",
+                "id",
+                "type",
+                "uri"
+            ]
+        },
+        "snapshot_id": {
+            "type": "string"
+        },
+        "tracks": {
+            "type": "object",
+            "properties": {
+                "href": {
+                    "type": "string"
+                },
+                "total": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "href",
+                "total"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "primary_color"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/track/getAudioFeatures.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/track/getAudioFeatures.json
new file mode 100644
index 0000000000..40e85f9fa9
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/track/getAudioFeatures.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "danceability": {
+            "type": "number"
+        },
+        "energy": {
+            "type": "number"
+        },
+        "key": {
+            "type": "integer"
+        },
+        "loudness": {
+            "type": "number"
+        },
+        "mode": {
+            "type": "integer"
+        },
+        "speechiness": {
+            "type": "number"
+        },
+        "acousticness": {
+            "type": "number"
+        },
+        "liveness": {
+            "type": "number"
+        },
+        "valence": {
+            "type": "number"
+        },
+        "tempo": {
+            "type": "number"
+        },
+        "type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        },
+        "track_href": {
+            "type": "string"
+        },
+        "analysis_url": {
+            "type": "string"
+        },
+        "duration_ms": {
+            "type": "integer"
+        },
+        "time_signature": {
+            "type": "integer"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/track/search.json b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/track/search.json
new file mode 100644
index 0000000000..2478aac9fa
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__schema__/v1.0.0/track/search.json
@@ -0,0 +1,235 @@
+{
+    "type": "object",
+    "properties": {
+        "album": {
+            "type": "object",
+            "properties": {
+                "album_type": {
+                    "type": "string"
+                },
+                "artists": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "external_urls": {
+                                "type": "object",
+                                "properties": {
+                                    "spotify": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "spotify"
+                                ]
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "uri": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "external_urls",
+                            "href",
+                            "id",
+                            "name",
+                            "type",
+                            "uri"
+                        ]
+                    }
+                },
+                "available_markets": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "external_urls": {
+                    "type": "object",
+                    "properties": {
+                        "spotify": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "spotify"
+                    ]
+                },
+                "href": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "images": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "height": {
+                                "type": "integer"
+                            },
+                            "width": {
+                                "type": "integer"
+                            },
+                            "url": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "height",
+                            "width",
+                            "url"
+                        ]
+                    }
+                },
+                "name": {
+                    "type": "string"
+                },
+                "release_date": {
+                    "type": "string"
+                },
+                "release_date_precision": {
+                    "type": "string"
+                },
+                "total_tracks": {
+                    "type": "integer"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "album_type",
+                "artists",
+                "external_urls",
+                "href",
+                "id",
+                "images",
+                "name",
+                "release_date",
+                "release_date_precision",
+                "total_tracks",
+                "type",
+                "uri"
+            ]
+        },
+        "artists": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "external_urls": {
+                        "type": "object",
+                        "properties": {
+                            "spotify": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "spotify"
+                        ]
+                    },
+                    "href": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "uri": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "external_urls",
+                    "href",
+                    "id",
+                    "name",
+                    "type",
+                    "uri"
+                ]
+            }
+        },
+        "available_markets": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "disc_number": {
+            "type": "integer"
+        },
+        "duration_ms": {
+            "type": "integer"
+        },
+        "explicit": {
+            "type": "boolean"
+        },
+        "external_ids": {
+            "type": "object",
+            "properties": {
+                "isrc": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "isrc"
+            ]
+        },
+        "external_urls": {
+            "type": "object",
+            "properties": {
+                "spotify": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "spotify"
+            ]
+        },
+        "href": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "is_local": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "popularity": {
+            "type": "integer"
+        },
+        "track_number": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/GenericFunctions.test.ts b/packages/nodes-base/nodes/Spotify/__tests__/GenericFunctions.test.ts
new file mode 100644
index 0000000000..e61b4a10a2
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/GenericFunctions.test.ts
@@ -0,0 +1,62 @@
+import type { IExecuteFunctions, IHookFunctions } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { spotifyApiRequest } from '../GenericFunctions';
+
+describe('Spotify -> GenericFunctions', () => {
+	let mockThis: IHookFunctions | IExecuteFunctions;
+
+	beforeEach(() => {
+		mockThis = {
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			},
+			getNode: jest.fn().mockReturnValue({}),
+		} as unknown as IHookFunctions | IExecuteFunctions;
+	});
+
+	it('should make a request with the correct options', async () => {
+		const method = 'GET';
+		const endpoint = '/me';
+		const body = {};
+		const query = { limit: 10 };
+		const response = { data: 'test' };
+
+		(mockThis.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(response);
+
+		const result = await spotifyApiRequest.call(mockThis, method, endpoint, body, query);
+
+		expect(mockThis.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'spotifyOAuth2Api',
+			{
+				method,
+				headers: {
+					'User-Agent': 'n8n',
+					'Content-Type': 'text/plain',
+					Accept: ' application/json',
+				},
+				qs: query,
+				url: `https://api.spotify.com/v1${endpoint}`,
+				json: true,
+			},
+		);
+
+		expect(result).toEqual(response);
+	});
+
+	it('should throw a NodeApiError on request failure', async () => {
+		const method = 'GET';
+		const endpoint = '/me';
+		const body = {};
+		const query = { limit: 10 };
+		const error = new Error('Request failed');
+
+		(mockThis.helpers.httpRequestWithAuthentication as jest.Mock).mockRejectedValue(error);
+
+		await expect(spotifyApiRequest.call(mockThis, method, endpoint, body, query)).rejects.toThrow(
+			NodeApiError,
+		);
+
+		expect(mockThis.getNode).toHaveBeenCalled();
+	});
+});
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/Spotify.workflow.json b/packages/nodes-base/nodes/Spotify/__tests__/workflow/Spotify.workflow.json
new file mode 100644
index 0000000000..b0962bd4bc
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/Spotify.workflow.json
@@ -0,0 +1,5941 @@
+{
+	"name": "[TEST] Spotify",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [40, 140],
+			"id": "08d02705-0913-46e1-9916-5f319c190127",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"operation": "search",
+				"query": "From Xero",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, -100],
+			"id": "a3c57688-3368-48ea-977a-3092ff6da385",
+			"name": "Spotify",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [640, -100],
+			"id": "bd6ad825-697b-465f-bda8-79e4db65c18e",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"operation": "getNewReleases",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, 80],
+			"id": "9f67f24d-6a80-4ca2-aefe-0efbf65054e2",
+			"name": "Spotify1",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [640, 80],
+			"id": "c0049cfc-67b3-43c6-bdb2-0249b8531e63",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"operation": "getTracks",
+				"id": "spotify:album:4R6FV9NSzhPihHR0h4pI93",
+				"returnAll": true
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, 260],
+			"id": "3f04a285-fecf-4d8b-9a54-dd45483072cb",
+			"name": "Spotify2",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [640, 260],
+			"id": "e1ec2e5e-cd8b-4c45-9202-95027a50029c",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"id": "4R6FV9NSzhPihHR0h4pI93"
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, 620],
+			"id": "e2d26e12-a308-4d30-8908-46da973885ad",
+			"name": "Spotify4",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [680, 620],
+			"id": "55478529-904e-4da8-9f96-1d5a391e9468",
+			"name": "No Operation, do nothing4"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"album_type": "album",
+					"total_tracks": 11,
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93"
+					},
+					"href": "https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93",
+					"id": "4R6FV9NSzhPihHR0h4pI93",
+					"images": [
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0",
+							"width": 640
+						},
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0",
+							"width": 64
+						}
+					],
+					"name": "From Zero",
+					"release_date": "2024-11-15",
+					"release_date_precision": "day",
+					"type": "album",
+					"uri": "spotify:album:4R6FV9NSzhPihHR0h4pI93",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"album_type": "single",
+					"total_tracks": 3,
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"BY",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/5v5KesD6W6Ptlid6iyGxSq"
+					},
+					"href": "https://api.spotify.com/v1/albums/5v5KesD6W6Ptlid6iyGxSq",
+					"id": "5v5KesD6W6Ptlid6iyGxSq",
+					"images": [
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b273b554768192043c597c31133a",
+							"width": 640
+						},
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e02b554768192043c597c31133a",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d00004851b554768192043c597c31133a",
+							"width": 64
+						}
+					],
+					"name": "From Xero",
+					"release_date": "2021-11-15",
+					"release_date_precision": "day",
+					"type": "album",
+					"uri": "spotify:album:5v5KesD6W6Ptlid6iyGxSq",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/1EGVsuJeCpKQf69Io9kz1T"
+							},
+							"href": "https://api.spotify.com/v1/artists/1EGVsuJeCpKQf69Io9kz1T",
+							"id": "1EGVsuJeCpKQf69Io9kz1T",
+							"name": "HJY",
+							"type": "artist",
+							"uri": "spotify:artist:1EGVsuJeCpKQf69Io9kz1T"
+						}
+					]
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"album_type": "album",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/3eVa5w3URK5duf6eyVDbu9"
+							},
+							"href": "https://api.spotify.com/v1/artists/3eVa5w3URK5duf6eyVDbu9",
+							"id": "3eVa5w3URK5duf6eyVDbu9",
+							"name": "ROSÉ",
+							"type": "artist",
+							"uri": "spotify:artist:3eVa5w3URK5duf6eyVDbu9"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/7kFyd5oyJdVX2pIi6P4iHE"
+					},
+					"href": "https://api.spotify.com/v1/albums/7kFyd5oyJdVX2pIi6P4iHE",
+					"id": "7kFyd5oyJdVX2pIi6P4iHE",
+					"images": [
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e025074bd0894cb1340b8d8a678",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d000048515074bd0894cb1340b8d8a678",
+							"width": 64
+						},
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b2735074bd0894cb1340b8d8a678",
+							"width": 640
+						}
+					],
+					"name": "rosie",
+					"release_date": "2024-12-06",
+					"release_date_precision": "day",
+					"total_tracks": 12,
+					"type": "album",
+					"uri": "spotify:album:7kFyd5oyJdVX2pIi6P4iHE"
+				}
+			},
+			{
+				"json": {
+					"album_type": "album",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/2FXC3k01G6Gw61bmprjgqS"
+							},
+							"href": "https://api.spotify.com/v1/artists/2FXC3k01G6Gw61bmprjgqS",
+							"id": "2FXC3k01G6Gw61bmprjgqS",
+							"name": "Hozier",
+							"type": "artist",
+							"uri": "spotify:artist:2FXC3k01G6Gw61bmprjgqS"
+						}
+					],
+					"available_markets": ["AU", "CA", "PR", "US"],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/10MWtR7jwqRTLQAvmTU7uQ"
+					},
+					"href": "https://api.spotify.com/v1/albums/10MWtR7jwqRTLQAvmTU7uQ",
+					"id": "10MWtR7jwqRTLQAvmTU7uQ",
+					"images": [
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e028044f38f15837e87e2b65222",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d000048518044f38f15837e87e2b65222",
+							"width": 64
+						},
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b2738044f38f15837e87e2b65222",
+							"width": 640
+						}
+					],
+					"name": "Unreal Unearth: Unending",
+					"release_date": "2024-12-06",
+					"release_date_precision": "day",
+					"total_tracks": 26,
+					"type": "album",
+					"uri": "spotify:album:10MWtR7jwqRTLQAvmTU7uQ"
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 22174,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH"
+					},
+					"href": "https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH",
+					"id": "1uhces29ApKuQWFdpiUsvH",
+					"name": "From Zero (Intro)",
+					"preview_url": null,
+					"track_number": 1,
+					"type": "track",
+					"uri": "spotify:track:1uhces29ApKuQWFdpiUsvH",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 190427,
+					"explicit": true,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN"
+					},
+					"href": "https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN",
+					"id": "1EDPVGbyPKJPeGqATwXZvN",
+					"name": "The Emptiness Machine",
+					"preview_url": null,
+					"track_number": 2,
+					"type": "track",
+					"uri": "spotify:track:1EDPVGbyPKJPeGqATwXZvN",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 228606,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq"
+					},
+					"href": "https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq",
+					"id": "5mFZipkX1HZ4Idz5LOWpzq",
+					"name": "Cut the Bridge",
+					"preview_url": null,
+					"track_number": 3,
+					"type": "track",
+					"uri": "spotify:track:5mFZipkX1HZ4Idz5LOWpzq",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 167012,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0"
+					},
+					"href": "https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0",
+					"id": "2HBBM75Xv3o2Mqdyh1NcM0",
+					"name": "Heavy Is the Crown",
+					"preview_url": null,
+					"track_number": 4,
+					"type": "track",
+					"uri": "spotify:track:2HBBM75Xv3o2Mqdyh1NcM0",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 170445,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9"
+					},
+					"href": "https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9",
+					"id": "3k4gjmYNJugQRlh2aounZ9",
+					"name": "Over Each Other",
+					"preview_url": null,
+					"track_number": 5,
+					"type": "track",
+					"uri": "spotify:track:3k4gjmYNJugQRlh2aounZ9",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 140915,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx"
+					},
+					"href": "https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx",
+					"id": "7BkzAHnNW7WfrT4NcLaUDx",
+					"name": "Casualty",
+					"preview_url": null,
+					"track_number": 6,
+					"type": "track",
+					"uri": "spotify:track:7BkzAHnNW7WfrT4NcLaUDx",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 211027,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf"
+					},
+					"href": "https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf",
+					"id": "7diOv6wm3ngF7Vt6ubK0Sf",
+					"name": "Overflow",
+					"preview_url": null,
+					"track_number": 7,
+					"type": "track",
+					"uri": "spotify:track:7diOv6wm3ngF7Vt6ubK0Sf",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 183584,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m"
+					},
+					"href": "https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m",
+					"id": "6i5qhmmF9UNUBRyrPSGn4m",
+					"name": "Two Faced",
+					"preview_url": null,
+					"track_number": 8,
+					"type": "track",
+					"uri": "spotify:track:6i5qhmmF9UNUBRyrPSGn4m",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 185414,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF"
+					},
+					"href": "https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF",
+					"id": "0J1IJsMbKWb5g2sJArTkGF",
+					"name": "Stained",
+					"preview_url": null,
+					"track_number": 9,
+					"type": "track",
+					"uri": "spotify:track:0J1IJsMbKWb5g2sJArTkGF",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 209083,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H"
+					},
+					"href": "https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H",
+					"id": "7M8eZBRTD9QNasEVReEM0H",
+					"name": "IGYEIH",
+					"preview_url": null,
+					"track_number": 10,
+					"type": "track",
+					"uri": "spotify:track:7M8eZBRTD9QNasEVReEM0H",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 209844,
+					"explicit": true,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7"
+					},
+					"href": "https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7",
+					"id": "6aCBjSb87RizdH8lVBIRW7",
+					"name": "Good Things Go",
+					"preview_url": null,
+					"track_number": 11,
+					"type": "track",
+					"uri": "spotify:track:6aCBjSb87RizdH8lVBIRW7",
+					"is_local": false
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"album_type": "album",
+					"total_tracks": 11,
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93"
+					},
+					"href": "https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93",
+					"id": "4R6FV9NSzhPihHR0h4pI93",
+					"images": [
+						{
+							"url": "https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0",
+							"height": 640,
+							"width": 640
+						},
+						{
+							"url": "https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0",
+							"height": 300,
+							"width": 300
+						},
+						{
+							"url": "https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0",
+							"height": 64,
+							"width": 64
+						}
+					],
+					"name": "From Zero",
+					"release_date": "2024-11-15",
+					"release_date_precision": "day",
+					"type": "album",
+					"uri": "spotify:album:4R6FV9NSzhPihHR0h4pI93",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"tracks": {
+						"href": "https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93/tracks",
+						"limit": 50,
+						"next": null,
+						"offset": 0,
+						"previous": null,
+						"total": 11,
+						"items": [
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 22174,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH"
+								},
+								"href": "https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH",
+								"id": "1uhces29ApKuQWFdpiUsvH",
+								"name": "From Zero (Intro)",
+								"preview_url": null,
+								"track_number": 1,
+								"type": "track",
+								"uri": "spotify:track:1uhces29ApKuQWFdpiUsvH",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 190427,
+								"explicit": true,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN"
+								},
+								"href": "https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN",
+								"id": "1EDPVGbyPKJPeGqATwXZvN",
+								"name": "The Emptiness Machine",
+								"preview_url": null,
+								"track_number": 2,
+								"type": "track",
+								"uri": "spotify:track:1EDPVGbyPKJPeGqATwXZvN",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 228606,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq"
+								},
+								"href": "https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq",
+								"id": "5mFZipkX1HZ4Idz5LOWpzq",
+								"name": "Cut the Bridge",
+								"preview_url": null,
+								"track_number": 3,
+								"type": "track",
+								"uri": "spotify:track:5mFZipkX1HZ4Idz5LOWpzq",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 167012,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0"
+								},
+								"href": "https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0",
+								"id": "2HBBM75Xv3o2Mqdyh1NcM0",
+								"name": "Heavy Is the Crown",
+								"preview_url": null,
+								"track_number": 4,
+								"type": "track",
+								"uri": "spotify:track:2HBBM75Xv3o2Mqdyh1NcM0",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 170445,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9"
+								},
+								"href": "https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9",
+								"id": "3k4gjmYNJugQRlh2aounZ9",
+								"name": "Over Each Other",
+								"preview_url": null,
+								"track_number": 5,
+								"type": "track",
+								"uri": "spotify:track:3k4gjmYNJugQRlh2aounZ9",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 140915,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx"
+								},
+								"href": "https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx",
+								"id": "7BkzAHnNW7WfrT4NcLaUDx",
+								"name": "Casualty",
+								"preview_url": null,
+								"track_number": 6,
+								"type": "track",
+								"uri": "spotify:track:7BkzAHnNW7WfrT4NcLaUDx",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 211027,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf"
+								},
+								"href": "https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf",
+								"id": "7diOv6wm3ngF7Vt6ubK0Sf",
+								"name": "Overflow",
+								"preview_url": null,
+								"track_number": 7,
+								"type": "track",
+								"uri": "spotify:track:7diOv6wm3ngF7Vt6ubK0Sf",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 183584,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m"
+								},
+								"href": "https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m",
+								"id": "6i5qhmmF9UNUBRyrPSGn4m",
+								"name": "Two Faced",
+								"preview_url": null,
+								"track_number": 8,
+								"type": "track",
+								"uri": "spotify:track:6i5qhmmF9UNUBRyrPSGn4m",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 185414,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF"
+								},
+								"href": "https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF",
+								"id": "0J1IJsMbKWb5g2sJArTkGF",
+								"name": "Stained",
+								"preview_url": null,
+								"track_number": 9,
+								"type": "track",
+								"uri": "spotify:track:0J1IJsMbKWb5g2sJArTkGF",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 209083,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H"
+								},
+								"href": "https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H",
+								"id": "7M8eZBRTD9QNasEVReEM0H",
+								"name": "IGYEIH",
+								"preview_url": null,
+								"track_number": 10,
+								"type": "track",
+								"uri": "spotify:track:7M8eZBRTD9QNasEVReEM0H",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 209844,
+								"explicit": true,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7"
+								},
+								"href": "https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7",
+								"id": "6aCBjSb87RizdH8lVBIRW7",
+								"name": "Good Things Go",
+								"preview_url": null,
+								"track_number": 11,
+								"type": "track",
+								"uri": "spotify:track:6aCBjSb87RizdH8lVBIRW7",
+								"is_local": false
+							}
+						]
+					},
+					"copyrights": [
+						{
+							"text": "© 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.",
+							"type": "C"
+						},
+						{
+							"text": "℗ 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.",
+							"type": "P"
+						}
+					],
+					"external_ids": {
+						"upc": "093624839811"
+					},
+					"genres": [],
+					"label": "Warner Records",
+					"popularity": 91
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Spotify",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Spotify1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Spotify2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Spotify4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Spotify": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Spotify1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Spotify2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing2": {
+			"main": [[]]
+		},
+		"Spotify4": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "e9413658-28ab-43a4-9ab6-409d60326b7e",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "EygPNhavSktkheN2",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/apiResponses.ts b/packages/nodes-base/nodes/Spotify/__tests__/workflow/apiResponses.ts
new file mode 100644
index 0000000000..aac0c1f00f
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/apiResponses.ts
@@ -0,0 +1,1146 @@
+const available_markets = [
+	'AR',
+	'AU',
+	'AT',
+	'BE',
+	'BO',
+	'BR',
+	'BG',
+	'CA',
+	'CL',
+	'CO',
+	'CR',
+	'CY',
+	'CZ',
+	'DK',
+	'DO',
+	'DE',
+	'EC',
+	'EE',
+	'SV',
+	'FI',
+	'FR',
+	'GR',
+	'GT',
+	'HN',
+	'HK',
+	'HU',
+	'IS',
+	'IE',
+	'IT',
+	'LV',
+	'LT',
+	'LU',
+	'MY',
+	'MT',
+	'MX',
+	'NL',
+	'NZ',
+	'NI',
+	'NO',
+	'PA',
+	'PY',
+	'PE',
+	'PH',
+	'PL',
+	'PT',
+	'SG',
+	'SK',
+	'ES',
+	'SE',
+	'CH',
+	'TW',
+	'TR',
+	'UY',
+	'US',
+	'GB',
+	'AD',
+	'LI',
+	'MC',
+	'ID',
+	'JP',
+	'TH',
+	'VN',
+	'RO',
+	'IL',
+	'ZA',
+	'SA',
+	'AE',
+	'BH',
+	'QA',
+	'OM',
+	'KW',
+	'EG',
+	'MA',
+	'DZ',
+	'TN',
+	'LB',
+	'JO',
+	'PS',
+	'IN',
+	'KZ',
+	'MD',
+	'UA',
+	'AL',
+	'BA',
+	'HR',
+	'ME',
+	'MK',
+	'RS',
+	'SI',
+	'KR',
+	'BD',
+	'PK',
+	'LK',
+	'GH',
+	'KE',
+	'NG',
+	'TZ',
+	'UG',
+	'AG',
+	'AM',
+	'BS',
+	'BB',
+	'BZ',
+	'BT',
+	'BW',
+	'BF',
+	'CV',
+	'CW',
+	'DM',
+	'FJ',
+	'GM',
+	'GE',
+	'GD',
+	'GW',
+	'GY',
+	'HT',
+	'JM',
+	'KI',
+	'LS',
+	'LR',
+	'MW',
+	'MV',
+	'ML',
+	'MH',
+	'FM',
+	'NA',
+	'NR',
+	'NE',
+	'PW',
+	'PG',
+	'PR',
+	'WS',
+	'SM',
+	'ST',
+	'SN',
+	'SC',
+	'SL',
+	'SB',
+	'KN',
+	'LC',
+	'VC',
+	'SR',
+	'TL',
+	'TO',
+	'TT',
+	'TV',
+	'VU',
+	'AZ',
+	'BN',
+	'BI',
+	'KH',
+	'CM',
+	'TD',
+	'KM',
+	'GQ',
+	'SZ',
+	'GA',
+	'GN',
+	'KG',
+	'LA',
+	'MO',
+	'MR',
+	'MN',
+	'NP',
+	'RW',
+	'TG',
+	'UZ',
+	'ZW',
+	'BJ',
+	'MG',
+	'MU',
+	'MZ',
+	'AO',
+	'CI',
+	'DJ',
+	'ZM',
+	'CD',
+	'CG',
+	'IQ',
+	'LY',
+	'TJ',
+	'VE',
+	'ET',
+	'XK',
+];
+
+export const searchForAlbum = {
+	albums: {
+		href: 'https://api.spotify.com/v1/search?offset=0&limit=2&query=From%20Xero&type=album&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		limit: 2,
+		next: 'https://api.spotify.com/v1/search?offset=2&limit=2&query=From%20Xero&type=album&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		offset: 0,
+		previous: null,
+		total: 787,
+		items: [
+			{
+				album_type: 'album',
+				total_tracks: 11,
+				available_markets,
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93',
+				},
+				href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93',
+				id: '4R6FV9NSzhPihHR0h4pI93',
+				images: [
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0',
+						width: 640,
+					},
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0',
+						width: 64,
+					},
+				],
+				name: 'From Zero',
+				release_date: '2024-11-15',
+				release_date_precision: 'day',
+				type: 'album',
+				uri: 'spotify:album:4R6FV9NSzhPihHR0h4pI93',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+			},
+			{
+				album_type: 'single',
+				total_tracks: 3,
+				available_markets: [
+					...available_markets.slice(0, 79),
+					'BY',
+					...available_markets.slice(79),
+				],
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/5v5KesD6W6Ptlid6iyGxSq',
+				},
+				href: 'https://api.spotify.com/v1/albums/5v5KesD6W6Ptlid6iyGxSq',
+				id: '5v5KesD6W6Ptlid6iyGxSq',
+				images: [
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b273b554768192043c597c31133a',
+						width: 640,
+					},
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e02b554768192043c597c31133a',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d00004851b554768192043c597c31133a',
+						width: 64,
+					},
+				],
+				name: 'From Xero',
+				release_date: '2021-11-15',
+				release_date_precision: 'day',
+				type: 'album',
+				uri: 'spotify:album:5v5KesD6W6Ptlid6iyGxSq',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/1EGVsuJeCpKQf69Io9kz1T',
+						},
+						href: 'https://api.spotify.com/v1/artists/1EGVsuJeCpKQf69Io9kz1T',
+						id: '1EGVsuJeCpKQf69Io9kz1T',
+						name: 'HJY',
+						type: 'artist',
+						uri: 'spotify:artist:1EGVsuJeCpKQf69Io9kz1T',
+					},
+				],
+			},
+		],
+	},
+};
+
+export const getNewReleases = {
+	albums: {
+		href: 'https://api.spotify.com/v1/browse/new-releases?offset=0&limit=2&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		items: [
+			{
+				album_type: 'album',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/3eVa5w3URK5duf6eyVDbu9',
+						},
+						href: 'https://api.spotify.com/v1/artists/3eVa5w3URK5duf6eyVDbu9',
+						id: '3eVa5w3URK5duf6eyVDbu9',
+						name: 'ROSÉ',
+						type: 'artist',
+						uri: 'spotify:artist:3eVa5w3URK5duf6eyVDbu9',
+					},
+				],
+				available_markets: available_markets.filter((market) => market !== 'KR'),
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/7kFyd5oyJdVX2pIi6P4iHE',
+				},
+				href: 'https://api.spotify.com/v1/albums/7kFyd5oyJdVX2pIi6P4iHE',
+				id: '7kFyd5oyJdVX2pIi6P4iHE',
+				images: [
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e025074bd0894cb1340b8d8a678',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d000048515074bd0894cb1340b8d8a678',
+						width: 64,
+					},
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b2735074bd0894cb1340b8d8a678',
+						width: 640,
+					},
+				],
+				name: 'rosie',
+				release_date: '2024-12-06',
+				release_date_precision: 'day',
+				total_tracks: 12,
+				type: 'album',
+				uri: 'spotify:album:7kFyd5oyJdVX2pIi6P4iHE',
+			},
+			{
+				album_type: 'album',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/2FXC3k01G6Gw61bmprjgqS',
+						},
+						href: 'https://api.spotify.com/v1/artists/2FXC3k01G6Gw61bmprjgqS',
+						id: '2FXC3k01G6Gw61bmprjgqS',
+						name: 'Hozier',
+						type: 'artist',
+						uri: 'spotify:artist:2FXC3k01G6Gw61bmprjgqS',
+					},
+				],
+				available_markets: ['AU', 'CA', 'PR', 'US'],
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/10MWtR7jwqRTLQAvmTU7uQ',
+				},
+				href: 'https://api.spotify.com/v1/albums/10MWtR7jwqRTLQAvmTU7uQ',
+				id: '10MWtR7jwqRTLQAvmTU7uQ',
+				images: [
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e028044f38f15837e87e2b65222',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d000048518044f38f15837e87e2b65222',
+						width: 64,
+					},
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b2738044f38f15837e87e2b65222',
+						width: 640,
+					},
+				],
+				name: 'Unreal Unearth: Unending',
+				release_date: '2024-12-06',
+				release_date_precision: 'day',
+				total_tracks: 26,
+				type: 'album',
+				uri: 'spotify:album:10MWtR7jwqRTLQAvmTU7uQ',
+			},
+		],
+		limit: 2,
+		next: 'https://api.spotify.com/v1/browse/new-releases?offset=2&limit=2&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		offset: 0,
+		previous: null,
+		total: 100,
+	},
+};
+
+export const getAlbumTracks = {
+	href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93/tracks?offset=0&limit=20',
+	items: [
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 22174,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH',
+			},
+			href: 'https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH',
+			id: '1uhces29ApKuQWFdpiUsvH',
+			name: 'From Zero (Intro)',
+			preview_url: null,
+			track_number: 1,
+			type: 'track',
+			uri: 'spotify:track:1uhces29ApKuQWFdpiUsvH',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 190427,
+			explicit: true,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN',
+			},
+			href: 'https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN',
+			id: '1EDPVGbyPKJPeGqATwXZvN',
+			name: 'The Emptiness Machine',
+			preview_url: null,
+			track_number: 2,
+			type: 'track',
+			uri: 'spotify:track:1EDPVGbyPKJPeGqATwXZvN',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 228606,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq',
+			},
+			href: 'https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq',
+			id: '5mFZipkX1HZ4Idz5LOWpzq',
+			name: 'Cut the Bridge',
+			preview_url: null,
+			track_number: 3,
+			type: 'track',
+			uri: 'spotify:track:5mFZipkX1HZ4Idz5LOWpzq',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 167012,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0',
+			},
+			href: 'https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0',
+			id: '2HBBM75Xv3o2Mqdyh1NcM0',
+			name: 'Heavy Is the Crown',
+			preview_url: null,
+			track_number: 4,
+			type: 'track',
+			uri: 'spotify:track:2HBBM75Xv3o2Mqdyh1NcM0',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 170445,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9',
+			},
+			href: 'https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9',
+			id: '3k4gjmYNJugQRlh2aounZ9',
+			name: 'Over Each Other',
+			preview_url: null,
+			track_number: 5,
+			type: 'track',
+			uri: 'spotify:track:3k4gjmYNJugQRlh2aounZ9',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 140915,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx',
+			},
+			href: 'https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx',
+			id: '7BkzAHnNW7WfrT4NcLaUDx',
+			name: 'Casualty',
+			preview_url: null,
+			track_number: 6,
+			type: 'track',
+			uri: 'spotify:track:7BkzAHnNW7WfrT4NcLaUDx',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 211027,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf',
+			},
+			href: 'https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf',
+			id: '7diOv6wm3ngF7Vt6ubK0Sf',
+			name: 'Overflow',
+			preview_url: null,
+			track_number: 7,
+			type: 'track',
+			uri: 'spotify:track:7diOv6wm3ngF7Vt6ubK0Sf',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 183584,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m',
+			},
+			href: 'https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m',
+			id: '6i5qhmmF9UNUBRyrPSGn4m',
+			name: 'Two Faced',
+			preview_url: null,
+			track_number: 8,
+			type: 'track',
+			uri: 'spotify:track:6i5qhmmF9UNUBRyrPSGn4m',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 185414,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF',
+			},
+			href: 'https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF',
+			id: '0J1IJsMbKWb5g2sJArTkGF',
+			name: 'Stained',
+			preview_url: null,
+			track_number: 9,
+			type: 'track',
+			uri: 'spotify:track:0J1IJsMbKWb5g2sJArTkGF',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 209083,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H',
+			},
+			href: 'https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H',
+			id: '7M8eZBRTD9QNasEVReEM0H',
+			name: 'IGYEIH',
+			preview_url: null,
+			track_number: 10,
+			type: 'track',
+			uri: 'spotify:track:7M8eZBRTD9QNasEVReEM0H',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 209844,
+			explicit: true,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7',
+			},
+			href: 'https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7',
+			id: '6aCBjSb87RizdH8lVBIRW7',
+			name: 'Good Things Go',
+			preview_url: null,
+			track_number: 11,
+			type: 'track',
+			uri: 'spotify:track:6aCBjSb87RizdH8lVBIRW7',
+			is_local: false,
+		},
+	],
+	limit: 20,
+	next: null,
+	offset: 0,
+	previous: null,
+	total: 11,
+};
+
+export const getArtist = {
+	external_urls: {
+		spotify: 'https://open.spotify.com/artist/12Chz98pHFMPJEknJQMWvI',
+	},
+	followers: {
+		href: null,
+		total: 8063570,
+	},
+	genres: ['alternative rock', 'modern rock', 'permanent wave', 'rock'],
+	href: 'https://api.spotify.com/v1/artists/12Chz98pHFMPJEknJQMWvI?locale=en-GB%2Cen-US%3Bq%3D0.9%2Cen%3Bq%3D0.8',
+	id: '12Chz98pHFMPJEknJQMWvI',
+	images: [
+		{
+			url: 'https://i.scdn.co/image/ab6761610000e5eb0accbbe13e1aa147dd27671c',
+			height: 640,
+			width: 640,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab676161000051740accbbe13e1aa147dd27671c',
+			height: 320,
+			width: 320,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab6761610000f1780accbbe13e1aa147dd27671c',
+			height: 160,
+			width: 160,
+		},
+	],
+	name: 'Muse',
+	popularity: 77,
+	type: 'artist',
+	uri: 'spotify:artist:12Chz98pHFMPJEknJQMWvI',
+};
+
+export const getAlbum = {
+	album_type: 'album',
+	total_tracks: 11,
+	available_markets,
+	external_urls: {
+		spotify: 'https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93',
+	},
+	href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93',
+	id: '4R6FV9NSzhPihHR0h4pI93',
+	images: [
+		{
+			url: 'https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0',
+			height: 640,
+			width: 640,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0',
+			height: 300,
+			width: 300,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0',
+			height: 64,
+			width: 64,
+		},
+	],
+	name: 'From Zero',
+	release_date: '2024-11-15',
+	release_date_precision: 'day',
+	type: 'album',
+	uri: 'spotify:album:4R6FV9NSzhPihHR0h4pI93',
+	artists: [
+		{
+			external_urls: {
+				spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+			},
+			href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+			id: '6XyY86QOPPrYVGvF9ch6wz',
+			name: 'Linkin Park',
+			type: 'artist',
+			uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+		},
+	],
+	tracks: {
+		href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93/tracks',
+		limit: 50,
+		next: null,
+		offset: 0,
+		previous: null,
+		total: 11,
+		items: [
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 22174,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH',
+				},
+				href: 'https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH',
+				id: '1uhces29ApKuQWFdpiUsvH',
+				name: 'From Zero (Intro)',
+				preview_url: null,
+				track_number: 1,
+				type: 'track',
+				uri: 'spotify:track:1uhces29ApKuQWFdpiUsvH',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 190427,
+				explicit: true,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN',
+				},
+				href: 'https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN',
+				id: '1EDPVGbyPKJPeGqATwXZvN',
+				name: 'The Emptiness Machine',
+				preview_url: null,
+				track_number: 2,
+				type: 'track',
+				uri: 'spotify:track:1EDPVGbyPKJPeGqATwXZvN',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 228606,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq',
+				},
+				href: 'https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq',
+				id: '5mFZipkX1HZ4Idz5LOWpzq',
+				name: 'Cut the Bridge',
+				preview_url: null,
+				track_number: 3,
+				type: 'track',
+				uri: 'spotify:track:5mFZipkX1HZ4Idz5LOWpzq',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 167012,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0',
+				},
+				href: 'https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0',
+				id: '2HBBM75Xv3o2Mqdyh1NcM0',
+				name: 'Heavy Is the Crown',
+				preview_url: null,
+				track_number: 4,
+				type: 'track',
+				uri: 'spotify:track:2HBBM75Xv3o2Mqdyh1NcM0',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 170445,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9',
+				},
+				href: 'https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9',
+				id: '3k4gjmYNJugQRlh2aounZ9',
+				name: 'Over Each Other',
+				preview_url: null,
+				track_number: 5,
+				type: 'track',
+				uri: 'spotify:track:3k4gjmYNJugQRlh2aounZ9',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 140915,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx',
+				},
+				href: 'https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx',
+				id: '7BkzAHnNW7WfrT4NcLaUDx',
+				name: 'Casualty',
+				preview_url: null,
+				track_number: 6,
+				type: 'track',
+				uri: 'spotify:track:7BkzAHnNW7WfrT4NcLaUDx',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 211027,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf',
+				},
+				href: 'https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf',
+				id: '7diOv6wm3ngF7Vt6ubK0Sf',
+				name: 'Overflow',
+				preview_url: null,
+				track_number: 7,
+				type: 'track',
+				uri: 'spotify:track:7diOv6wm3ngF7Vt6ubK0Sf',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 183584,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m',
+				},
+				href: 'https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m',
+				id: '6i5qhmmF9UNUBRyrPSGn4m',
+				name: 'Two Faced',
+				preview_url: null,
+				track_number: 8,
+				type: 'track',
+				uri: 'spotify:track:6i5qhmmF9UNUBRyrPSGn4m',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 185414,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF',
+				},
+				href: 'https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF',
+				id: '0J1IJsMbKWb5g2sJArTkGF',
+				name: 'Stained',
+				preview_url: null,
+				track_number: 9,
+				type: 'track',
+				uri: 'spotify:track:0J1IJsMbKWb5g2sJArTkGF',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 209083,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H',
+				},
+				href: 'https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H',
+				id: '7M8eZBRTD9QNasEVReEM0H',
+				name: 'IGYEIH',
+				preview_url: null,
+				track_number: 10,
+				type: 'track',
+				uri: 'spotify:track:7M8eZBRTD9QNasEVReEM0H',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 209844,
+				explicit: true,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7',
+				},
+				href: 'https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7',
+				id: '6aCBjSb87RizdH8lVBIRW7',
+				name: 'Good Things Go',
+				preview_url: null,
+				track_number: 11,
+				type: 'track',
+				uri: 'spotify:track:6aCBjSb87RizdH8lVBIRW7',
+				is_local: false,
+			},
+		],
+	},
+	copyrights: [
+		{
+			text: '© 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.',
+			type: 'C',
+		},
+		{
+			text: '℗ 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.',
+			type: 'P',
+		},
+	],
+	external_ids: {
+		upc: '093624839811',
+	},
+	genres: [],
+	label: 'Warner Records',
+	popularity: 91,
+};
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts b/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts
new file mode 100644
index 0000000000..0ce85b7d5d
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts
@@ -0,0 +1,40 @@
+import nock from 'nock';
+
+import {
+	getAlbum,
+	getAlbumTracks,
+	getArtist,
+	getNewReleases,
+	searchForAlbum,
+} from './apiResponses';
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+} from '../../../../test/nodes/Helpers';
+
+describe('Spotify', () => {
+	describe('Run workflow', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const tests = workflowToTests(workflows);
+
+		beforeAll(() => {
+			const mock = nock('https://api.spotify.com/v1');
+			mock
+				.get('/search')
+				.query({ q: 'From Xero', type: 'album', limit: 2 })
+				.reply(200, searchForAlbum);
+			mock.get('/browse/new-releases').query({ limit: 2 }).reply(200, getNewReleases);
+			mock.get('/albums/4R6FV9NSzhPihHR0h4pI93/tracks').reply(200, getAlbumTracks);
+			mock.get('/albums/4R6FV9NSzhPihHR0h4pI93').reply(200, getAlbum);
+			mock.get('/artists/12Chz98pHFMPJEknJQMWvI').reply(200, getArtist);
+		});
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => await equalityTest(testData, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
index e575c756b1..15659bee82 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
@@ -22,7 +22,7 @@ import {
 } from 'xlsx';
 
 import { oldVersionNotice } from '@utils/descriptions';
-import { flattenObject, generatePairedItemData } from '@utils/utilities';
+import { flattenObject } from '@utils/utilities';
 
 import {
 	operationProperty,
@@ -58,7 +58,6 @@ export class SpreadsheetFileV1 implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const pairedItem = generatePairedItemData(items.length);
 
 		const operation = this.getNodeParameter('operation', 0);
 
@@ -230,7 +229,6 @@ export class SpreadsheetFileV1 implements INodeType {
 				const newItem: INodeExecutionData = {
 					json: {},
 					binary: {},
-					pairedItem,
 				};
 
 				let fileName = `spreadsheet.${fileFormat}`;
@@ -247,7 +245,6 @@ export class SpreadsheetFileV1 implements INodeType {
 						json: {
 							error: error.message,
 						},
-						pairedItem,
 					});
 				} else {
 					throw error;
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
index d89d1e9c23..cbab0bc414 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
@@ -2,7 +2,6 @@ import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n
 
 import type { JsonToSpreadsheetBinaryFormat, JsonToSpreadsheetBinaryOptions } from '@utils/binary';
 import { convertJsonToSpreadsheetBinary } from '@utils/binary';
-import { generatePairedItemData } from '@utils/utilities';
 
 import { toFileOptions, toFileProperties } from '../description';
 
@@ -11,8 +10,6 @@ export const description: INodeProperties[] = [...toFileProperties, toFileOption
 export async function execute(this: IExecuteFunctions, items: INodeExecutionData[]) {
 	const returnData: INodeExecutionData[] = [];
 
-	const pairedItem = generatePairedItemData(items.length);
-
 	try {
 		const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
 		const fileFormat = this.getNodeParameter('fileFormat', 0) as JsonToSpreadsheetBinaryFormat;
@@ -25,7 +22,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 			binary: {
 				[binaryPropertyName]: binaryData,
 			},
-			pairedItem,
 		};
 
 		returnData.push(newItem);
@@ -35,7 +31,6 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 				json: {
 					error: error.message,
 				},
-				pairedItem,
 			});
 		} else {
 			throw error;
diff --git a/packages/nodes-base/nodes/Ssh/__schema__/v1.0.0/command/execute.json b/packages/nodes-base/nodes/Ssh/__schema__/v1.0.0/command/execute.json
new file mode 100644
index 0000000000..24b67f8a96
--- /dev/null
+++ b/packages/nodes-base/nodes/Ssh/__schema__/v1.0.0/command/execute.json
@@ -0,0 +1,20 @@
+{
+    "type": "object",
+    "properties": {
+        "signal": {
+            "type": "null"
+        },
+        "stdout": {
+            "type": "string"
+        },
+        "stderr": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "code",
+        "signal",
+        "stdout",
+        "stderr"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Ssh/__schema__/v1.0.0/file/upload.json b/packages/nodes-base/nodes/Ssh/__schema__/v1.0.0/file/upload.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Ssh/__schema__/v1.0.0/file/upload.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index f9b54e2a87..1e8accffa3 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -9,7 +9,6 @@ import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import type { IRecord } from './GenericFunction';
 import { apiRequest, apiRequestAllItems } from './GenericFunction';
-import { generatePairedItemData } from '../../utils/utilities';
 
 export class Stackby implements INodeType {
 	description: INodeTypeDescription = {
@@ -23,6 +22,7 @@ export class Stackby implements INodeType {
 		defaults: {
 			name: 'Stackby',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
@@ -283,11 +283,7 @@ export class Stackby implements INodeType {
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					const itemData = generatePairedItemData(items.length);
-					const executionErrorData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray({ error: error.message }),
-						{ itemData },
-					);
+					const executionErrorData = this.helpers.returnJsonArray({ error: error.message });
 					returnData.push(...executionErrorData);
 				} else {
 					throw error;
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
index 488a333bb8..1af5af70ba 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
@@ -25,6 +25,7 @@ export class Storyblok implements INodeType {
 		defaults: {
 			name: 'Storyblok',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Storyblok/__schema__/v1.0.0/story/getAll.json b/packages/nodes-base/nodes/Storyblok/__schema__/v1.0.0/story/getAll.json
new file mode 100644
index 0000000000..8ff13eab5f
--- /dev/null
+++ b/packages/nodes-base/nodes/Storyblok/__schema__/v1.0.0/story/getAll.json
@@ -0,0 +1,127 @@
+{
+    "type": "object",
+    "properties": {
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "uuid": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "full_slug": {
+            "type": "string"
+        },
+        "sort_by_date": {
+            "type": "null"
+        },
+        "position": {
+            "type": "integer"
+        },
+        "tag_list": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "is_startpage": {
+            "type": "boolean"
+        },
+        "group_id": {
+            "type": "string"
+        },
+        "path": {
+            "type": "null"
+        },
+        "deleted_at": {
+            "type": "null"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "is_folder": {
+            "type": "boolean"
+        },
+        "published": {
+            "type": "boolean"
+        },
+        "unpublished_changes": {
+            "type": "boolean"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "publish_at": {
+            "type": "null"
+        },
+        "expire_at": {
+            "type": "null"
+        },
+        "default_root": {
+            "type": "null"
+        },
+        "disble_fe_editor": {
+            "type": "boolean"
+        },
+        "disable_fe_editor": {
+            "type": "boolean"
+        },
+        "last_author": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "userid": {
+                    "type": "string"
+                },
+                "friendly_name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "userid",
+                "friendly_name",
+                "avatar"
+            ]
+        },
+        "last_author_id": {
+            "type": "integer"
+        },
+        "content_type": {
+            "type": "string"
+        },
+        "can_not_view": {
+            "type": "boolean"
+        },
+        "scheduled_dates": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "name",
+        "created_at",
+        "published_at",
+        "alternates",
+        "id",
+        "uuid",
+        "slug",
+        "full_slug",
+        "sort_by_date",
+        "position",
+        "tag_list",
+        "is_startpage",
+        "parent_id",
+        "group_id",
+        "first_published_at",
+        "path"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index 5980e16dfc..9e6490f694 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -32,6 +32,7 @@ export class Strapi implements INodeType {
 		defaults: {
 			name: 'Strapi',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Strapi/__schema__/v1.0.0/entry/getAll.json b/packages/nodes-base/nodes/Strapi/__schema__/v1.0.0/entry/getAll.json
new file mode 100644
index 0000000000..de107b0599
--- /dev/null
+++ b/packages/nodes-base/nodes/Strapi/__schema__/v1.0.0/entry/getAll.json
@@ -0,0 +1,123 @@
+{
+    "type": "object",
+    "properties": {
+        "data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "documentId": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "category": {
+                        "type": "string"
+                    },
+                    "vendor": {
+                        "type": "string"
+                    },
+                    "createdAt": {
+                        "type": "string"
+                    },
+                    "updatedAt": {
+                        "type": "string"
+                    },
+                    "publishedAt": {
+                        "type": "string"
+                    },
+                    "locale": {
+                        "type": "null"
+                    },
+                    "price_list": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "price": {
+                                    "type": "integer"
+                                },
+                                "user_level": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "price",
+                                "min_quantity",
+                                "max_quantity",
+                                "user_level"
+                            ]
+                        }
+                    },
+                    "inventory": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "location": {
+                                    "type": "string"
+                                },
+                                "quantity": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "location",
+                                "quantity"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        },
+        "meta": {
+            "type": "object",
+            "properties": {
+                "pagination": {
+                    "type": "object",
+                    "properties": {
+                        "page": {
+                            "type": "integer"
+                        },
+                        "pageSize": {
+                            "type": "integer"
+                        },
+                        "pageCount": {
+                            "type": "integer"
+                        },
+                        "total": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "page",
+                        "pageSize",
+                        "pageCount",
+                        "total"
+                    ]
+                }
+            },
+            "required": [
+                "pagination"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index e613945ced..0d39eb18ec 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -23,6 +23,7 @@ export class Strava implements INodeType {
 		defaults: {
 			name: 'Strava',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Strava/__schema__/v1.1.0/activity/getAll.json b/packages/nodes-base/nodes/Strava/__schema__/v1.1.0/activity/getAll.json
new file mode 100644
index 0000000000..928342c4ef
--- /dev/null
+++ b/packages/nodes-base/nodes/Strava/__schema__/v1.1.0/activity/getAll.json
@@ -0,0 +1,204 @@
+{
+    "type": "object",
+    "properties": {
+        "resource_state": {
+            "type": "integer"
+        },
+        "athlete": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "resource_state": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "resource_state"
+            ]
+        },
+        "name": {
+            "type": "string"
+        },
+        "moving_time": {
+            "type": "integer"
+        },
+        "elapsed_time": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "sport_type": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "start_date": {
+            "type": "string"
+        },
+        "start_date_local": {
+            "type": "string"
+        },
+        "timezone": {
+            "type": "string"
+        },
+        "utc_offset": {
+            "type": "integer"
+        },
+        "location_city": {
+            "type": "null"
+        },
+        "location_state": {
+            "type": "null"
+        },
+        "achievement_count": {
+            "type": "integer"
+        },
+        "kudos_count": {
+            "type": "integer"
+        },
+        "comment_count": {
+            "type": "integer"
+        },
+        "athlete_count": {
+            "type": "integer"
+        },
+        "photo_count": {
+            "type": "integer"
+        },
+        "map": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "summary_polyline": {
+                    "type": "string"
+                },
+                "resource_state": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "summary_polyline",
+                "resource_state"
+            ]
+        },
+        "trainer": {
+            "type": "boolean"
+        },
+        "commute": {
+            "type": "boolean"
+        },
+        "manual": {
+            "type": "boolean"
+        },
+        "private": {
+            "type": "boolean"
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "flagged": {
+            "type": "boolean"
+        },
+        "average_cadence": {
+            "type": "number"
+        },
+        "max_watts": {
+            "type": "integer"
+        },
+        "weighted_average_watts": {
+            "type": "integer"
+        },
+        "device_watts": {
+            "type": "boolean"
+        },
+        "has_heartrate": {
+            "type": "boolean"
+        },
+        "average_heartrate": {
+            "type": "number"
+        },
+        "max_heartrate": {
+            "type": "integer"
+        },
+        "heartrate_opt_out": {
+            "type": "boolean"
+        },
+        "display_hide_heartrate_option": {
+            "type": "boolean"
+        },
+        "upload_id_str": {
+            "type": "string"
+        },
+        "from_accepted_tag": {
+            "type": "boolean"
+        },
+        "pr_count": {
+            "type": "integer"
+        },
+        "total_photo_count": {
+            "type": "integer"
+        },
+        "has_kudoed": {
+            "type": "boolean"
+        },
+        "suffer_score": {
+            "type": "integer"
+        },
+        "average_temp": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "resource_state",
+        "athlete",
+        "name",
+        "distance",
+        "moving_time",
+        "elapsed_time",
+        "total_elevation_gain",
+        "type",
+        "sport_type",
+        "id",
+        "start_date",
+        "start_date_local",
+        "timezone",
+        "utc_offset",
+        "location_city",
+        "location_state",
+        "location_country",
+        "achievement_count",
+        "kudos_count",
+        "comment_count",
+        "athlete_count",
+        "photo_count",
+        "map",
+        "trainer",
+        "commute",
+        "manual",
+        "private",
+        "visibility",
+        "flagged",
+        "gear_id",
+        "start_latlng",
+        "end_latlng",
+        "average_speed",
+        "max_speed",
+        "has_heartrate",
+        "heartrate_opt_out",
+        "display_hide_heartrate_option",
+        "upload_id",
+        "external_id",
+        "from_accepted_tag",
+        "pr_count",
+        "total_photo_count",
+        "has_kudoed"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index 61435fada5..85415d7783 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -46,6 +46,7 @@ export class Stripe implements INodeType {
 		defaults: {
 			name: 'Stripe',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index d255550254..7aa8e62ced 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -877,12 +877,7 @@ export class StripeTrigger implements INodeType {
 					enabled_events: events,
 				};
 
-				let responseData;
-				try {
-					responseData = await stripeApiRequest.call(this, 'POST', endpoint, body);
-				} catch (error) {
-					throw error;
-				}
+				const responseData = await stripeApiRequest.call(this, 'POST', endpoint, body);
 
 				if (
 					responseData.id === undefined ||
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/balance/get.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/balance/get.json
new file mode 100644
index 0000000000..71eac1a22d
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/balance/get.json
@@ -0,0 +1,71 @@
+{
+    "type": "object",
+    "properties": {
+        "object": {
+            "type": "string"
+        },
+        "available": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "amount": {
+                        "type": "integer"
+                    },
+                    "currency": {
+                        "type": "string"
+                    },
+                    "source_types": {
+                        "type": "object",
+                        "properties": {
+                            "card": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "card"
+                        ]
+                    }
+                },
+                "required": [
+                    "amount",
+                    "currency",
+                    "source_types"
+                ]
+            }
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "pending": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "amount": {
+                        "type": "integer"
+                    },
+                    "currency": {
+                        "type": "string"
+                    },
+                    "source_types": {
+                        "type": "object",
+                        "properties": {
+                            "card": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "card"
+                        ]
+                    }
+                },
+                "required": [
+                    "amount",
+                    "currency",
+                    "source_types"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/charge/get.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/charge/get.json
new file mode 100644
index 0000000000..331c38afb1
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/charge/get.json
@@ -0,0 +1,480 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "object": {
+            "type": "string"
+        },
+        "amount": {
+            "type": "integer"
+        },
+        "amount_captured": {
+            "type": "integer"
+        },
+        "amount_refunded": {
+            "type": "integer"
+        },
+        "application_fee": {
+            "type": "null"
+        },
+        "application_fee_amount": {
+            "type": "null"
+        },
+        "billing_details": {
+            "type": "object",
+            "properties": {
+                "phone": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "address",
+                "email",
+                "name",
+                "phone"
+            ]
+        },
+        "calculated_statement_descriptor": {
+            "type": "string"
+        },
+        "captured": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "destination": {
+            "type": "null"
+        },
+        "dispute": {
+            "type": "null"
+        },
+        "disputed": {
+            "type": "boolean"
+        },
+        "failure_balance_transaction": {
+            "type": "null"
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "date_due": {
+                    "type": "string"
+                },
+                "erp_provider_dimension_id": {
+                    "type": "string"
+                },
+                "invoice_id": {
+                    "type": "string"
+                },
+                "period_end": {
+                    "type": "string"
+                },
+                "period_start": {
+                    "type": "string"
+                },
+                "reservation_id": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            }
+        },
+        "on_behalf_of": {
+            "type": "null"
+        },
+        "order": {
+            "type": "null"
+        },
+        "outcome": {
+            "type": "object",
+            "properties": {
+                "advice_code": {
+                    "type": "null"
+                },
+                "network_status": {
+                    "type": "string"
+                },
+                "risk_level": {
+                    "type": "string"
+                },
+                "risk_score": {
+                    "type": "integer"
+                },
+                "seller_message": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "network_status",
+                "reason",
+                "risk_level",
+                "seller_message",
+                "type"
+            ]
+        },
+        "paid": {
+            "type": "boolean"
+        },
+        "payment_intent": {
+            "type": "string"
+        },
+        "payment_method": {
+            "type": "string"
+        },
+        "payment_method_details": {
+            "type": "object",
+            "properties": {
+                "card": {
+                    "type": "object",
+                    "properties": {
+                        "brand": {
+                            "type": "string"
+                        },
+                        "country": {
+                            "type": "string"
+                        },
+                        "exp_month": {
+                            "type": "integer"
+                        },
+                        "exp_year": {
+                            "type": "integer"
+                        },
+                        "extended_authorization": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "status"
+                            ]
+                        },
+                        "fingerprint": {
+                            "type": "string"
+                        },
+                        "funding": {
+                            "type": "string"
+                        },
+                        "incremental_authorization": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "status"
+                            ]
+                        },
+                        "installments": {
+                            "type": "null"
+                        },
+                        "last4": {
+                            "type": "string"
+                        },
+                        "mandate": {
+                            "type": "null"
+                        },
+                        "multicapture": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "status"
+                            ]
+                        },
+                        "network": {
+                            "type": "string"
+                        },
+                        "network_token": {
+                            "type": "object",
+                            "properties": {
+                                "used": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "used"
+                            ]
+                        },
+                        "network_transaction_id": {
+                            "type": "string"
+                        },
+                        "overcapture": {
+                            "type": "object",
+                            "properties": {
+                                "maximum_amount_capturable": {
+                                    "type": "integer"
+                                },
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "maximum_amount_capturable",
+                                "status"
+                            ]
+                        },
+                        "regulated_status": {
+                            "type": "string"
+                        },
+                        "three_d_secure": {
+                            "type": "null"
+                        },
+                        "capture_before": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "amount_authorized",
+                        "authorization_code",
+                        "brand",
+                        "checks",
+                        "country",
+                        "exp_month",
+                        "exp_year",
+                        "extended_authorization",
+                        "fingerprint",
+                        "funding",
+                        "incremental_authorization",
+                        "installments",
+                        "last4",
+                        "mandate",
+                        "multicapture",
+                        "network",
+                        "network_token",
+                        "overcapture",
+                        "three_d_secure",
+                        "wallet"
+                    ]
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "card",
+                "type"
+            ]
+        },
+        "refunded": {
+            "type": "boolean"
+        },
+        "refunds": {
+            "type": "object",
+            "properties": {
+                "object": {
+                    "type": "string"
+                },
+                "data": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "object": {
+                                "type": "string"
+                            },
+                            "amount": {
+                                "type": "integer"
+                            },
+                            "balance_transaction": {
+                                "type": "string"
+                            },
+                            "charge": {
+                                "type": "string"
+                            },
+                            "created": {
+                                "type": "integer"
+                            },
+                            "currency": {
+                                "type": "string"
+                            },
+                            "destination_details": {
+                                "type": "object",
+                                "properties": {
+                                    "card": {
+                                        "type": "object",
+                                        "properties": {
+                                            "reference": {
+                                                "type": "string"
+                                            },
+                                            "reference_status": {
+                                                "type": "string"
+                                            },
+                                            "reference_type": {
+                                                "type": "string"
+                                            },
+                                            "type": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "required": [
+                                            "reference",
+                                            "reference_status",
+                                            "reference_type",
+                                            "type"
+                                        ]
+                                    },
+                                    "type": {
+                                        "type": "string"
+                                    }
+                                },
+                                "required": [
+                                    "card",
+                                    "type"
+                                ]
+                            },
+                            "payment_intent": {
+                                "type": "string"
+                            },
+                            "reason": {
+                                "type": "null"
+                            },
+                            "receipt_number": {
+                                "type": "string"
+                            },
+                            "source_transfer_reversal": {
+                                "type": "null"
+                            },
+                            "status": {
+                                "type": "string"
+                            },
+                            "transfer_reversal": {
+                                "type": "null"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "object",
+                            "amount",
+                            "balance_transaction",
+                            "charge",
+                            "created",
+                            "currency",
+                            "destination_details",
+                            "metadata",
+                            "payment_intent",
+                            "reason",
+                            "receipt_number",
+                            "source_transfer_reversal",
+                            "status",
+                            "transfer_reversal"
+                        ]
+                    }
+                },
+                "has_more": {
+                    "type": "boolean"
+                },
+                "total_count": {
+                    "type": "integer"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "object",
+                "data",
+                "has_more",
+                "total_count",
+                "url"
+            ]
+        },
+        "review": {
+            "type": "null"
+        },
+        "shipping": {
+            "type": "null"
+        },
+        "source": {
+            "type": "null"
+        },
+        "source_transfer": {
+            "type": "null"
+        },
+        "statement_descriptor": {
+            "type": "null"
+        },
+        "statement_descriptor_suffix": {
+            "type": "null"
+        },
+        "status": {
+            "type": "string"
+        },
+        "transfer_data": {
+            "type": "null"
+        },
+        "transfer_group": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "object",
+        "amount",
+        "amount_captured",
+        "amount_refunded",
+        "application",
+        "application_fee",
+        "application_fee_amount",
+        "balance_transaction",
+        "billing_details",
+        "calculated_statement_descriptor",
+        "captured",
+        "created",
+        "currency",
+        "customer",
+        "description",
+        "destination",
+        "dispute",
+        "disputed",
+        "failure_balance_transaction",
+        "failure_code",
+        "failure_message",
+        "fraud_details",
+        "invoice",
+        "livemode",
+        "metadata",
+        "on_behalf_of",
+        "order",
+        "outcome",
+        "paid",
+        "payment_intent",
+        "payment_method",
+        "payment_method_details",
+        "radar_options",
+        "receipt_email",
+        "receipt_number",
+        "receipt_url",
+        "refunded",
+        "review",
+        "shipping",
+        "source",
+        "source_transfer",
+        "statement_descriptor",
+        "statement_descriptor_suffix",
+        "status",
+        "transfer_data",
+        "transfer_group"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/charge/getAll.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/charge/getAll.json
new file mode 100644
index 0000000000..c5eb021b11
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/charge/getAll.json
@@ -0,0 +1,303 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "object": {
+            "type": "string"
+        },
+        "amount": {
+            "type": "integer"
+        },
+        "amount_captured": {
+            "type": "integer"
+        },
+        "amount_refunded": {
+            "type": "integer"
+        },
+        "application_fee": {
+            "type": "null"
+        },
+        "captured": {
+            "type": "boolean"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "destination": {
+            "type": "null"
+        },
+        "dispute": {
+            "type": "null"
+        },
+        "disputed": {
+            "type": "boolean"
+        },
+        "failure_balance_transaction": {
+            "type": "null"
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "on_behalf_of": {
+            "type": "null"
+        },
+        "order": {
+            "type": "null"
+        },
+        "outcome": {
+            "type": "object",
+            "properties": {
+                "network_status": {
+                    "type": "string"
+                },
+                "risk_level": {
+                    "type": "string"
+                },
+                "seller_message": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "network_status",
+                "reason",
+                "risk_level",
+                "seller_message",
+                "type"
+            ]
+        },
+        "paid": {
+            "type": "boolean"
+        },
+        "payment_intent": {
+            "type": "string"
+        },
+        "payment_method": {
+            "type": "string"
+        },
+        "payment_method_details": {
+            "type": "object",
+            "properties": {
+                "card": {
+                    "type": "object",
+                    "properties": {
+                        "brand": {
+                            "type": "string"
+                        },
+                        "country": {
+                            "type": "string"
+                        },
+                        "exp_month": {
+                            "type": "integer"
+                        },
+                        "exp_year": {
+                            "type": "integer"
+                        },
+                        "extended_authorization": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "status"
+                            ]
+                        },
+                        "fingerprint": {
+                            "type": "string"
+                        },
+                        "funding": {
+                            "type": "string"
+                        },
+                        "incremental_authorization": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "status"
+                            ]
+                        },
+                        "installments": {
+                            "type": "null"
+                        },
+                        "last4": {
+                            "type": "string"
+                        },
+                        "mandate": {
+                            "type": "null"
+                        },
+                        "multicapture": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "status"
+                            ]
+                        },
+                        "network": {
+                            "type": "string"
+                        },
+                        "network_token": {
+                            "type": "object",
+                            "properties": {
+                                "used": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "required": [
+                                "used"
+                            ]
+                        },
+                        "overcapture": {
+                            "type": "object",
+                            "properties": {
+                                "maximum_amount_capturable": {
+                                    "type": "integer"
+                                },
+                                "status": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "maximum_amount_capturable",
+                                "status"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "amount_authorized",
+                        "authorization_code",
+                        "brand",
+                        "checks",
+                        "country",
+                        "exp_month",
+                        "exp_year",
+                        "extended_authorization",
+                        "fingerprint",
+                        "funding",
+                        "incremental_authorization",
+                        "installments",
+                        "last4",
+                        "mandate",
+                        "multicapture",
+                        "network",
+                        "network_token",
+                        "overcapture",
+                        "three_d_secure",
+                        "wallet"
+                    ]
+                },
+                "type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "type"
+            ]
+        },
+        "refunded": {
+            "type": "boolean"
+        },
+        "review": {
+            "type": "null"
+        },
+        "source_transfer": {
+            "type": "null"
+        },
+        "status": {
+            "type": "string"
+        },
+        "transfer_data": {
+            "type": "null"
+        },
+        "transfer_group": {
+            "type": "null"
+        },
+        "refunds": {
+            "type": "object",
+            "properties": {
+                "object": {
+                    "type": "string"
+                },
+                "has_more": {
+                    "type": "boolean"
+                },
+                "total_count": {
+                    "type": "integer"
+                },
+                "url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "object",
+                "data",
+                "has_more",
+                "total_count",
+                "url"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "object",
+        "amount",
+        "amount_captured",
+        "amount_refunded",
+        "application",
+        "application_fee",
+        "application_fee_amount",
+        "balance_transaction",
+        "billing_details",
+        "calculated_statement_descriptor",
+        "captured",
+        "created",
+        "currency",
+        "customer",
+        "description",
+        "destination",
+        "dispute",
+        "disputed",
+        "failure_balance_transaction",
+        "failure_code",
+        "failure_message",
+        "fraud_details",
+        "invoice",
+        "livemode",
+        "metadata",
+        "on_behalf_of",
+        "order",
+        "outcome",
+        "paid",
+        "payment_intent",
+        "payment_method",
+        "payment_method_details",
+        "receipt_email",
+        "receipt_number",
+        "receipt_url",
+        "refunded",
+        "review",
+        "shipping",
+        "source",
+        "source_transfer",
+        "statement_descriptor",
+        "statement_descriptor_suffix",
+        "status",
+        "transfer_data",
+        "transfer_group"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/create.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/create.json
new file mode 100644
index 0000000000..4339a60ce4
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/create.json
@@ -0,0 +1,90 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "object": {
+            "type": "string"
+        },
+        "balance": {
+            "type": "integer"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "currency": {
+            "type": "null"
+        },
+        "default_source": {
+            "type": "null"
+        },
+        "delinquent": {
+            "type": "boolean"
+        },
+        "discount": {
+            "type": "null"
+        },
+        "invoice_prefix": {
+            "type": "string"
+        },
+        "invoice_settings": {
+            "type": "object",
+            "properties": {
+                "custom_fields": {
+                    "type": "null"
+                },
+                "default_payment_method": {
+                    "type": "null"
+                },
+                "footer": {
+                    "type": "null"
+                },
+                "rendering_options": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "custom_fields",
+                "default_payment_method",
+                "footer",
+                "rendering_options"
+            ]
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "tax_exempt": {
+            "type": "string"
+        },
+        "test_clock": {
+            "type": "null"
+        },
+        "next_invoice_sequence": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id",
+        "object",
+        "address",
+        "balance",
+        "created",
+        "currency",
+        "default_source",
+        "delinquent",
+        "description",
+        "discount",
+        "email",
+        "invoice_prefix",
+        "invoice_settings",
+        "livemode",
+        "metadata",
+        "name",
+        "phone",
+        "preferred_locales",
+        "shipping",
+        "tax_exempt",
+        "test_clock"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/get.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/get.json
new file mode 100644
index 0000000000..19a5c344d5
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/get.json
@@ -0,0 +1,58 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "object": {
+            "type": "string"
+        },
+        "balance": {
+            "type": "integer"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "delinquent": {
+            "type": "boolean"
+        },
+        "discount": {
+            "type": "null"
+        },
+        "invoice_prefix": {
+            "type": "string"
+        },
+        "invoice_settings": {
+            "type": "object",
+            "properties": {
+                "custom_fields": {
+                    "type": "null"
+                },
+                "footer": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "custom_fields",
+                "default_payment_method",
+                "footer",
+                "rendering_options"
+            ]
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "next_invoice_sequence": {
+            "type": "integer"
+        },
+        "preferred_locales": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "tax_exempt": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/getAll.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/getAll.json
new file mode 100644
index 0000000000..37b5a08f1b
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/getAll.json
@@ -0,0 +1,81 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "object": {
+            "type": "string"
+        },
+        "balance": {
+            "type": "integer"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "delinquent": {
+            "type": "boolean"
+        },
+        "invoice_prefix": {
+            "type": "string"
+        },
+        "invoice_settings": {
+            "type": "object",
+            "properties": {
+                "custom_fields": {
+                    "type": "null"
+                },
+                "footer": {
+                    "type": "null"
+                },
+                "rendering_options": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "custom_fields",
+                "default_payment_method",
+                "footer",
+                "rendering_options"
+            ]
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "preferred_locales": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "tax_exempt": {
+            "type": "string"
+        },
+        "test_clock": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "object",
+        "address",
+        "balance",
+        "created",
+        "currency",
+        "default_source",
+        "delinquent",
+        "description",
+        "discount",
+        "email",
+        "invoice_prefix",
+        "invoice_settings",
+        "livemode",
+        "metadata",
+        "name",
+        "phone",
+        "preferred_locales",
+        "shipping",
+        "tax_exempt",
+        "test_clock"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/update.json b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/update.json
new file mode 100644
index 0000000000..52b2c53ec1
--- /dev/null
+++ b/packages/nodes-base/nodes/Stripe/__schema__/v1.0.0/customer/update.json
@@ -0,0 +1,120 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "object": {
+            "type": "string"
+        },
+        "address": {
+            "type": "object",
+            "properties": {
+                "country": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "city",
+                "country",
+                "line1",
+                "line2",
+                "postal_code",
+                "state"
+            ]
+        },
+        "balance": {
+            "type": "integer"
+        },
+        "created": {
+            "type": "integer"
+        },
+        "default_source": {
+            "type": "null"
+        },
+        "delinquent": {
+            "type": "boolean"
+        },
+        "discount": {
+            "type": "null"
+        },
+        "invoice_prefix": {
+            "type": "string"
+        },
+        "invoice_settings": {
+            "type": "object",
+            "properties": {
+                "custom_fields": {
+                    "type": "null"
+                },
+                "footer": {
+                    "type": "null"
+                },
+                "rendering_options": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "custom_fields",
+                "default_payment_method",
+                "footer",
+                "rendering_options"
+            ]
+        },
+        "livemode": {
+            "type": "boolean"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "Telefone": {
+                    "type": "string"
+                },
+                "Pais": {
+                    "type": "string"
+                }
+            }
+        },
+        "next_invoice_sequence": {
+            "type": "integer"
+        },
+        "preferred_locales": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "shipping": {
+            "type": "null"
+        },
+        "tax_exempt": {
+            "type": "string"
+        },
+        "test_clock": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id",
+        "object",
+        "address",
+        "balance",
+        "created",
+        "currency",
+        "default_source",
+        "delinquent",
+        "description",
+        "discount",
+        "email",
+        "invoice_prefix",
+        "invoice_settings",
+        "livemode",
+        "metadata",
+        "name",
+        "phone",
+        "preferred_locales",
+        "shipping",
+        "tax_exempt",
+        "test_clock"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/create.json b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/create.json
new file mode 100644
index 0000000000..cc38346b65
--- /dev/null
+++ b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/create.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "created_at": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/delete.json b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/delete.json
new file mode 100644
index 0000000000..c5cfa5775d
--- /dev/null
+++ b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/delete.json
@@ -0,0 +1,47 @@
+{
+    "type": "object",
+    "properties": {
+        "content": {
+            "type": "string"
+        },
+        "metadata": {
+            "type": "object",
+            "properties": {
+                "loc": {
+                    "type": "object",
+                    "properties": {
+                        "lines": {
+                            "type": "object",
+                            "properties": {
+                                "to": {
+                                    "type": "integer"
+                                },
+                                "from": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "to",
+                                "from"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "lines"
+                    ]
+                },
+                "source": {
+                    "type": "string"
+                },
+                "blobType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "loc",
+                "source",
+                "blobType"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/get.json b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/get.json
new file mode 100644
index 0000000000..cc38346b65
--- /dev/null
+++ b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/get.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "created_at": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/update.json b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/update.json
new file mode 100644
index 0000000000..cc38346b65
--- /dev/null
+++ b/packages/nodes-base/nodes/Supabase/__schema__/v1.0.0/row/update.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "created_at": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
index a8bf3b59af..51a8fb3148 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
@@ -21,6 +21,7 @@ export class SyncroMspV1 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index d27502ffd3..3cb0c47b5c 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -39,6 +39,7 @@ export class Taiga implements INodeType {
 		defaults: {
 			name: 'Taiga',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index fd6e958477..e2b63db0cb 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -29,6 +29,7 @@ export class Tapfiliate implements INodeType {
 		defaults: {
 			name: 'Tapfiliate',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
index 309b23c176..bbfeb6dbbd 100644
--- a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
@@ -10,6 +10,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import { getSendAndWaitConfig } from '../../utils/sendAndWait/utils';
+import { createUtmCampaignLink } from '../../utils/utilities';
+
 // Interface in n8n
 export interface IMarkupKeyboard {
 	rows?: IMarkupKeyboardRow[];
@@ -78,9 +81,7 @@ export function addAdditionalFields(
 
 	if (operation === 'sendMessage') {
 		const attributionText = 'This message was sent automatically with ';
-		const link = `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
-			'n8n-nodes-base.telegram',
-		)}${instanceId ? '_' + instanceId : ''}`;
+		const link = createUtmCampaignLink('n8n-nodes-base.telegram', instanceId);
 
 		if (nodeVersion && nodeVersion >= 1.1 && additionalFields.appendAttribution === undefined) {
 			additionalFields.appendAttribution = true;
@@ -252,3 +253,34 @@ export function getSecretToken(this: IHookFunctions | IWebhookFunctions) {
 	const secret_token = `${this.getWorkflow().id}_${this.getNode().id}`;
 	return secret_token.replace(/[^a-zA-Z0-9\_\-]+/g, '');
 }
+
+export function createSendAndWaitMessageBody(context: IExecuteFunctions) {
+	const chat_id = context.getNodeParameter('chatId', 0) as string;
+
+	const config = getSendAndWaitConfig(context);
+	let text = config.message;
+
+	const instanceId = context.getInstanceId();
+	const attributionText = 'This message was sent automatically with ';
+	const link = createUtmCampaignLink('n8n-nodes-base.telegram', instanceId);
+	text = `${text}\n\n_${attributionText}_[n8n](${link})`;
+
+	const body = {
+		chat_id,
+		text,
+		disable_web_page_preview: true,
+		parse_mode: 'Markdown',
+		reply_markup: {
+			inline_keyboard: [
+				config.options.map((option) => {
+					return {
+						text: option.label,
+						url: `${config.url}?approved=${option.value}`,
+					};
+				}),
+			],
+		},
+	};
+
+	return body;
+}
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.json b/packages/nodes-base/nodes/Telegram/Telegram.node.json
index e2b275228a..c5f924c32b 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.json
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.json
@@ -2,7 +2,11 @@
 	"node": "n8n-nodes-base.telegram",
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
-	"categories": ["Communication"],
+	"categories": ["Communication", "HITL"],
+	"subcategories": {
+		"HITL": ["Human in the Loop"]
+	},
+	"alias": ["human", "form", "wait", "hitl", "approval"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 7d1d37b09f..6f7e4906e3 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -6,11 +6,27 @@ import type {
 	INodeTypeDescription,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
-import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import {
+	BINARY_ENCODING,
+	SEND_AND_WAIT_OPERATION,
+	NodeConnectionType,
+	NodeOperationError,
+} from 'n8n-workflow';
 import type { Readable } from 'stream';
 
-import { addAdditionalFields, apiRequest, getPropertyName } from './GenericFunctions';
+import {
+	addAdditionalFields,
+	apiRequest,
+	createSendAndWaitMessageBody,
+	getPropertyName,
+} from './GenericFunctions';
 import { appendAttributionOption } from '../../utils/descriptions';
+import { sendAndWaitWebhooksDescription } from '../../utils/sendAndWait/descriptions';
+import {
+	configureWaitTillDate,
+	getSendAndWaitProperties,
+	sendAndWaitWebhook,
+} from '../../utils/sendAndWait/utils';
 
 export class Telegram implements INodeType {
 	description: INodeTypeDescription = {
@@ -33,6 +49,7 @@ export class Telegram implements INodeType {
 				required: true,
 			},
 		],
+		webhooks: sendAndWaitWebhooksDescription,
 		properties: [
 			{
 				displayName: 'Resource',
@@ -263,6 +280,12 @@ export class Telegram implements INodeType {
 						description: 'Send a text message',
 						action: 'Send a text message',
 					},
+					{
+						name: 'Send and Wait for Response',
+						value: SEND_AND_WAIT_OPERATION,
+						description: 'Send a message and wait for response',
+						action: 'Send message and wait for response',
+					},
 					{
 						name: 'Send Photo',
 						value: 'sendPhoto',
@@ -1735,9 +1758,31 @@ export class Telegram implements INodeType {
 					},
 				],
 			},
+			...getSendAndWaitProperties(
+				[
+					{
+						displayName: 'Chat ID',
+						name: 'chatId',
+						type: 'string',
+						default: '',
+						required: true,
+						description:
+							'Unique identifier for the target chat or username of the target channel (in the format @channelusername). To find your chat ID ask @get_id_bot.',
+					},
+				],
+				'message',
+				undefined,
+				{
+					noButtonStyle: true,
+					defaultApproveLabel: '✅ Approve',
+					defaultDisapproveLabel: '❌ Decline',
+				},
+			).filter((p) => p.name !== 'subject'),
 		],
 	};
 
+	webhook = sendAndWaitWebhook;
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
@@ -1757,6 +1802,17 @@ export class Telegram implements INodeType {
 		const nodeVersion = this.getNode().typeVersion;
 		const instanceId = this.getInstanceId();
 
+		if (resource === 'message' && operation === SEND_AND_WAIT_OPERATION) {
+			body = createSendAndWaitMessageBody(this);
+
+			await apiRequest.call(this, 'POST', 'sendMessage', body);
+
+			const waitTill = configureWaitTillDate(this);
+
+			await this.putExecutionToWait(waitTill);
+			return [this.getInputData()];
+		}
+
 		for (let i = 0; i < items.length; i++) {
 			try {
 				// Reset all values
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/callback/answerQuery.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/callback/answerQuery.json
new file mode 100644
index 0000000000..02ca8aa863
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/callback/answerQuery.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/administrators.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/administrators.json
new file mode 100644
index 0000000000..5022ccd4f8
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/administrators.json
@@ -0,0 +1,41 @@
+{
+    "type": "object",
+    "properties": {
+        "user": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "is_bot": {
+                    "type": "boolean"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "language_code": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "is_bot",
+                "first_name"
+            ]
+        },
+        "status": {
+            "type": "string"
+        },
+        "is_anonymous": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "user",
+        "status",
+        "is_anonymous"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/get.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/get.json
new file mode 100644
index 0000000000..1a30407a18
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/get.json
@@ -0,0 +1,47 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "first_name": {
+                    "type": "string"
+                },
+                "username": {
+                    "type": "string"
+                },
+                "type": {
+                    "type": "string"
+                },
+                "active_usernames": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "max_reaction_count": {
+                    "type": "integer"
+                },
+                "accent_color_id": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "id",
+                "type",
+                "max_reaction_count",
+                "accent_color_id"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/member.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/member.json
new file mode 100644
index 0000000000..4916fa6fd9
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/chat/member.json
@@ -0,0 +1,52 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "user": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "language_code": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name"
+                    ]
+                },
+                "status": {
+                    "type": "string"
+                },
+                "is_anonymous": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "user",
+                "status"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/file/get.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/file/get.json
new file mode 100644
index 0000000000..a263fffe4f
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/file/get.json
@@ -0,0 +1,35 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "file_id": {
+                    "type": "string"
+                },
+                "file_unique_id": {
+                    "type": "string"
+                },
+                "file_size": {
+                    "type": "integer"
+                },
+                "file_path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "file_id",
+                "file_unique_id",
+                "file_size",
+                "file_path"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/deleteMessage.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/deleteMessage.json
new file mode 100644
index 0000000000..986fc4cb25
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/deleteMessage.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/editMessageText.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/editMessageText.json
new file mode 100644
index 0000000000..dae661ff1d
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/editMessageText.json
@@ -0,0 +1,80 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "edit_date": {
+                    "type": "integer"
+                },
+                "text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "message_id",
+                "chat",
+                "date",
+                "edit_date",
+                "text"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/pinChatMessage.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/pinChatMessage.json
new file mode 100644
index 0000000000..02ca8aa863
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/pinChatMessage.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendAnimation.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendAnimation.json
new file mode 100644
index 0000000000..1200e90d3d
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendAnimation.json
@@ -0,0 +1,176 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "first_name",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "sticker": {
+                    "type": "object",
+                    "properties": {
+                        "width": {
+                            "type": "integer"
+                        },
+                        "height": {
+                            "type": "integer"
+                        },
+                        "emoji": {
+                            "type": "string"
+                        },
+                        "set_name": {
+                            "type": "string"
+                        },
+                        "is_animated": {
+                            "type": "boolean"
+                        },
+                        "is_video": {
+                            "type": "boolean"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "thumbnail": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "thumb": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "file_id": {
+                            "type": "string"
+                        },
+                        "file_unique_id": {
+                            "type": "string"
+                        },
+                        "file_size": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "width",
+                        "height",
+                        "emoji",
+                        "is_animated",
+                        "is_video",
+                        "type",
+                        "thumbnail",
+                        "thumb",
+                        "file_id",
+                        "file_unique_id",
+                        "file_size"
+                    ]
+                }
+            },
+            "required": [
+                "message_id",
+                "from",
+                "chat",
+                "date"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendAudio.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendAudio.json
new file mode 100644
index 0000000000..b09b01b05a
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendAudio.json
@@ -0,0 +1,104 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "last_name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "audio": {
+                    "type": "object",
+                    "properties": {
+                        "duration": {
+                            "type": "integer"
+                        },
+                        "file_name": {
+                            "type": "string"
+                        },
+                        "mime_type": {
+                            "type": "string"
+                        },
+                        "file_id": {
+                            "type": "string"
+                        },
+                        "file_unique_id": {
+                            "type": "string"
+                        },
+                        "file_size": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "duration",
+                        "file_name",
+                        "mime_type",
+                        "file_id",
+                        "file_unique_id",
+                        "file_size"
+                    ]
+                }
+            },
+            "required": [
+                "message_id",
+                "from",
+                "chat",
+                "date"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendChatAction.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendChatAction.json
new file mode 100644
index 0000000000..02ca8aa863
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendChatAction.json
@@ -0,0 +1,15 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendDocument.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendDocument.json
new file mode 100644
index 0000000000..94f55cbec0
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendDocument.json
@@ -0,0 +1,101 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "last_name": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "document": {
+                    "type": "object",
+                    "properties": {
+                        "file_name": {
+                            "type": "string"
+                        },
+                        "file_id": {
+                            "type": "string"
+                        },
+                        "file_unique_id": {
+                            "type": "string"
+                        },
+                        "file_size": {
+                            "type": "integer"
+                        },
+                        "mime_type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "file_name",
+                        "file_id",
+                        "file_unique_id",
+                        "file_size"
+                    ]
+                }
+            },
+            "required": [
+                "message_id",
+                "chat",
+                "date"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendLocation.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendLocation.json
new file mode 100644
index 0000000000..66f27a32ea
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendLocation.json
@@ -0,0 +1,85 @@
+{
+	"type": "object",
+	"properties": {
+		"ok": {
+			"type": "boolean"
+		},
+		"result": {
+			"type": "object",
+			"properties": {
+				"message_id": {
+					"type": "integer"
+				},
+				"from": {
+					"type": "object",
+					"properties": {
+						"id": {
+							"type": "integer"
+						},
+						"is_bot": {
+							"type": "boolean"
+						},
+						"first_name": {
+							"type": "string"
+						},
+						"username": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"id",
+						"is_bot",
+						"first_name",
+						"username"
+					]
+				},
+				"chat": {
+					"type": "object",
+					"properties": {
+						"id": {
+							"type": "integer"
+						},
+						"type": {
+							"type": "string"
+						},
+						"first_name": {
+							"type": "string"
+						}
+					},
+					"required": [
+						"id",
+						"type"
+					]
+				},
+				"date": {
+					"type": "integer"
+				},
+				"location": {
+					"type": "object",
+					"properties": {
+						"latitude": {
+							"type": "number"
+						},
+						"longitude": {
+							"type": "number"
+						}
+					},
+					"required": [
+						"latitude",
+						"longitude"
+					]
+				}
+			},
+			"required": [
+				"message_id",
+				"chat",
+				"date",
+				"location"
+			]
+		}
+	},
+	"required": [
+		"ok",
+		"result"
+	]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendMediaGroup.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendMediaGroup.json
new file mode 100644
index 0000000000..4201ad646e
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendMediaGroup.json
@@ -0,0 +1,130 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "message_id": {
+                        "type": "integer"
+                    },
+                    "from": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "is_bot": {
+                                "type": "boolean"
+                            },
+                            "first_name": {
+                                "type": "string"
+                            },
+                            "username": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "is_bot",
+                            "first_name",
+                            "username"
+                        ]
+                    },
+                    "chat": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "first_name": {
+                                "type": "string"
+                            },
+                            "username": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "type"
+                        ]
+                    },
+                    "date": {
+                        "type": "integer"
+                    },
+                    "photo": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        }
+                    },
+                    "caption": {
+                        "type": "string"
+                    },
+                    "caption_entities": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "offset": {
+                                    "type": "integer"
+                                },
+                                "length": {
+                                    "type": "integer"
+                                },
+                                "type": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "offset",
+                                "length",
+                                "type"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "message_id",
+                    "chat",
+                    "date"
+                ]
+            }
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendMessage.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendMessage.json
new file mode 100644
index 0000000000..68b40cee74
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendMessage.json
@@ -0,0 +1,110 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "text": {
+                    "type": "string"
+                },
+                "entities": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "offset": {
+                                "type": "integer"
+                            },
+                            "length": {
+                                "type": "integer"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "url": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "offset",
+                            "length",
+                            "type"
+                        ]
+                    }
+                },
+                "link_preview_options": {
+                    "type": "object",
+                    "properties": {
+                        "is_disabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "is_disabled"
+                    ]
+                }
+            },
+            "required": [
+                "message_id",
+                "from",
+                "chat",
+                "date",
+                "text"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendPhoto.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendPhoto.json
new file mode 100644
index 0000000000..7d36d8f07a
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendPhoto.json
@@ -0,0 +1,103 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "photo": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "file_id": {
+                                "type": "string"
+                            },
+                            "file_unique_id": {
+                                "type": "string"
+                            },
+                            "file_size": {
+                                "type": "integer"
+                            },
+                            "width": {
+                                "type": "integer"
+                            },
+                            "height": {
+                                "type": "integer"
+                            }
+                        },
+                        "required": [
+                            "file_id",
+                            "file_unique_id",
+                            "file_size",
+                            "width",
+                            "height"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "message_id",
+                "chat",
+                "date",
+                "photo"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendSticker.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendSticker.json
new file mode 100644
index 0000000000..59de9e9c95
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendSticker.json
@@ -0,0 +1,177 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "last_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "sticker": {
+                    "type": "object",
+                    "properties": {
+                        "width": {
+                            "type": "integer"
+                        },
+                        "height": {
+                            "type": "integer"
+                        },
+                        "emoji": {
+                            "type": "string"
+                        },
+                        "set_name": {
+                            "type": "string"
+                        },
+                        "is_animated": {
+                            "type": "boolean"
+                        },
+                        "is_video": {
+                            "type": "boolean"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "thumbnail": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "thumb": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "file_id": {
+                            "type": "string"
+                        },
+                        "file_unique_id": {
+                            "type": "string"
+                        },
+                        "file_size": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "width",
+                        "height",
+                        "is_animated",
+                        "is_video",
+                        "type",
+                        "thumbnail",
+                        "thumb",
+                        "file_id",
+                        "file_unique_id",
+                        "file_size"
+                    ]
+                }
+            },
+            "required": [
+                "message_id",
+                "from",
+                "chat",
+                "date"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendVideo.json b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendVideo.json
new file mode 100644
index 0000000000..7423857a06
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/__schema__/v1.2.0/message/sendVideo.json
@@ -0,0 +1,167 @@
+{
+    "type": "object",
+    "properties": {
+        "ok": {
+            "type": "boolean"
+        },
+        "result": {
+            "type": "object",
+            "properties": {
+                "message_id": {
+                    "type": "integer"
+                },
+                "from": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "is_bot": {
+                            "type": "boolean"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "is_bot",
+                        "first_name",
+                        "username"
+                    ]
+                },
+                "chat": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "integer"
+                        },
+                        "type": {
+                            "type": "string"
+                        },
+                        "first_name": {
+                            "type": "string"
+                        },
+                        "username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "type"
+                    ]
+                },
+                "date": {
+                    "type": "integer"
+                },
+                "caption": {
+                    "type": "string"
+                },
+                "video": {
+                    "type": "object",
+                    "properties": {
+                        "duration": {
+                            "type": "integer"
+                        },
+                        "width": {
+                            "type": "integer"
+                        },
+                        "height": {
+                            "type": "integer"
+                        },
+                        "file_name": {
+                            "type": "string"
+                        },
+                        "mime_type": {
+                            "type": "string"
+                        },
+                        "thumbnail": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "thumb": {
+                            "type": "object",
+                            "properties": {
+                                "file_id": {
+                                    "type": "string"
+                                },
+                                "file_unique_id": {
+                                    "type": "string"
+                                },
+                                "file_size": {
+                                    "type": "integer"
+                                },
+                                "width": {
+                                    "type": "integer"
+                                },
+                                "height": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "file_id",
+                                "file_unique_id",
+                                "file_size",
+                                "width",
+                                "height"
+                            ]
+                        },
+                        "file_id": {
+                            "type": "string"
+                        },
+                        "file_unique_id": {
+                            "type": "string"
+                        },
+                        "file_size": {
+                            "type": "integer"
+                        }
+                    },
+                    "required": [
+                        "duration",
+                        "width",
+                        "height",
+                        "mime_type",
+                        "file_id",
+                        "file_unique_id",
+                        "file_size"
+                    ]
+                }
+            },
+            "required": [
+                "message_id",
+                "chat",
+                "date"
+            ]
+        }
+    },
+    "required": [
+        "ok",
+        "result"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
index ad6a04dba3..c752eba158 100644
--- a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
+++ b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
@@ -19,8 +19,6 @@ import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Help
 describe('Telegram', () => {
 	describe('Run Telegram workflow', () => {
 		beforeAll(() => {
-			nock.disableNetConnect();
-
 			const { baseUrl } = FAKE_CREDENTIALS_DATA.telegramApi;
 			const mock = nock(baseUrl);
 
@@ -43,10 +41,6 @@ describe('Telegram', () => {
 			mock.post('/bottestToken/getChatMember').reply(200, getMemberResponse);
 		});
 
-		afterAll(() => {
-			nock.restore();
-		});
-
 		const workflows = getWorkflowFilenames(__dirname);
 		testWorkflows(workflows);
 	});
diff --git a/packages/nodes-base/nodes/Telegram/tests/node/sendAndWait.operation.test.ts b/packages/nodes-base/nodes/Telegram/tests/node/sendAndWait.operation.test.ts
new file mode 100644
index 0000000000..8acd58eed5
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/tests/node/sendAndWait.operation.test.ts
@@ -0,0 +1,71 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import { type INode, SEND_AND_WAIT_OPERATION, type IExecuteFunctions } from 'n8n-workflow';
+
+import * as genericFunctions from '../../GenericFunctions';
+import { Telegram } from '../../Telegram.node';
+
+jest.mock('../../GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../GenericFunctions');
+	return {
+		...originalModule,
+		apiRequest: jest.fn(),
+	};
+});
+
+describe('Test Telegram, message => sendAndWait', () => {
+	let telegram: Telegram;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		telegram = new Telegram();
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should send message and put execution to wait', async () => {
+		const items = [{ json: { data: 'test' } }];
+		//node
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(SEND_AND_WAIT_OPERATION);
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(false);
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>());
+		mockExecuteFunctions.getInstanceId.mockReturnValue('instanceId');
+
+		//createSendAndWaitMessageBody
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('chatID');
+
+		//getSendAndWaitConfig
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my message');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('my subject');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('http://localhost/waiting-webhook');
+		mockExecuteFunctions.evaluateExpression.mockReturnValueOnce('nodeID');
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({});
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('approval');
+
+		// configureWaitTillDate
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({}); //options.limitWaitTime.values
+
+		const result = await telegram.execute.call(mockExecuteFunctions);
+
+		expect(result).toEqual([items]);
+		expect(genericFunctions.apiRequest).toHaveBeenCalledTimes(1);
+		expect(mockExecuteFunctions.putExecutionToWait).toHaveBeenCalledTimes(1);
+
+		expect(genericFunctions.apiRequest).toHaveBeenCalledWith('POST', 'sendMessage', {
+			chat_id: 'chatID',
+			disable_web_page_preview: true,
+			parse_mode: 'Markdown',
+			reply_markup: {
+				inline_keyboard: [
+					[{ text: 'Approve', url: 'http://localhost/waiting-webhook/nodeID?approved=true' }],
+				],
+			},
+			text: 'my message\n\n_This message was sent automatically with _[n8n](https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram_instanceId)',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 26946664a8..502259242d 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -43,6 +43,7 @@ export class TheHive implements INodeType {
 		defaults: {
 			name: 'TheHive',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
index 9763d3e46d..8594132a92 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
@@ -21,6 +21,7 @@ export const description: INodeTypeDescription = {
 	defaults: {
 		name: 'TheHive 5',
 	},
+	usableAsTool: true,
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
 	credentials: [
diff --git a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
index 0d370dc675..68b3af2997 100644
--- a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
@@ -1,5 +1,4 @@
 import type { IExecuteFunctions } from 'n8n-workflow';
-import nock from 'nock';
 
 import { theHiveApiQuery } from '../transport/queryHelper';
 import * as transport from '../transport/requestApi';
@@ -17,15 +16,6 @@ jest.mock('../transport/requestApi', () => {
 const fakeExecuteFunction = {} as unknown as IExecuteFunctions;
 
 describe('Test TheHiveProject, theHiveApiQuery', () => {
-	beforeAll(() => {
-		nock.disableNetConnect();
-	});
-
-	afterAll(() => {
-		nock.restore();
-		jest.unmock('../transport/requestApi');
-	});
-
 	it('should make list query request', async () => {
 		const scope = {
 			query: 'listOrganisationPage',
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index f485f9c8de..f6ce812e87 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -20,6 +20,7 @@ export class TimescaleDb implements INodeType {
 		defaults: {
 			name: 'TimescaleDB',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		parameterPane: 'wide',
diff --git a/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/close.json b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/close.json
new file mode 100644
index 0000000000..1be032ad85
--- /dev/null
+++ b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/close.json
@@ -0,0 +1,11 @@
+{
+	"type": "object",
+	"properties": {
+		"success": {
+			"type": "boolean"
+		}
+	},
+	"required": [
+		"success"
+	]
+}
diff --git a/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/create.json b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/create.json
new file mode 100644
index 0000000000..440a639c39
--- /dev/null
+++ b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/create.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "assigner_id": {
+            "type": "null"
+        },
+        "assignee_id": {
+            "type": "null"
+        },
+        "project_id": {
+            "type": "string"
+        },
+        "order": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "is_completed": {
+            "type": "boolean"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "comment_count": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "null"
+        },
+        "deadline": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/get.json b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/get.json
new file mode 100644
index 0000000000..1f3d9c1ef6
--- /dev/null
+++ b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/get.json
@@ -0,0 +1,50 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "assigner_id": {
+            "type": "null"
+        },
+        "assignee_id": {
+            "type": "null"
+        },
+        "project_id": {
+            "type": "string"
+        },
+        "order": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "is_completed": {
+            "type": "boolean"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "comment_count": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/getAll.json b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/getAll.json
new file mode 100644
index 0000000000..8355899458
--- /dev/null
+++ b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/getAll.json
@@ -0,0 +1,82 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "project_id": {
+            "type": "string"
+        },
+        "order": {
+            "type": "integer"
+        },
+        "content": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "is_completed": {
+            "type": "boolean"
+        },
+        "priority": {
+            "type": "integer"
+        },
+        "comment_count": {
+            "type": "integer"
+        },
+        "creator_id": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "due": {
+            "type": "object",
+            "properties": {
+                "date": {
+                    "type": "string"
+                },
+                "string": {
+                    "type": "string"
+                },
+                "lang": {
+                    "type": "string"
+                },
+                "is_recurring": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "date",
+                "string",
+                "lang",
+                "is_recurring"
+            ]
+        },
+        "url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "assigner_id",
+        "assignee_id",
+        "project_id",
+        "section_id",
+        "parent_id",
+        "order",
+        "content",
+        "description",
+        "is_completed",
+        "labels",
+        "priority",
+        "comment_count",
+        "creator_id",
+        "created_at",
+        "due",
+        "url",
+        "duration",
+        "deadline"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/update.json b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/update.json
new file mode 100644
index 0000000000..a19052ad7b
--- /dev/null
+++ b/packages/nodes-base/nodes/Todoist/__schema__/v2.1.0/task/update.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "success": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "success"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index 57812697a0..ab4b99c398 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -41,6 +41,7 @@ const versionDescription: INodeTypeDescription = {
 	defaults: {
 		name: 'Todoist',
 	},
+	usableAsTool: true,
 	inputs: [NodeConnectionType.Main],
 	outputs: [NodeConnectionType.Main],
 	credentials: [
diff --git a/packages/nodes-base/nodes/Totp/Totp.node.ts b/packages/nodes-base/nodes/Totp/Totp.node.ts
index 191e4486b4..95af4883c0 100644
--- a/packages/nodes-base/nodes/Totp/Totp.node.ts
+++ b/packages/nodes-base/nodes/Totp/Totp.node.ts
@@ -19,6 +19,7 @@ export class Totp implements INodeType {
 		defaults: {
 			name: 'TOTP',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
index 83ded6d7af..8ed73eb3f3 100644
--- a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
@@ -5,6 +5,9 @@ import {
 	type INodeExecutionData,
 	type INodeType,
 	type INodeTypeDescription,
+	NodeExecutionOutput,
+	type NodeExecutionHint,
+	type IDataObject,
 } from 'n8n-workflow';
 
 import {
@@ -12,11 +15,11 @@ import {
 	NUMERICAL_AGGREGATIONS,
 	type SummarizeOptions,
 	aggregationToArray,
+	aggregationToArrayWithOriginalTypes,
 	checkIfFieldExists,
 	fieldValueGetter,
 	splitData,
 } from './utils';
-import { generatePairedItemData } from '../../../utils/utilities';
 
 export class Summarize implements INodeType {
 	description: INodeTypeDescription = {
@@ -25,7 +28,7 @@ export class Summarize implements INodeType {
 		icon: 'file:summarize.svg',
 		group: ['transform'],
 		subtitle: '',
-		version: 1,
+		version: [1, 1.1],
 		description: 'Sum, count, max, etc. across items',
 		defaults: {
 			name: 'Summarize',
@@ -248,7 +251,12 @@ export class Summarize implements INodeType {
 						type: 'boolean',
 						default: false,
 						description:
-							"Whether to continue if field to summarize can't be found in any items and return single empty item, owerwise an error would be thrown",
+							"Whether to continue if field to summarize can't be found in any items and return single empty item, otherwise an error would be thrown",
+						displayOptions: {
+							hide: {
+								'@version': [{ _cnd: { gte: 1.1 } }],
+							},
+						},
 					},
 					{
 						displayName: 'Disable Dot Notation',
@@ -314,20 +322,6 @@ export class Summarize implements INodeType {
 
 		const nodeVersion = this.getNode().typeVersion;
 
-		if (nodeVersion < 2.1) {
-			try {
-				checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
-			} catch (error) {
-				if (options.continueIfFieldNotFound) {
-					const itemData = generatePairedItemData(items.length);
-
-					return [[{ json: {}, pairedItem: itemData }]];
-				} else {
-					throw error;
-				}
-			}
-		}
-
 		const aggregationResult = splitData(
 			fieldsToSplitBy,
 			newItems,
@@ -336,6 +330,21 @@ export class Summarize implements INodeType {
 			getValue,
 		);
 
+		const fieldsNotFound: NodeExecutionHint[] = [];
+		try {
+			checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
+		} catch (error) {
+			if (nodeVersion > 1 || options.continueIfFieldNotFound) {
+				const fieldNotFoundHint: NodeExecutionHint = {
+					message: error instanceof Error ? error.message : String(error),
+					location: 'outputPane',
+				};
+				fieldsNotFound.push(fieldNotFoundHint);
+			} else {
+				throw error;
+			}
+		}
+
 		if (options.outputFormat === 'singleItem') {
 			const executionData: INodeExecutionData = {
 				json: aggregationResult,
@@ -343,7 +352,7 @@ export class Summarize implements INodeType {
 					item: index,
 				})),
 			};
-			return [[executionData]];
+			return new NodeExecutionOutput([[executionData]], fieldsNotFound);
 		} else {
 			if (!fieldsToSplitBy.length) {
 				const { pairedItems, ...json } = aggregationResult;
@@ -353,9 +362,14 @@ export class Summarize implements INodeType {
 						item: index,
 					})),
 				};
-				return [[executionData]];
+				return new NodeExecutionOutput([[executionData]], fieldsNotFound);
+			}
+			let returnData: IDataObject[] = [];
+			if (nodeVersion > 1) {
+				returnData = aggregationToArrayWithOriginalTypes(aggregationResult, fieldsToSplitBy);
+			} else {
+				returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
 			}
-			const returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
 			const executionData = returnData.map((item) => {
 				const { pairedItems, ...json } = item;
 				return {
@@ -365,7 +379,7 @@ export class Summarize implements INodeType {
 					})),
 				};
 			});
-			return [executionData];
+			return new NodeExecutionOutput([executionData], fieldsNotFound);
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Transform/Summarize/test/unitTests/checkIfFieldExists.test.ts b/packages/nodes-base/nodes/Transform/Summarize/test/unitTests/checkIfFieldExists.test.ts
new file mode 100644
index 0000000000..b5a3636712
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/test/unitTests/checkIfFieldExists.test.ts
@@ -0,0 +1,53 @@
+import { NodeOperationError, type IExecuteFunctions, type IDataObject } from 'n8n-workflow';
+
+import { checkIfFieldExists, type Aggregations } from '../../utils';
+
+describe('Test Summarize Node, checkIfFieldExists', () => {
+	let mockExecuteFunctions: IExecuteFunctions;
+
+	beforeEach(() => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ name: 'test-node' }),
+		} as unknown as IExecuteFunctions;
+	});
+
+	const items = [{ a: 1 }, { b: 2 }, { c: 3 }];
+
+	it('should not throw error if all fields exist', () => {
+		const aggregations: Aggregations = [
+			{ aggregation: 'sum', field: 'a' },
+			{ aggregation: 'count', field: 'c' },
+		];
+		const getValue = (item: IDataObject, field: string) => item[field];
+		expect(() => {
+			checkIfFieldExists.call(mockExecuteFunctions, items, aggregations, getValue);
+		}).not.toThrow();
+	});
+
+	it('should throw NodeOperationError if any field does not exist', () => {
+		const aggregations: Aggregations = [
+			{ aggregation: 'sum', field: 'b' },
+			{ aggregation: 'count', field: 'd' },
+		];
+		const getValue = (item: IDataObject, field: string) => item[field];
+		expect(() => {
+			checkIfFieldExists.call(mockExecuteFunctions, items, aggregations, getValue);
+		}).toThrow(NodeOperationError);
+	});
+
+	it("should throw NodeOperationError with error message containing the field name that doesn't exist", () => {
+		const aggregations: Aggregations = [{ aggregation: 'count', field: 'D' }];
+		const getValue = (item: IDataObject, field: string) => item[field];
+		expect(() => {
+			checkIfFieldExists.call(mockExecuteFunctions, items, aggregations, getValue);
+		}).toThrow("The field 'D' does not exist in any items");
+	});
+
+	it('should not throw error if field is empty string', () => {
+		const aggregations: Aggregations = [{ aggregation: 'count', field: '' }];
+		const getValue = (item: IDataObject, field: string) => item[field];
+		expect(() => {
+			checkIfFieldExists.call(mockExecuteFunctions, items, aggregations, getValue);
+		}).not.toThrow();
+	});
+});
diff --git a/packages/nodes-base/nodes/Transform/Summarize/test/unitTests/execute.test.ts b/packages/nodes-base/nodes/Transform/Summarize/test/unitTests/execute.test.ts
new file mode 100644
index 0000000000..d675e4be6d
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/test/unitTests/execute.test.ts
@@ -0,0 +1,80 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions } from 'n8n-workflow';
+import { NodeExecutionOutput, NodeOperationError } from 'n8n-workflow';
+
+import { Summarize } from '../../Summarize.node';
+import type { Aggregations } from '../../utils';
+
+let summarizeNode: Summarize;
+let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+describe('Test Summarize Node, execute', () => {
+	beforeEach(() => {
+		summarizeNode = new Summarize();
+		mockExecuteFunctions = mock<IExecuteFunctions>({
+			getNode: jest.fn().mockReturnValue({ name: 'test-node' }),
+			getNodeParameter: jest.fn(),
+			getInputData: jest.fn(),
+			helpers: {
+				constructExecutionMetaData: jest.fn().mockReturnValue([]),
+			},
+		});
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should handle field not found with hints if version > 1', async () => {
+		mockExecuteFunctions.getInputData.mockReturnValue([{ json: { someField: 1 } }]);
+		mockExecuteFunctions.getNode.mockReturnValue({
+			id: '1',
+			name: 'test-node',
+			type: 'test-type',
+			position: [0, 0],
+			parameters: {},
+			typeVersion: 1.1,
+		});
+		mockExecuteFunctions.getNodeParameter
+			.mockReturnValueOnce({}) // options
+			.mockReturnValueOnce('') // fieldsToSplitBy
+			.mockReturnValueOnce([{ field: 'nonexistentField', aggregation: 'sum' }]); // fieldsToSummarize
+
+		const result = await summarizeNode.execute.call(mockExecuteFunctions);
+
+		expect(result).toBeInstanceOf(NodeExecutionOutput);
+		expect(result).toEqual([[{ json: { sum_nonexistentField: 0 }, pairedItem: [{ item: 0 }] }]]);
+		expect((result as NodeExecutionOutput).getHints()).toEqual([
+			{
+				location: 'outputPane',
+				message: "The field 'nonexistentField' does not exist in any items",
+			},
+		]);
+	});
+
+	it('should throw error if node version is < 1.1 and fields not found', async () => {
+		const items = [{ json: { a: 1, b: 2, c: 3 } }];
+		const aggregations: Aggregations = [
+			{ aggregation: 'sum', field: 'b' },
+			{ aggregation: 'count', field: 'd' },
+		];
+
+		mockExecuteFunctions.getNode.mockReturnValue({
+			id: '1',
+			name: 'test-node',
+			type: 'test-type',
+			position: [0, 0],
+			parameters: {},
+			typeVersion: 1,
+		});
+		mockExecuteFunctions.getInputData.mockReturnValue(items);
+		mockExecuteFunctions.getNodeParameter
+			.mockReturnValueOnce({}) // options
+			.mockReturnValueOnce('') // fieldsToSplitBy
+			.mockReturnValueOnce(aggregations); // fieldsToSummarize
+		await expect(async () => {
+			await summarizeNode.execute.bind(mockExecuteFunctions)();
+		}).rejects.toThrow(NodeOperationError);
+	});
+});
diff --git a/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize_datatypes.json b/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize_datatypes.json
new file mode 100644
index 0000000000..2870e52f0c
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize_datatypes.json
@@ -0,0 +1,186 @@
+{
+	"name": "Summarize Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-320, -80],
+			"id": "509c50eb-a5c3-4172-a553-82cce7ca0455",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    \"uid\": \"a0e797c2-ffcf-495b-96f3-982f7bc4eae5\",\n    \"email\": \"Alfredo83@gmail.com\",\n    \"firstname\": \"Charlie\",\n    \"lastname\": \"Jacobi\",\n    \"password\": \"34~XLKdGit\",\n    \"Group\": 0\n  },\n  {\n    \"uid\": \"5713682e-4f32-47dc-ae89-ae4a8ac28a46\",\n    \"email\": \"Zachary43@yahoo.com\",\n    \"firstname\": \"Leonard\",\n    \"lastname\": \"Blick\",\n    \"password\": \"4sh5z!R\",\n    \"Group\": 0\n  },\n  {\n    \"uid\": \"1bb2a432-d2fb-48e4-a7b0-39030ef0d784\",\n    \"email\": \"Cory_Wilderman@yahoo.com\",\n    \"firstname\": \"Debra\",\n    \"lastname\": \"Corkery\",\n    \"password\": \"-8X1CKMFh\",\n    \"Group\": 1\n  },\n  {\n    \"uid\": \"4edb11bc-9256-4f26-9be6-f8b04e90ecb2\",\n    \"email\": \"Mindy_Murazik86@gmail.com\",\n    \"firstname\": \"Wendy\",\n    \"lastname\": \"Schiller\",\n    \"password\": \"WF373t,fe\",\n    \"Group\": 2\n  },\n  {\n    \"uid\": \"ec6efd3d-508c-4f1e-acae-c9467b74f5a6\",\n    \"email\": \"Darin_Vandervort@yahoo.com\",\n    \"firstname\": \"Dolores\",\n    \"lastname\": \"Walter\",\n    \"password\": \".45KCBk\",\n    \"Group\": 2\n  },\n  {\n    \"uid\": \"173ee780-4e4f-4164-aa39-41a0402cd2ad\",\n    \"email\": \"Claude.Grady6@gmail.com\",\n    \"firstname\": \"Leonard\",\n    \"lastname\": \"Krajcik\",\n    \"password\": \"6x6-MN8vch\",\n    \"Group\": null\n  },\n  {\n    \"uid\": \"b1f191d8-4f95-49f6-8533-042048b4c162\",\n    \"email\": \"Ismael_Volkman@hotmail.com\",\n    \"firstname\": \"Terri\",\n    \"lastname\": \"Kuphal\",\n    \"password\": \"62+BNNCk\",\n    \"Group\": null\n  },\n  {\n    \"uid\": \"ee8c6d18-1e77-435d-8c9a-5215141d7697\",\n    \"email\": \"Paulette.Hudson@hotmail.com\",\n    \"firstname\": \"Clinton\",\n    \"lastname\": \"Murphy\",\n    \"password\": \"2+R8IRxHL\",\n    \"Group\": null\n  },\n  {\n    \"uid\": \"feeb4357-0e20-4b15-9199-f161c23da1a2\",\n    \"email\": \"Guillermo.Kub33@gmail.com\",\n    \"firstname\": \"Edward\",\n    \"lastname\": \"Schaden\",\n    \"password\": \"Kv23S1_H\",\n    \"Group\": 0\n  },\n  {\n    \"uid\": \"676003ec-8a40-4105-8237-ba1d9eb51fc2\",\n    \"email\": \"Cindy.White@hotmail.com\",\n    \"firstname\": \"Esther\",\n    \"lastname\": \"Monahan\",\n    \"password\": \"5q$RyBhp\",\n    \"Group\": 2\n  }\n]"
+			},
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-100, -80],
+			"id": "691f2744-8689-4b5c-91e7-2bb378691ecf",
+			"name": "sample data"
+		},
+		{
+			"parameters": {
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "email",
+							"includeEmpty": true
+						}
+					]
+				},
+				"fieldsToSplitBy": "Group",
+				"options": {
+					"outputFormat": "separateItems"
+				}
+			},
+			"type": "n8n-nodes-base.summarize",
+			"typeVersion": 1.1,
+			"position": [160, 0],
+			"id": "d1267da5-0cab-453c-9450-1bbd78346bd6",
+			"name": "Summarize v1.1"
+		},
+		{
+			"parameters": {
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "email",
+							"includeEmpty": true
+						}
+					]
+				},
+				"fieldsToSplitBy": "Group",
+				"options": {
+					"continueIfFieldNotFound": false,
+					"outputFormat": "separateItems"
+				}
+			},
+			"type": "n8n-nodes-base.summarize",
+			"typeVersion": 1,
+			"position": [160, -160],
+			"id": "680b7269-c920-4cce-b9f5-b2189955848d",
+			"name": "Summarize v1"
+		}
+	],
+	"pinData": {
+		"Summarize v1": [
+			{
+				"json": {
+					"Group": "0",
+					"appended_email": [
+						"Alfredo83@gmail.com",
+						"Zachary43@yahoo.com",
+						"Guillermo.Kub33@gmail.com"
+					]
+				}
+			},
+			{
+				"json": {
+					"Group": "1",
+					"appended_email": ["Cory_Wilderman@yahoo.com"]
+				}
+			},
+			{
+				"json": {
+					"Group": "2",
+					"appended_email": [
+						"Mindy_Murazik86@gmail.com",
+						"Darin_Vandervort@yahoo.com",
+						"Cindy.White@hotmail.com"
+					]
+				}
+			},
+			{
+				"json": {
+					"Group": "null",
+					"appended_email": [
+						"Claude.Grady6@gmail.com",
+						"Ismael_Volkman@hotmail.com",
+						"Paulette.Hudson@hotmail.com"
+					]
+				}
+			}
+		],
+		"Summarize v1.1": [
+			{
+				"json": {
+					"Group": 0,
+					"appended_email": [
+						"Alfredo83@gmail.com",
+						"Zachary43@yahoo.com",
+						"Guillermo.Kub33@gmail.com"
+					]
+				}
+			},
+			{
+				"json": {
+					"Group": 1,
+					"appended_email": ["Cory_Wilderman@yahoo.com"]
+				}
+			},
+			{
+				"json": {
+					"Group": 2,
+					"appended_email": [
+						"Mindy_Murazik86@gmail.com",
+						"Darin_Vandervort@yahoo.com",
+						"Cindy.White@hotmail.com"
+					]
+				}
+			},
+			{
+				"json": {
+					"Group": null,
+					"appended_email": [
+						"Claude.Grady6@gmail.com",
+						"Ismael_Volkman@hotmail.com",
+						"Paulette.Hudson@hotmail.com"
+					]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "sample data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"sample data": {
+			"main": [
+				[
+					{
+						"node": "Summarize v1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Summarize v1.1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "7304eae2-3bae-4934-8d1f-1135a0ff8ab8",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "b0d1a7f453aa2195078ce658269afa7743e3dc59edb733395b6c75bde57da7ff"
+	},
+	"id": "8ja9H2443AhLdBsS",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize_hint.json b/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize_hint.json
new file mode 100644
index 0000000000..a0fb6399ad
--- /dev/null
+++ b/packages/nodes-base/nodes/Transform/Summarize/test/workflow.summarize_hint.json
@@ -0,0 +1,70 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [520, -80],
+			"id": "9ff1d8e0-ebe8-4c52-931a-e482e14ac911",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"category": "randomData",
+				"randomDataSeed": "ria",
+				"randomDataCount": 5
+			},
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [700, -80],
+			"id": "50cea846-f8ed-4b5a-a14a-c11bf4ba0f5d",
+			"name": "DebugHelper2"
+		},
+		{
+			"parameters": {
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"field": "passwor"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.summarize",
+			"typeVersion": 1.1,
+			"position": [900, -80],
+			"id": "d39fedc9-62e1-45bc-8c9a-d20f2b63b543",
+			"name": "Summarize1"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "DebugHelper2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"DebugHelper2": {
+			"main": [
+				[
+					{
+						"node": "Summarize1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {},
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "ee90fdf8d57662f949e6c691dc07fa0fd2f66e1eee28ed82ef06658223e67255"
+	}
+}
diff --git a/packages/nodes-base/nodes/Transform/Summarize/utils.ts b/packages/nodes-base/nodes/Transform/Summarize/utils.ts
index 0094d4d8ef..6595c29664 100644
--- a/packages/nodes-base/nodes/Transform/Summarize/utils.ts
+++ b/packages/nodes-base/nodes/Transform/Summarize/utils.ts
@@ -1,3 +1,4 @@
+import { isNaN } from 'lodash';
 import get from 'lodash/get';
 import {
 	type IDataObject,
@@ -231,20 +232,20 @@ export function splitData(
 	const [firstSplitKey, ...restSplitKeys] = splitKeys;
 
 	const groupedData = data.reduce((acc, item) => {
-		let keyValuee = getValue(item, firstSplitKey) as string;
+		let keyValue = getValue(item, firstSplitKey) as string;
 
-		if (typeof keyValuee === 'object') {
-			keyValuee = JSON.stringify(keyValuee);
+		if (typeof keyValue === 'object') {
+			keyValue = JSON.stringify(keyValue);
 		}
 
-		if (options.skipEmptySplitFields && typeof keyValuee !== 'number' && !keyValuee) {
+		if (options.skipEmptySplitFields && typeof keyValue !== 'number' && !keyValue) {
 			return acc;
 		}
 
-		if (acc[keyValuee] === undefined) {
-			acc[keyValuee] = [item];
+		if (acc[keyValue] === undefined) {
+			acc[keyValue] = [item];
 		} else {
-			(acc[keyValuee] as IDataObject[]).push(item);
+			(acc[keyValue] as IDataObject[]).push(item);
 		}
 		return acc;
 	}, {} as IDataObject);
@@ -287,3 +288,38 @@ export function aggregationToArray(
 		return returnData;
 	}
 }
+
+const getOriginalFieldValue = (field: string | number) =>
+	field === 'null' ? null : isNaN(Number(field)) ? field : Number(field);
+
+export function aggregationToArrayWithOriginalTypes(
+	aggregationResult: IDataObject,
+	fieldsToSplitBy: string[],
+	previousStage: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+	fieldsToSplitBy = parseFieldName(fieldsToSplitBy);
+	const splitFieldName = fieldsToSplitBy[0];
+	const isNext = fieldsToSplitBy[1];
+
+	if (isNext === undefined) {
+		for (const fieldName of Object.keys(aggregationResult)) {
+			returnData.push({
+				...previousStage,
+				[splitFieldName]: getOriginalFieldValue(fieldName),
+				...(aggregationResult[fieldName] as IDataObject),
+			});
+		}
+		return returnData;
+	} else {
+		for (const key of Object.keys(aggregationResult)) {
+			returnData.push(
+				...aggregationToArray(aggregationResult[key] as IDataObject, fieldsToSplitBy.slice(1), {
+					...previousStage,
+					[splitFieldName]: getOriginalFieldValue(key),
+				}),
+			);
+		}
+		return returnData;
+	}
+}
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index 6c6274839b..40c4bdc597 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -23,6 +23,7 @@ export class TravisCi implements INodeType {
 		defaults: {
 			name: 'TravisCI',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index 0554a99939..3fc8335af8 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -39,6 +39,7 @@ export class Trello implements INodeType {
 		defaults: {
 			name: 'Trello',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/attachment/create.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/attachment/create.json
new file mode 100644
index 0000000000..7ad5b2d8aa
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/attachment/create.json
@@ -0,0 +1,70 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "idMember": {
+            "type": "string"
+        },
+        "isUpload": {
+            "type": "boolean"
+        },
+        "mimeType": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "previews": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "_id": {
+                        "type": "string"
+                    },
+                    "scaled": {
+                        "type": "boolean"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "bytes": {
+                        "type": "integer"
+                    },
+                    "height": {
+                        "type": "integer"
+                    },
+                    "width": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "_id",
+                    "scaled",
+                    "url",
+                    "bytes",
+                    "height",
+                    "width"
+                ]
+            }
+        },
+        "url": {
+            "type": "string"
+        },
+        "pos": {
+            "type": "integer"
+        },
+        "isMalicious": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/attachment/getAll.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/attachment/getAll.json
new file mode 100644
index 0000000000..3c823ddfba
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/attachment/getAll.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "pos": {
+            "type": "integer"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/board/create.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/board/create.json
new file mode 100644
index 0000000000..e04e352a07
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/board/create.json
@@ -0,0 +1,292 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "desc": {
+            "type": "string"
+        },
+        "descData": {
+            "type": "null"
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "idOrganization": {
+            "type": "string"
+        },
+        "idEnterprise": {
+            "type": "null"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "shortUrl": {
+            "type": "string"
+        },
+        "prefs": {
+            "type": "object",
+            "properties": {
+                "permissionLevel": {
+                    "type": "string"
+                },
+                "hideVotes": {
+                    "type": "boolean"
+                },
+                "voting": {
+                    "type": "string"
+                },
+                "comments": {
+                    "type": "string"
+                },
+                "invitations": {
+                    "type": "string"
+                },
+                "selfJoin": {
+                    "type": "boolean"
+                },
+                "cardCovers": {
+                    "type": "boolean"
+                },
+                "cardCounts": {
+                    "type": "boolean"
+                },
+                "isTemplate": {
+                    "type": "boolean"
+                },
+                "cardAging": {
+                    "type": "string"
+                },
+                "calendarFeedEnabled": {
+                    "type": "boolean"
+                },
+                "switcherViews": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "viewType": {
+                                "type": "string"
+                            },
+                            "enabled": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "viewType",
+                            "enabled"
+                        ]
+                    }
+                },
+                "background": {
+                    "type": "string"
+                },
+                "backgroundTile": {
+                    "type": "boolean"
+                },
+                "backgroundBrightness": {
+                    "type": "string"
+                },
+                "backgroundBottomColor": {
+                    "type": "string"
+                },
+                "backgroundTopColor": {
+                    "type": "string"
+                },
+                "canBePublic": {
+                    "type": "boolean"
+                },
+                "canBeEnterprise": {
+                    "type": "boolean"
+                },
+                "canBeOrg": {
+                    "type": "boolean"
+                },
+                "canBePrivate": {
+                    "type": "boolean"
+                },
+                "canInvite": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "permissionLevel",
+                "hideVotes",
+                "voting",
+                "comments",
+                "invitations",
+                "selfJoin",
+                "cardCovers",
+                "cardCounts",
+                "isTemplate",
+                "cardAging",
+                "calendarFeedEnabled",
+                "hiddenPluginBoardButtons",
+                "switcherViews",
+                "background",
+                "backgroundColor",
+                "backgroundImage",
+                "backgroundTile",
+                "backgroundBrightness",
+                "sharedSourceUrl",
+                "backgroundImageScaled",
+                "backgroundBottomColor",
+                "backgroundTopColor",
+                "canBePublic",
+                "canBeEnterprise",
+                "canBeOrg",
+                "canBePrivate",
+                "canInvite"
+            ]
+        },
+        "labelNames": {
+            "type": "object",
+            "properties": {
+                "green": {
+                    "type": "string"
+                },
+                "yellow": {
+                    "type": "string"
+                },
+                "orange": {
+                    "type": "string"
+                },
+                "red": {
+                    "type": "string"
+                },
+                "purple": {
+                    "type": "string"
+                },
+                "blue": {
+                    "type": "string"
+                },
+                "sky": {
+                    "type": "string"
+                },
+                "lime": {
+                    "type": "string"
+                },
+                "pink": {
+                    "type": "string"
+                },
+                "black": {
+                    "type": "string"
+                },
+                "green_dark": {
+                    "type": "string"
+                },
+                "yellow_dark": {
+                    "type": "string"
+                },
+                "orange_dark": {
+                    "type": "string"
+                },
+                "red_dark": {
+                    "type": "string"
+                },
+                "purple_dark": {
+                    "type": "string"
+                },
+                "blue_dark": {
+                    "type": "string"
+                },
+                "sky_dark": {
+                    "type": "string"
+                },
+                "lime_dark": {
+                    "type": "string"
+                },
+                "pink_dark": {
+                    "type": "string"
+                },
+                "black_dark": {
+                    "type": "string"
+                },
+                "green_light": {
+                    "type": "string"
+                },
+                "yellow_light": {
+                    "type": "string"
+                },
+                "orange_light": {
+                    "type": "string"
+                },
+                "red_light": {
+                    "type": "string"
+                },
+                "purple_light": {
+                    "type": "string"
+                },
+                "blue_light": {
+                    "type": "string"
+                },
+                "sky_light": {
+                    "type": "string"
+                },
+                "lime_light": {
+                    "type": "string"
+                },
+                "pink_light": {
+                    "type": "string"
+                },
+                "black_light": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "green",
+                "yellow",
+                "orange",
+                "red",
+                "purple",
+                "blue",
+                "sky",
+                "lime",
+                "pink",
+                "black",
+                "green_dark",
+                "yellow_dark",
+                "orange_dark",
+                "red_dark",
+                "purple_dark",
+                "blue_dark",
+                "sky_dark",
+                "lime_dark",
+                "pink_dark",
+                "black_dark",
+                "green_light",
+                "yellow_light",
+                "orange_light",
+                "red_light",
+                "purple_light",
+                "blue_light",
+                "sky_light",
+                "lime_light",
+                "pink_light",
+                "black_light"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "desc",
+        "descData",
+        "closed",
+        "idOrganization",
+        "idEnterprise",
+        "pinned",
+        "url",
+        "shortUrl",
+        "prefs",
+        "labelNames",
+        "limits"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/board/get.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/board/get.json
new file mode 100644
index 0000000000..5e0a8b4d89
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/board/get.json
@@ -0,0 +1,284 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "desc": {
+            "type": "string"
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "idOrganization": {
+            "type": "string"
+        },
+        "idEnterprise": {
+            "type": "null"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "shortUrl": {
+            "type": "string"
+        },
+        "prefs": {
+            "type": "object",
+            "properties": {
+                "permissionLevel": {
+                    "type": "string"
+                },
+                "hideVotes": {
+                    "type": "boolean"
+                },
+                "voting": {
+                    "type": "string"
+                },
+                "comments": {
+                    "type": "string"
+                },
+                "invitations": {
+                    "type": "string"
+                },
+                "selfJoin": {
+                    "type": "boolean"
+                },
+                "cardCovers": {
+                    "type": "boolean"
+                },
+                "cardCounts": {
+                    "type": "boolean"
+                },
+                "isTemplate": {
+                    "type": "boolean"
+                },
+                "cardAging": {
+                    "type": "string"
+                },
+                "calendarFeedEnabled": {
+                    "type": "boolean"
+                },
+                "hiddenPluginBoardButtons": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "switcherViews": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "viewType": {
+                                "type": "string"
+                            },
+                            "enabled": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "viewType",
+                            "enabled"
+                        ]
+                    }
+                },
+                "background": {
+                    "type": "string"
+                },
+                "backgroundTile": {
+                    "type": "boolean"
+                },
+                "backgroundBrightness": {
+                    "type": "string"
+                },
+                "backgroundBottomColor": {
+                    "type": "string"
+                },
+                "backgroundTopColor": {
+                    "type": "string"
+                },
+                "canBePublic": {
+                    "type": "boolean"
+                },
+                "canBeEnterprise": {
+                    "type": "boolean"
+                },
+                "canBeOrg": {
+                    "type": "boolean"
+                },
+                "canBePrivate": {
+                    "type": "boolean"
+                },
+                "canInvite": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "permissionLevel",
+                "hideVotes",
+                "voting",
+                "comments",
+                "invitations",
+                "selfJoin",
+                "cardCovers",
+                "cardCounts",
+                "isTemplate",
+                "cardAging",
+                "calendarFeedEnabled",
+                "hiddenPluginBoardButtons",
+                "switcherViews",
+                "background",
+                "backgroundColor",
+                "backgroundImage",
+                "backgroundImageScaled",
+                "backgroundTile",
+                "backgroundBrightness",
+                "sharedSourceUrl",
+                "backgroundBottomColor",
+                "backgroundTopColor",
+                "canBePublic",
+                "canBeEnterprise",
+                "canBeOrg",
+                "canBePrivate",
+                "canInvite"
+            ]
+        },
+        "labelNames": {
+            "type": "object",
+            "properties": {
+                "green": {
+                    "type": "string"
+                },
+                "yellow": {
+                    "type": "string"
+                },
+                "orange": {
+                    "type": "string"
+                },
+                "red": {
+                    "type": "string"
+                },
+                "purple": {
+                    "type": "string"
+                },
+                "blue": {
+                    "type": "string"
+                },
+                "sky": {
+                    "type": "string"
+                },
+                "lime": {
+                    "type": "string"
+                },
+                "pink": {
+                    "type": "string"
+                },
+                "black": {
+                    "type": "string"
+                },
+                "green_dark": {
+                    "type": "string"
+                },
+                "yellow_dark": {
+                    "type": "string"
+                },
+                "orange_dark": {
+                    "type": "string"
+                },
+                "red_dark": {
+                    "type": "string"
+                },
+                "purple_dark": {
+                    "type": "string"
+                },
+                "blue_dark": {
+                    "type": "string"
+                },
+                "sky_dark": {
+                    "type": "string"
+                },
+                "lime_dark": {
+                    "type": "string"
+                },
+                "pink_dark": {
+                    "type": "string"
+                },
+                "black_dark": {
+                    "type": "string"
+                },
+                "green_light": {
+                    "type": "string"
+                },
+                "yellow_light": {
+                    "type": "string"
+                },
+                "orange_light": {
+                    "type": "string"
+                },
+                "red_light": {
+                    "type": "string"
+                },
+                "purple_light": {
+                    "type": "string"
+                },
+                "blue_light": {
+                    "type": "string"
+                },
+                "sky_light": {
+                    "type": "string"
+                },
+                "lime_light": {
+                    "type": "string"
+                },
+                "pink_light": {
+                    "type": "string"
+                },
+                "black_light": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "green",
+                "yellow",
+                "orange",
+                "red",
+                "purple",
+                "blue",
+                "sky",
+                "lime",
+                "pink",
+                "black",
+                "green_dark",
+                "yellow_dark",
+                "orange_dark",
+                "red_dark",
+                "purple_dark",
+                "blue_dark",
+                "sky_dark",
+                "lime_dark",
+                "pink_dark",
+                "black_dark",
+                "green_light",
+                "yellow_light",
+                "orange_light",
+                "red_light",
+                "purple_light",
+                "blue_light",
+                "sky_light",
+                "lime_light",
+                "pink_light",
+                "black_light"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "labelNames"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/boardMember/getAll.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/boardMember/getAll.json
new file mode 100644
index 0000000000..2b5216b84b
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/boardMember/getAll.json
@@ -0,0 +1,19 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "fullName": {
+            "type": "string"
+        },
+        "username": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "fullName",
+        "username"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/create.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/create.json
new file mode 100644
index 0000000000..6e7ca1f9e9
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/create.json
@@ -0,0 +1,339 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "badges": {
+            "type": "object",
+            "properties": {
+                "attachmentsByType": {
+                    "type": "object",
+                    "properties": {
+                        "trello": {
+                            "type": "object",
+                            "properties": {
+                                "board": {
+                                    "type": "integer"
+                                },
+                                "card": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "board",
+                                "card"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "trello"
+                    ]
+                },
+                "externalSource": {
+                    "type": "null"
+                },
+                "location": {
+                    "type": "boolean"
+                },
+                "votes": {
+                    "type": "integer"
+                },
+                "viewingMemberVoted": {
+                    "type": "boolean"
+                },
+                "subscribed": {
+                    "type": "boolean"
+                },
+                "attachments": {
+                    "type": "integer"
+                },
+                "fogbugz": {
+                    "type": "string"
+                },
+                "checkItems": {
+                    "type": "integer"
+                },
+                "checkItemsChecked": {
+                    "type": "integer"
+                },
+                "checkItemsEarliestDue": {
+                    "type": "null"
+                },
+                "comments": {
+                    "type": "integer"
+                },
+                "description": {
+                    "type": "boolean"
+                },
+                "dueComplete": {
+                    "type": "boolean"
+                },
+                "lastUpdatedByAi": {
+                    "type": "boolean"
+                },
+                "start": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "attachmentsByType",
+                "externalSource",
+                "location",
+                "votes",
+                "viewingMemberVoted",
+                "subscribed",
+                "attachments",
+                "fogbugz",
+                "checkItems",
+                "checkItemsChecked",
+                "checkItemsEarliestDue",
+                "comments",
+                "description",
+                "due",
+                "dueComplete",
+                "lastUpdatedByAi",
+                "start"
+            ]
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "dueComplete": {
+            "type": "boolean"
+        },
+        "dateLastActivity": {
+            "type": "string"
+        },
+        "desc": {
+            "type": "string"
+        },
+        "dueReminder": {
+            "type": "null"
+        },
+        "email": {
+            "type": "null"
+        },
+        "idBoard": {
+            "type": "string"
+        },
+        "idChecklists": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idList": {
+            "type": "string"
+        },
+        "idMembers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idShort": {
+            "type": "integer"
+        },
+        "idAttachmentCover": {
+            "type": "null"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "idBoard": {
+                        "type": "string"
+                    },
+                    "idOrganization": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "nodeId": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "uses": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "idBoard",
+                    "idOrganization",
+                    "name",
+                    "nodeId",
+                    "color",
+                    "uses"
+                ]
+            }
+        },
+        "idLabels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "manualCoverAttachment": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "shortLink": {
+            "type": "string"
+        },
+        "shortUrl": {
+            "type": "string"
+        },
+        "start": {
+            "type": "null"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "cover": {
+            "type": "object",
+            "properties": {
+                "idAttachment": {
+                    "type": "null"
+                },
+                "color": {
+                    "type": "null"
+                },
+                "idUploadedBackground": {
+                    "type": "null"
+                },
+                "size": {
+                    "type": "string"
+                },
+                "brightness": {
+                    "type": "string"
+                },
+                "idPlugin": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "idAttachment",
+                "color",
+                "idUploadedBackground",
+                "size",
+                "brightness",
+                "idPlugin"
+            ]
+        },
+        "isTemplate": {
+            "type": "boolean"
+        },
+        "cardRole": {
+            "type": "null"
+        },
+        "mirrorSourceId": {
+            "type": "null"
+        },
+        "attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "bytes": {
+                        "type": "null"
+                    },
+                    "date": {
+                        "type": "string"
+                    },
+                    "edgeColor": {
+                        "type": "null"
+                    },
+                    "idMember": {
+                        "type": "string"
+                    },
+                    "isUpload": {
+                        "type": "boolean"
+                    },
+                    "mimeType": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    },
+                    "pos": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "bytes",
+                    "date",
+                    "edgeColor",
+                    "idMember",
+                    "isUpload",
+                    "mimeType",
+                    "name",
+                    "previews",
+                    "url",
+                    "pos",
+                    "fileName"
+                ]
+            }
+        }
+    },
+    "required": [
+        "id",
+        "badges",
+        "checkItemStates",
+        "closed",
+        "dueComplete",
+        "dateLastActivity",
+        "desc",
+        "descData",
+        "due",
+        "dueReminder",
+        "email",
+        "idBoard",
+        "idChecklists",
+        "idList",
+        "idMembers",
+        "idMembersVoted",
+        "idShort",
+        "idAttachmentCover",
+        "labels",
+        "idLabels",
+        "manualCoverAttachment",
+        "name",
+        "pinned",
+        "pos",
+        "shortLink",
+        "shortUrl",
+        "start",
+        "subscribed",
+        "url",
+        "cover",
+        "isTemplate",
+        "cardRole",
+        "attachments",
+        "stickers",
+        "limits"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/get.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/get.json
new file mode 100644
index 0000000000..205acb6482
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/get.json
@@ -0,0 +1,239 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "badges": {
+            "type": "object",
+            "properties": {
+                "attachmentsByType": {
+                    "type": "object",
+                    "properties": {
+                        "trello": {
+                            "type": "object",
+                            "properties": {
+                                "board": {
+                                    "type": "integer"
+                                },
+                                "card": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "board",
+                                "card"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "trello"
+                    ]
+                },
+                "location": {
+                    "type": "boolean"
+                },
+                "votes": {
+                    "type": "integer"
+                },
+                "viewingMemberVoted": {
+                    "type": "boolean"
+                },
+                "subscribed": {
+                    "type": "boolean"
+                },
+                "attachments": {
+                    "type": "integer"
+                },
+                "fogbugz": {
+                    "type": "string"
+                },
+                "checkItems": {
+                    "type": "integer"
+                },
+                "checkItemsChecked": {
+                    "type": "integer"
+                },
+                "checkItemsEarliestDue": {
+                    "type": "null"
+                },
+                "comments": {
+                    "type": "integer"
+                },
+                "description": {
+                    "type": "boolean"
+                },
+                "dueComplete": {
+                    "type": "boolean"
+                },
+                "lastUpdatedByAi": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "attachmentsByType",
+                "externalSource",
+                "location",
+                "votes",
+                "viewingMemberVoted",
+                "subscribed",
+                "attachments",
+                "fogbugz",
+                "checkItems",
+                "checkItemsChecked",
+                "checkItemsEarliestDue",
+                "comments",
+                "description",
+                "due",
+                "dueComplete",
+                "lastUpdatedByAi",
+                "start"
+            ]
+        },
+        "checkItemStates": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "idCheckItem": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "idCheckItem",
+                    "state"
+                ]
+            }
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "dueComplete": {
+            "type": "boolean"
+        },
+        "dateLastActivity": {
+            "type": "string"
+        },
+        "desc": {
+            "type": "string"
+        },
+        "email": {
+            "type": "null"
+        },
+        "idBoard": {
+            "type": "string"
+        },
+        "idChecklists": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idList": {
+            "type": "string"
+        },
+        "idMembers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idShort": {
+            "type": "integer"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "idBoard": {
+                        "type": "string"
+                    },
+                    "idOrganization": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "nodeId": {
+                        "type": "string"
+                    },
+                    "uses": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "idBoard",
+                    "name",
+                    "color",
+                    "uses"
+                ]
+            }
+        },
+        "idLabels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "manualCoverAttachment": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "shortLink": {
+            "type": "string"
+        },
+        "shortUrl": {
+            "type": "string"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "cover": {
+            "type": "object",
+            "properties": {
+                "idUploadedBackground": {
+                    "type": "null"
+                },
+                "size": {
+                    "type": "string"
+                },
+                "brightness": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "idAttachment",
+                "color",
+                "idUploadedBackground",
+                "size",
+                "brightness",
+                "idPlugin"
+            ]
+        },
+        "isTemplate": {
+            "type": "boolean"
+        },
+        "cardRole": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/update.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/update.json
new file mode 100644
index 0000000000..5bf6d6009c
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/card/update.json
@@ -0,0 +1,244 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "badges": {
+            "type": "object",
+            "properties": {
+                "attachmentsByType": {
+                    "type": "object",
+                    "properties": {
+                        "trello": {
+                            "type": "object",
+                            "properties": {
+                                "board": {
+                                    "type": "integer"
+                                },
+                                "card": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "board",
+                                "card"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "trello"
+                    ]
+                },
+                "location": {
+                    "type": "boolean"
+                },
+                "votes": {
+                    "type": "integer"
+                },
+                "viewingMemberVoted": {
+                    "type": "boolean"
+                },
+                "subscribed": {
+                    "type": "boolean"
+                },
+                "attachments": {
+                    "type": "integer"
+                },
+                "fogbugz": {
+                    "type": "string"
+                },
+                "checkItems": {
+                    "type": "integer"
+                },
+                "checkItemsChecked": {
+                    "type": "integer"
+                },
+                "checkItemsEarliestDue": {
+                    "type": "null"
+                },
+                "comments": {
+                    "type": "integer"
+                },
+                "description": {
+                    "type": "boolean"
+                },
+                "dueComplete": {
+                    "type": "boolean"
+                },
+                "lastUpdatedByAi": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "attachmentsByType",
+                "externalSource",
+                "location",
+                "votes",
+                "viewingMemberVoted",
+                "subscribed",
+                "attachments",
+                "fogbugz",
+                "checkItems",
+                "checkItemsChecked",
+                "checkItemsEarliestDue",
+                "comments",
+                "description",
+                "due",
+                "dueComplete",
+                "lastUpdatedByAi",
+                "start"
+            ]
+        },
+        "checkItemStates": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "idCheckItem": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "idCheckItem",
+                    "state"
+                ]
+            }
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "dueComplete": {
+            "type": "boolean"
+        },
+        "dateLastActivity": {
+            "type": "string"
+        },
+        "desc": {
+            "type": "string"
+        },
+        "email": {
+            "type": "null"
+        },
+        "idBoard": {
+            "type": "string"
+        },
+        "idChecklists": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idList": {
+            "type": "string"
+        },
+        "idMembers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idShort": {
+            "type": "integer"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "idBoard": {
+                        "type": "string"
+                    },
+                    "idOrganization": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "nodeId": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "uses": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "idBoard",
+                    "idOrganization",
+                    "name",
+                    "nodeId",
+                    "color",
+                    "uses"
+                ]
+            }
+        },
+        "idLabels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "manualCoverAttachment": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "shortLink": {
+            "type": "string"
+        },
+        "shortUrl": {
+            "type": "string"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "cover": {
+            "type": "object",
+            "properties": {
+                "idUploadedBackground": {
+                    "type": "null"
+                },
+                "size": {
+                    "type": "string"
+                },
+                "brightness": {
+                    "type": "string"
+                },
+                "idPlugin": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "idAttachment",
+                "color",
+                "idUploadedBackground",
+                "size",
+                "brightness",
+                "idPlugin"
+            ]
+        },
+        "isTemplate": {
+            "type": "boolean"
+        },
+        "cardRole": {
+            "type": "null"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/cardComment/create.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/cardComment/create.json
new file mode 100644
index 0000000000..66b16ba728
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/cardComment/create.json
@@ -0,0 +1,352 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "idMemberCreator": {
+            "type": "string"
+        },
+        "data": {
+            "type": "object",
+            "properties": {
+                "text": {
+                    "type": "string"
+                },
+                "card": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "idShort": {
+                            "type": "integer"
+                        },
+                        "shortLink": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "name",
+                        "idShort",
+                        "shortLink"
+                    ]
+                },
+                "board": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        },
+                        "shortLink": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "name",
+                        "shortLink"
+                    ]
+                },
+                "list": {
+                    "type": "object",
+                    "properties": {
+                        "id": {
+                            "type": "string"
+                        },
+                        "name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "id",
+                        "name"
+                    ]
+                }
+            },
+            "required": [
+                "text",
+                "textData",
+                "card",
+                "board",
+                "list"
+            ]
+        },
+        "appCreator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id"
+            ]
+        },
+        "type": {
+            "type": "string"
+        },
+        "date": {
+            "type": "string"
+        },
+        "limits": {
+            "type": "object",
+            "properties": {
+                "reactions": {
+                    "type": "object",
+                    "properties": {
+                        "perAction": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                },
+                                "disableAt": {
+                                    "type": "integer"
+                                },
+                                "warnAt": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "status",
+                                "disableAt",
+                                "warnAt"
+                            ]
+                        },
+                        "uniquePerAction": {
+                            "type": "object",
+                            "properties": {
+                                "status": {
+                                    "type": "string"
+                                },
+                                "disableAt": {
+                                    "type": "integer"
+                                },
+                                "warnAt": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "status",
+                                "disableAt",
+                                "warnAt"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "perAction",
+                        "uniquePerAction"
+                    ]
+                }
+            },
+            "required": [
+                "reactions"
+            ]
+        },
+        "display": {
+            "type": "object",
+            "properties": {
+                "translationKey": {
+                    "type": "string"
+                },
+                "entities": {
+                    "type": "object",
+                    "properties": {
+                        "contextOn": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "translationKey": {
+                                    "type": "string"
+                                },
+                                "hideIfContext": {
+                                    "type": "boolean"
+                                },
+                                "idContext": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "translationKey",
+                                "hideIfContext",
+                                "idContext"
+                            ]
+                        },
+                        "card": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "hideIfContext": {
+                                    "type": "boolean"
+                                },
+                                "id": {
+                                    "type": "string"
+                                },
+                                "shortLink": {
+                                    "type": "string"
+                                },
+                                "text": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "hideIfContext",
+                                "id",
+                                "shortLink",
+                                "text"
+                            ]
+                        },
+                        "comment": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "text": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "text"
+                            ]
+                        },
+                        "memberCreator": {
+                            "type": "object",
+                            "properties": {
+                                "type": {
+                                    "type": "string"
+                                },
+                                "id": {
+                                    "type": "string"
+                                },
+                                "username": {
+                                    "type": "string"
+                                },
+                                "text": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "type",
+                                "id",
+                                "username",
+                                "text"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "contextOn",
+                        "card",
+                        "comment",
+                        "memberCreator"
+                    ]
+                }
+            },
+            "required": [
+                "translationKey",
+                "entities"
+            ]
+        },
+        "entities": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "type": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "text": {
+                        "type": "string"
+                    },
+                    "hideIfContext": {
+                        "type": "boolean"
+                    },
+                    "idContext": {
+                        "type": "string"
+                    },
+                    "shortLink": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "type",
+                    "text"
+                ]
+            }
+        },
+        "memberCreator": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "string"
+                },
+                "activityBlocked": {
+                    "type": "boolean"
+                },
+                "avatarHash": {
+                    "type": "string"
+                },
+                "avatarUrl": {
+                    "type": "string"
+                },
+                "fullName": {
+                    "type": "string"
+                },
+                "initials": {
+                    "type": "string"
+                },
+                "nonPublicAvailable": {
+                    "type": "boolean"
+                },
+                "username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "id",
+                "activityBlocked",
+                "avatarHash",
+                "avatarUrl",
+                "fullName",
+                "idMemberReferrer",
+                "initials",
+                "nonPublic",
+                "nonPublicAvailable",
+                "username"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "idMemberCreator",
+        "data",
+        "appCreator",
+        "type",
+        "date",
+        "limits",
+        "display",
+        "entities",
+        "memberCreator"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/checklist/create.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/checklist/create.json
new file mode 100644
index 0000000000..fc5fad7ca8
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/checklist/create.json
@@ -0,0 +1,28 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"name": {
+			"type": "string"
+		},
+		"idBoard": {
+			"type": "string"
+		},
+		"idCard": {
+			"type": "string"
+		},
+		"pos": {
+			"type": "integer"
+		}
+	},
+	"required": [
+		"id",
+		"name",
+		"idBoard",
+		"idCard",
+		"pos",
+		"checkItems"
+	]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/checklist/createCheckItem.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/checklist/createCheckItem.json
new file mode 100644
index 0000000000..1347cdf429
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/checklist/createCheckItem.json
@@ -0,0 +1,41 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "string"
+		},
+		"name": {
+			"type": "string"
+		},
+		"pos": {
+			"type": "integer"
+		},
+		"state": {
+			"type": "string"
+		},
+		"due": {
+			"type": "null"
+		},
+		"dueReminder": {
+			"type": "null"
+		},
+		"idMember": {
+			"type": "null"
+		},
+		"idChecklist": {
+			"type": "string"
+		}
+	},
+	"required": [
+		"id",
+		"name",
+		"nameData",
+		"pos",
+		"state",
+		"due",
+		"dueReminder",
+		"idMember",
+		"idChecklist",
+		"limits"
+	]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/get.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/get.json
new file mode 100644
index 0000000000..c1d60b0a93
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/get.json
@@ -0,0 +1,34 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "idBoard": {
+            "type": "string"
+        },
+        "type": {
+            "type": "null"
+        },
+        "datasource": {
+            "type": "object",
+            "properties": {
+                "filter": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "filter"
+            ]
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/getAll.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/getAll.json
new file mode 100644
index 0000000000..102d0f7ab2
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/getAll.json
@@ -0,0 +1,37 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "idBoard": {
+            "type": "string"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "type": {
+            "type": "null"
+        },
+        "datasource": {
+            "type": "object",
+            "properties": {
+                "filter": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "filter"
+            ]
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/getCards.json b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/getCards.json
new file mode 100644
index 0000000000..1e2a85278a
--- /dev/null
+++ b/packages/nodes-base/nodes/Trello/__schema__/v1.0.0/list/getCards.json
@@ -0,0 +1,244 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "badges": {
+            "type": "object",
+            "properties": {
+                "attachmentsByType": {
+                    "type": "object",
+                    "properties": {
+                        "trello": {
+                            "type": "object",
+                            "properties": {
+                                "board": {
+                                    "type": "integer"
+                                },
+                                "card": {
+                                    "type": "integer"
+                                }
+                            },
+                            "required": [
+                                "board",
+                                "card"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "trello"
+                    ]
+                },
+                "location": {
+                    "type": "boolean"
+                },
+                "votes": {
+                    "type": "integer"
+                },
+                "viewingMemberVoted": {
+                    "type": "boolean"
+                },
+                "subscribed": {
+                    "type": "boolean"
+                },
+                "attachments": {
+                    "type": "integer"
+                },
+                "fogbugz": {
+                    "type": "string"
+                },
+                "checkItems": {
+                    "type": "integer"
+                },
+                "checkItemsChecked": {
+                    "type": "integer"
+                },
+                "comments": {
+                    "type": "integer"
+                },
+                "description": {
+                    "type": "boolean"
+                },
+                "dueComplete": {
+                    "type": "boolean"
+                },
+                "lastUpdatedByAi": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "attachmentsByType",
+                "externalSource",
+                "location",
+                "votes",
+                "viewingMemberVoted",
+                "subscribed",
+                "attachments",
+                "fogbugz",
+                "checkItems",
+                "checkItemsChecked",
+                "checkItemsEarliestDue",
+                "comments",
+                "description",
+                "due",
+                "dueComplete",
+                "lastUpdatedByAi",
+                "start"
+            ]
+        },
+        "checkItemStates": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "idCheckItem": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "idCheckItem",
+                    "state"
+                ]
+            }
+        },
+        "closed": {
+            "type": "boolean"
+        },
+        "dueComplete": {
+            "type": "boolean"
+        },
+        "dateLastActivity": {
+            "type": "string"
+        },
+        "desc": {
+            "type": "string"
+        },
+        "email": {
+            "type": "null"
+        },
+        "idBoard": {
+            "type": "string"
+        },
+        "idChecklists": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idList": {
+            "type": "string"
+        },
+        "idMembers": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "idShort": {
+            "type": "integer"
+        },
+        "labels": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "idBoard": {
+                        "type": "string"
+                    },
+                    "idOrganization": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "nodeId": {
+                        "type": "string"
+                    },
+                    "color": {
+                        "type": "string"
+                    },
+                    "uses": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "idBoard",
+                    "idOrganization",
+                    "name",
+                    "nodeId",
+                    "color",
+                    "uses"
+                ]
+            }
+        },
+        "idLabels": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "manualCoverAttachment": {
+            "type": "boolean"
+        },
+        "name": {
+            "type": "string"
+        },
+        "pinned": {
+            "type": "boolean"
+        },
+        "shortLink": {
+            "type": "string"
+        },
+        "shortUrl": {
+            "type": "string"
+        },
+        "subscribed": {
+            "type": "boolean"
+        },
+        "url": {
+            "type": "string"
+        },
+        "cover": {
+            "type": "object",
+            "properties": {
+                "color": {
+                    "type": "null"
+                },
+                "idUploadedBackground": {
+                    "type": "null"
+                },
+                "size": {
+                    "type": "string"
+                },
+                "brightness": {
+                    "type": "string"
+                },
+                "idPlugin": {
+                    "type": "null"
+                }
+            },
+            "required": [
+                "idAttachment",
+                "color",
+                "idUploadedBackground",
+                "size",
+                "brightness",
+                "idPlugin"
+            ]
+        },
+        "isTemplate": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Twake/Twake.node.ts b/packages/nodes-base/nodes/Twake/Twake.node.ts
index 04c6c7eb0e..9158f6674c 100644
--- a/packages/nodes-base/nodes/Twake/Twake.node.ts
+++ b/packages/nodes-base/nodes/Twake/Twake.node.ts
@@ -24,6 +24,7 @@ export class Twake implements INodeType {
 		defaults: {
 			name: 'Twake',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.ts b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
index c10f56b3b8..ab7b556acf 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.ts
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
@@ -22,6 +22,7 @@ export class Twilio implements INodeType {
 		defaults: {
 			name: 'Twilio',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Twilio/__schema__/v1.0.0/call/make.json b/packages/nodes-base/nodes/Twilio/__schema__/v1.0.0/call/make.json
new file mode 100644
index 0000000000..34e90d9b43
--- /dev/null
+++ b/packages/nodes-base/nodes/Twilio/__schema__/v1.0.0/call/make.json
@@ -0,0 +1,106 @@
+{
+    "type": "object",
+    "properties": {
+        "price_unit": {
+            "type": "string"
+        },
+        "parent_call_sid": {
+            "type": "null"
+        },
+        "caller_name": {
+            "type": "null"
+        },
+        "duration": {
+            "type": "null"
+        },
+        "from": {
+            "type": "string"
+        },
+        "to": {
+            "type": "string"
+        },
+        "annotation": {
+            "type": "null"
+        },
+        "answered_by": {
+            "type": "null"
+        },
+        "sid": {
+            "type": "string"
+        },
+        "queue_time": {
+            "type": "string"
+        },
+        "price": {
+            "type": "null"
+        },
+        "api_version": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "direction": {
+            "type": "string"
+        },
+        "start_time": {
+            "type": "null"
+        },
+        "from_formatted": {
+            "type": "string"
+        },
+        "group_sid": {
+            "type": "null"
+        },
+        "trunk_sid": {
+            "type": "null"
+        },
+        "forwarded_from": {
+            "type": "null"
+        },
+        "uri": {
+            "type": "string"
+        },
+        "account_sid": {
+            "type": "string"
+        },
+        "end_time": {
+            "type": "null"
+        },
+        "to_formatted": {
+            "type": "string"
+        },
+        "subresource_uris": {
+            "type": "object",
+            "properties": {
+                "notifications": {
+                    "type": "string"
+                },
+                "user_defined_messages": {
+                    "type": "string"
+                },
+                "transcriptions": {
+                    "type": "string"
+                },
+                "recordings": {
+                    "type": "string"
+                },
+                "streams": {
+                    "type": "string"
+                },
+                "payments": {
+                    "type": "string"
+                },
+                "user_defined_message_subscriptions": {
+                    "type": "string"
+                },
+                "siprec": {
+                    "type": "string"
+                },
+                "events": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Twilio/__schema__/v1.0.0/sms/send.json b/packages/nodes-base/nodes/Twilio/__schema__/v1.0.0/sms/send.json
new file mode 100644
index 0000000000..9be46b27b6
--- /dev/null
+++ b/packages/nodes-base/nodes/Twilio/__schema__/v1.0.0/sms/send.json
@@ -0,0 +1,92 @@
+{
+    "type": "object",
+    "properties": {
+        "account_sid": {
+            "type": "string"
+        },
+        "api_version": {
+            "type": "string"
+        },
+        "body": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_sent": {
+            "type": "null"
+        },
+        "date_updated": {
+            "type": "string"
+        },
+        "direction": {
+            "type": "string"
+        },
+        "error_code": {
+            "type": "null"
+        },
+        "error_message": {
+            "type": "null"
+        },
+        "from": {
+            "type": "string"
+        },
+        "messaging_service_sid": {
+            "type": "null"
+        },
+        "num_media": {
+            "type": "string"
+        },
+        "num_segments": {
+            "type": "string"
+        },
+        "price": {
+            "type": "null"
+        },
+        "sid": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "subresource_uris": {
+            "type": "object",
+            "properties": {
+                "media": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "media"
+            ]
+        },
+        "to": {
+            "type": "string"
+        },
+        "uri": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "account_sid",
+        "api_version",
+        "body",
+        "date_created",
+        "date_sent",
+        "date_updated",
+        "direction",
+        "error_code",
+        "error_message",
+        "from",
+        "messaging_service_sid",
+        "num_media",
+        "num_segments",
+        "price",
+        "price_unit",
+        "sid",
+        "status",
+        "subresource_uris",
+        "to",
+        "uri"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index a11c29c16e..4166530a22 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -33,6 +33,7 @@ export class Twist implements INodeType {
 		defaults: {
 			name: 'Twist',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
index e210689346..d923837a82 100644
--- a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
@@ -38,6 +38,7 @@ export class TwitterV2 implements INodeType {
 			defaults: {
 				name: 'X',
 			},
+			usableAsTool: true,
 			inputs: [NodeConnectionType.Main],
 			outputs: [NodeConnectionType.Main],
 			credentials: [
diff --git a/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/create.json b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/create.json
new file mode 100644
index 0000000000..9877268148
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/create.json
@@ -0,0 +1,17 @@
+{
+    "type": "object",
+    "properties": {
+        "text": {
+            "type": "string"
+        },
+        "edit_history_tweet_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "id": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/delete.json b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/delete.json
new file mode 100644
index 0000000000..1820d94a98
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/delete.json
@@ -0,0 +1,8 @@
+{
+    "type": "object",
+    "properties": {
+        "deleted": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/search.json b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/search.json
new file mode 100644
index 0000000000..44e418229f
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/tweet/search.json
@@ -0,0 +1,56 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "edit_history_tweet_ids": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "text": {
+            "type": "string"
+        },
+        "public_metrics": {
+            "type": "object",
+            "properties": {
+                "retweet_count": {
+                    "type": "integer"
+                },
+                "reply_count": {
+                    "type": "integer"
+                },
+                "like_count": {
+                    "type": "integer"
+                },
+                "quote_count": {
+                    "type": "integer"
+                },
+                "bookmark_count": {
+                    "type": "integer"
+                },
+                "impression_count": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "retweet_count",
+                "reply_count",
+                "like_count",
+                "quote_count",
+                "bookmark_count",
+                "impression_count"
+            ]
+        },
+        "author_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "edit_history_tweet_ids",
+        "text"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/user/searchUser.json b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/user/searchUser.json
new file mode 100644
index 0000000000..f5ac3afd1c
--- /dev/null
+++ b/packages/nodes-base/nodes/Twitter/__schema__/v2.0.0/user/searchUser.json
@@ -0,0 +1,14 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "username": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
index b653d691fe..49339e1a61 100644
--- a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
+++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
@@ -74,7 +74,6 @@ const meResult = {
 describe('Test Twitter Request Node', () => {
 	beforeAll(() => {
 		const baseUrl = 'https://api.twitter.com/2';
-		nock.disableNetConnect();
 		//GET
 		nock(baseUrl).get('/users/me').reply(200, meResult);
 
@@ -83,10 +82,6 @@ describe('Test Twitter Request Node', () => {
 			.reply(200, searchResult);
 	});
 
-	afterEach(() => {
-		nock.restore();
-	});
-
 	const workflows = getWorkflowFilenames(__dirname);
 	testWorkflows(workflows);
 });
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts
index 2aeccd5e9f..c5750bacfe 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.ts
+++ b/packages/nodes-base/nodes/UProc/UProc.node.ts
@@ -25,6 +25,7 @@ export class UProc implements INodeType {
 		defaults: {
 			name: 'uProc',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index 1d6e90a16d..4996e78c0a 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -29,6 +29,7 @@ export class UnleashedSoftware implements INodeType {
 		defaults: {
 			name: 'Unleashed Software',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Uplead/Uplead.node.ts b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
index ffa3df226d..a3fa9e1f3d 100644
--- a/packages/nodes-base/nodes/Uplead/Uplead.node.ts
+++ b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
@@ -24,6 +24,7 @@ export class Uplead implements INodeType {
 		defaults: {
 			name: 'Uplead',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index 48637dd7c0..c81a5cca78 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
@@ -29,6 +29,7 @@ export class UptimeRobot implements INodeType {
 		defaults: {
 			name: 'UptimeRobot',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
index 1862b9e8ae..b47a65f4ea 100644
--- a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
@@ -23,6 +23,7 @@ export class UrlScanIo implements INodeType {
 		defaults: {
 			name: 'urlscan.io',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/UrlScanIo/__schema__/v1.0.0/scan/perform.json b/packages/nodes-base/nodes/UrlScanIo/__schema__/v1.0.0/scan/perform.json
new file mode 100644
index 0000000000..c6d422d18f
--- /dev/null
+++ b/packages/nodes-base/nodes/UrlScanIo/__schema__/v1.0.0/scan/perform.json
@@ -0,0 +1,23 @@
+{
+    "type": "object",
+    "properties": {
+        "scanId": {
+            "type": "string"
+        },
+        "message": {
+            "type": "string"
+        },
+        "result": {
+            "type": "string"
+        },
+        "api": {
+            "type": "string"
+        },
+        "visibility": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
index 381e6da551..a6a86839b9 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
@@ -23,6 +23,7 @@ export class VenafiTlsProtectDatacenter implements INodeType {
 		defaults: {
 			name: 'Venafi TLS Protect Datacenter',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index fad5bac766..4d33c183f4 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
@@ -35,6 +35,7 @@ export class VenafiTlsProtectCloud implements INodeType {
 		defaults: {
 			name: 'Venafi TLS Protect Cloud',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index ebf9144118..2dc5eeed62 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -24,6 +24,7 @@ export class Vero implements INodeType {
 		defaults: {
 			name: 'Vero',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Vonage/Vonage.node.ts b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
index 411d992f26..2d83fba802 100644
--- a/packages/nodes-base/nodes/Vonage/Vonage.node.ts
+++ b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
@@ -22,6 +22,7 @@ export class Vonage implements INodeType {
 		defaults: {
 			name: 'Vonage',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Vonage/__schema__/v1.0.0/sms/send.json b/packages/nodes-base/nodes/Vonage/__schema__/v1.0.0/sms/send.json
new file mode 100644
index 0000000000..d3d02a19b0
--- /dev/null
+++ b/packages/nodes-base/nodes/Vonage/__schema__/v1.0.0/sms/send.json
@@ -0,0 +1,26 @@
+{
+    "type": "object",
+    "properties": {
+        "to": {
+            "type": "string"
+        },
+        "message-id": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "remaining-balance": {
+            "type": "string"
+        },
+        "message-price": {
+            "type": "string"
+        },
+        "network": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "status"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
index 3c9e6c56a6..ff159565af 100644
--- a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
@@ -16,6 +16,7 @@ export class WebflowV2 implements INodeType {
 		this.description = {
 			...baseDescription,
 			...versionDescription,
+			usableAsTool: true,
 		};
 	}
 
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
index 59eb4c552e..d8b5e17e10 100644
--- a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
@@ -16,19 +16,15 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		operation,
 	} as WebflowType;
 
-	try {
-		switch (webflowNodeData.resource) {
-			case 'item':
-				returnData = await item[webflowNodeData.operation].execute.call(this, items);
-				break;
-			default:
-				throw new NodeOperationError(
-					this.getNode(),
-					`The operation "${operation}" is not supported!`,
-				);
-		}
-	} catch (error) {
-		throw error;
+	switch (webflowNodeData.resource) {
+		case 'item':
+			returnData = await item[webflowNodeData.operation].execute.call(this, items);
+			break;
+		default:
+			throw new NodeOperationError(
+				this.getNode(),
+				`The operation "${operation}" is not supported!`,
+			);
 	}
 
 	return [returnData];
diff --git a/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/create.json b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/create.json
new file mode 100644
index 0000000000..ce2b17525b
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/create.json
@@ -0,0 +1,45 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "lastUpdated": {
+            "type": "string"
+        },
+        "createdOn": {
+            "type": "string"
+        },
+        "isArchived": {
+            "type": "boolean"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "fieldData": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "slug": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "slug"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "cmsLocaleId",
+        "lastPublished",
+        "lastUpdated",
+        "createdOn",
+        "isArchived",
+        "isDraft",
+        "fieldData"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/get.json b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/get.json
new file mode 100644
index 0000000000..c1aae54925
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/get.json
@@ -0,0 +1,45 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "lastUpdated": {
+            "type": "string"
+        },
+        "createdOn": {
+            "type": "string"
+        },
+        "isArchived": {
+            "type": "boolean"
+        },
+        "fieldData": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "slug": {
+                    "type": "string"
+                },
+                "body": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "slug"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "cmsLocaleId",
+        "lastPublished",
+        "lastUpdated",
+        "createdOn",
+        "isArchived",
+        "isDraft",
+        "fieldData"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/getAll.json b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/getAll.json
new file mode 100644
index 0000000000..ce2b17525b
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/getAll.json
@@ -0,0 +1,45 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "lastUpdated": {
+            "type": "string"
+        },
+        "createdOn": {
+            "type": "string"
+        },
+        "isArchived": {
+            "type": "boolean"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "fieldData": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "slug": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "slug"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "cmsLocaleId",
+        "lastPublished",
+        "lastUpdated",
+        "createdOn",
+        "isArchived",
+        "isDraft",
+        "fieldData"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/update.json b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/update.json
new file mode 100644
index 0000000000..ce2b17525b
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/__schema__/v2.0.0/item/update.json
@@ -0,0 +1,45 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        },
+        "lastUpdated": {
+            "type": "string"
+        },
+        "createdOn": {
+            "type": "string"
+        },
+        "isArchived": {
+            "type": "boolean"
+        },
+        "isDraft": {
+            "type": "boolean"
+        },
+        "fieldData": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "slug": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "slug"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "cmsLocaleId",
+        "lastPublished",
+        "lastUpdated",
+        "createdOn",
+        "isArchived",
+        "isDraft",
+        "fieldData"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 6e54c46ed1..9051ce0b31 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -34,6 +34,7 @@ export class Wekan implements INodeType {
 		defaults: {
 			name: 'Wekan',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
index 2947b4a60d..a89b22184b 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
@@ -16,6 +16,7 @@ export class WhatsApp implements INodeType {
 		defaults: {
 			name: 'WhatsApp Business Cloud',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/media/mediaUpload.json b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/media/mediaUpload.json
new file mode 100644
index 0000000000..0f8ec9d998
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/media/mediaUpload.json
@@ -0,0 +1,11 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/media/mediaUrlGet.json b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/media/mediaUrlGet.json
new file mode 100644
index 0000000000..d41bd4b923
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/media/mediaUrlGet.json
@@ -0,0 +1,31 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "mime_type": {
+            "type": "string"
+        },
+        "sha256": {
+            "type": "string"
+        },
+        "file_size": {
+            "type": "integer"
+        },
+        "id": {
+            "type": "string"
+        },
+        "messaging_product": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "url",
+        "mime_type",
+        "sha256",
+        "file_size",
+        "id",
+        "messaging_product"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/message/send.json b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/message/send.json
new file mode 100644
index 0000000000..cf61ed7efc
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/message/send.json
@@ -0,0 +1,40 @@
+{
+    "type": "object",
+    "properties": {
+        "messaging_product": {
+            "type": "string"
+        },
+        "contacts": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "input": {
+                        "type": "string"
+                    },
+                    "wa_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "input",
+                    "wa_id"
+                ]
+            }
+        },
+        "messages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/message/sendTemplate.json b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/message/sendTemplate.json
new file mode 100644
index 0000000000..ef56ca5daf
--- /dev/null
+++ b/packages/nodes-base/nodes/WhatsApp/__schema__/v1.0.0/message/sendTemplate.json
@@ -0,0 +1,44 @@
+{
+    "type": "object",
+    "properties": {
+        "messaging_product": {
+            "type": "string"
+        },
+        "contacts": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "input": {
+                        "type": "string"
+                    },
+                    "wa_id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "input",
+                    "wa_id"
+                ]
+            }
+        },
+        "messages": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "message_status": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "message_status"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index 22432a3422..6b0f08c657 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -296,7 +296,7 @@ export class Wise implements INodeType {
 							qs.to = moment.tz(range.rangeProperties.to, timezone).utc().format();
 						} else if (time === undefined) {
 							qs.from = moment().subtract(1, 'months').utc().format();
-							qs.to = moment().format();
+							qs.to = moment().utc().format();
 						}
 
 						responseData = await wiseApiRequest.call(this, 'GET', 'v1/rates', {}, qs);
@@ -510,11 +510,17 @@ export class Wise implements INodeType {
 						});
 
 						if (filters.range !== undefined) {
-							qs.createdDateStart = moment(filters.range.rangeProperties.createdDateStart).format();
-							qs.createdDateEnd = moment(filters.range.rangeProperties.createdDateEnd).format();
+							qs.createdDateStart = moment
+								.tz(filters.range.rangeProperties.createdDateStart, timezone)
+								.utc()
+								.format();
+							qs.createdDateEnd = moment
+								.tz(filters.range.rangeProperties.createdDateEnd, timezone)
+								.utc()
+								.format();
 						} else {
-							qs.createdDateStart = moment().subtract(1, 'months').format();
-							qs.createdDateEnd = moment().format();
+							qs.createdDateStart = moment().subtract(1, 'months').utc().format();
+							qs.createdDateEnd = moment().utc().format();
 						}
 
 						const returnAll = this.getNodeParameter('returnAll', i);
diff --git a/packages/nodes-base/nodes/Wise/__schema__/v1.0.0/account/getBalances.json b/packages/nodes-base/nodes/Wise/__schema__/v1.0.0/account/getBalances.json
new file mode 100644
index 0000000000..c1fe5d6933
--- /dev/null
+++ b/packages/nodes-base/nodes/Wise/__schema__/v1.0.0/account/getBalances.json
@@ -0,0 +1,85 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "integer"
+		},
+		"profileId": {
+			"type": "integer"
+		},
+		"recipientId": {
+			"type": "integer"
+		},
+		"creationTime": {
+			"type": "string"
+		},
+		"modificationTime": {
+			"type": "string"
+		},
+		"active": {
+			"type": "boolean"
+		},
+		"eligible": {
+			"type": "boolean"
+		},
+		"balances": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer"
+					},
+					"balanceType": {
+						"type": "string"
+					},
+					"currency": {
+						"type": "string"
+					},
+					"amount": {
+						"type": "object",
+						"properties": {
+							"currency": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"value",
+							"currency"
+						]
+					},
+					"reservedAmount": {
+						"type": "object",
+						"properties": {
+							"currency": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"value",
+							"currency"
+						]
+					}
+				},
+				"required": [
+					"id",
+					"balanceType",
+					"currency",
+					"amount",
+					"reservedAmount",
+					"bankDetails"
+				]
+			}
+		}
+	},
+	"required": [
+		"id",
+		"profileId",
+		"recipientId",
+		"creationTime",
+		"modificationTime",
+		"active",
+		"eligible",
+		"balances"
+	]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/customer/get.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/customer/get.json
new file mode 100644
index 0000000000..217688c025
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/customer/get.json
@@ -0,0 +1,213 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "integer"
+		},
+		"date_created": {
+			"type": "string"
+		},
+		"date_created_gmt": {
+			"type": "string"
+		},
+		"date_modified": {
+			"type": "string"
+		},
+		"date_modified_gmt": {
+			"type": "string"
+		},
+		"email": {
+			"type": "string"
+		},
+		"first_name": {
+			"type": "string"
+		},
+		"last_name": {
+			"type": "string"
+		},
+		"role": {
+			"type": "string"
+		},
+		"username": {
+			"type": "string"
+		},
+		"billing": {
+			"type": "object",
+			"properties": {
+				"first_name": {
+					"type": "string"
+				},
+				"last_name": {
+					"type": "string"
+				},
+				"company": {
+					"type": "string"
+				},
+				"address_1": {
+					"type": "string"
+				},
+				"address_2": {
+					"type": "string"
+				},
+				"city": {
+					"type": "string"
+				},
+				"postcode": {
+					"type": "string"
+				},
+				"country": {
+					"type": "string"
+				},
+				"state": {
+					"type": "string"
+				},
+				"email": {
+					"type": "string"
+				},
+				"phone": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"first_name",
+				"last_name",
+				"company",
+				"address_1",
+				"address_2",
+				"city",
+				"postcode",
+				"country",
+				"state",
+				"email",
+				"phone"
+			]
+		},
+		"shipping": {
+			"type": "object",
+			"properties": {
+				"first_name": {
+					"type": "string"
+				},
+				"last_name": {
+					"type": "string"
+				},
+				"company": {
+					"type": "string"
+				},
+				"address_1": {
+					"type": "string"
+				},
+				"address_2": {
+					"type": "string"
+				},
+				"city": {
+					"type": "string"
+				},
+				"postcode": {
+					"type": "string"
+				},
+				"country": {
+					"type": "string"
+				},
+				"state": {
+					"type": "string"
+				},
+				"phone": {
+					"type": "string"
+				}
+			},
+			"required": [
+				"first_name",
+				"last_name",
+				"company",
+				"address_1",
+				"address_2",
+				"city",
+				"postcode",
+				"country",
+				"state",
+				"phone"
+			]
+		},
+		"is_paying_customer": {
+			"type": "boolean"
+		},
+		"avatar_url": {
+			"type": "string"
+		},
+		"meta_data": {
+			"type": "array",
+			"items": {
+				"type": "object",
+				"properties": {
+					"id": {
+						"type": "integer"
+					},
+					"key": {
+						"type": "string"
+					}
+				},
+				"required": [
+					"id",
+					"key",
+					"value"
+				]
+			}
+		},
+		"_links": {
+			"type": "object",
+			"properties": {
+				"self": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"href": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"href"
+						]
+					}
+				},
+				"collection": {
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"href": {
+								"type": "string"
+							}
+						},
+						"required": [
+							"href"
+						]
+					}
+				}
+			},
+			"required": [
+				"self",
+				"collection"
+			]
+		}
+	},
+	"required": [
+		"id",
+		"date_created",
+		"date_created_gmt",
+		"date_modified",
+		"date_modified_gmt",
+		"email",
+		"first_name",
+		"last_name",
+		"role",
+		"username",
+		"billing",
+		"shipping",
+		"is_paying_customer",
+		"avatar_url",
+		"meta_data",
+		"_links"
+	]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/customer/getAll.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/customer/getAll.json
new file mode 100644
index 0000000000..65ccd743a0
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/customer/getAll.json
@@ -0,0 +1,207 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_created_gmt": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "first_name": {
+            "type": "string"
+        },
+        "last_name": {
+            "type": "string"
+        },
+        "role": {
+            "type": "string"
+        },
+        "username": {
+            "type": "string"
+        },
+        "billing": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "postcode",
+                "country",
+                "state",
+                "email",
+                "phone"
+            ]
+        },
+        "shipping": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "postcode",
+                "country",
+                "state",
+                "phone"
+            ]
+        },
+        "is_paying_customer": {
+            "type": "boolean"
+        },
+        "avatar_url": {
+            "type": "string"
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "date_created",
+        "date_created_gmt",
+        "date_modified",
+        "date_modified_gmt",
+        "email",
+        "first_name",
+        "last_name",
+        "role",
+        "username",
+        "billing",
+        "shipping",
+        "is_paying_customer",
+        "avatar_url",
+        "meta_data",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/create.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/create.json
new file mode 100644
index 0000000000..43f2c1b0d2
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/create.json
@@ -0,0 +1,441 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "version": {
+            "type": "string"
+        },
+        "prices_include_tax": {
+            "type": "boolean"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "discount_total": {
+            "type": "string"
+        },
+        "discount_tax": {
+            "type": "string"
+        },
+        "shipping_total": {
+            "type": "string"
+        },
+        "shipping_tax": {
+            "type": "string"
+        },
+        "cart_tax": {
+            "type": "string"
+        },
+        "total": {
+            "type": "string"
+        },
+        "total_tax": {
+            "type": "string"
+        },
+        "customer_id": {
+            "type": "integer"
+        },
+        "order_key": {
+            "type": "string"
+        },
+        "billing": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "state",
+                "postcode",
+                "country",
+                "email",
+                "phone"
+            ]
+        },
+        "shipping": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "state",
+                "postcode",
+                "country",
+                "phone"
+            ]
+        },
+        "payment_method": {
+            "type": "string"
+        },
+        "payment_method_title": {
+            "type": "string"
+        },
+        "transaction_id": {
+            "type": "string"
+        },
+        "customer_ip_address": {
+            "type": "string"
+        },
+        "customer_user_agent": {
+            "type": "string"
+        },
+        "created_via": {
+            "type": "string"
+        },
+        "customer_note": {
+            "type": "string"
+        },
+        "cart_hash": {
+            "type": "string"
+        },
+        "number": {
+            "type": "string"
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "line_items": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "variation_id": {
+                        "type": "integer"
+                    },
+                    "quantity": {
+                        "type": "integer"
+                    },
+                    "tax_class": {
+                        "type": "string"
+                    },
+                    "subtotal": {
+                        "type": "string"
+                    },
+                    "subtotal_tax": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                },
+                                "display_value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    },
+                    "image": {
+                        "type": "object",
+                        "properties": {
+                            "src": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "src"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "product_id",
+                    "variation_id",
+                    "quantity",
+                    "tax_class",
+                    "subtotal",
+                    "subtotal_tax",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data",
+                    "sku",
+                    "price",
+                    "image",
+                    "parent_name"
+                ]
+            }
+        },
+        "shipping_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "method_title": {
+                        "type": "string"
+                    },
+                    "method_id": {
+                        "type": "string"
+                    },
+                    "instance_id": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "method_title",
+                    "method_id",
+                    "instance_id",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data"
+                ]
+            }
+        },
+        "payment_url": {
+            "type": "string"
+        },
+        "is_editable": {
+            "type": "boolean"
+        },
+        "needs_payment": {
+            "type": "boolean"
+        },
+        "needs_processing": {
+            "type": "boolean"
+        },
+        "date_created_gmt": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "currency_symbol": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "parent_id",
+        "status",
+        "currency",
+        "version",
+        "prices_include_tax",
+        "date_created",
+        "date_modified",
+        "discount_total",
+        "discount_tax",
+        "shipping_total",
+        "shipping_tax",
+        "cart_tax",
+        "total",
+        "total_tax",
+        "customer_id",
+        "order_key",
+        "billing",
+        "shipping",
+        "payment_method",
+        "payment_method_title",
+        "transaction_id",
+        "customer_ip_address",
+        "customer_user_agent",
+        "created_via",
+        "customer_note",
+        "date_completed",
+        "date_paid",
+        "cart_hash",
+        "number",
+        "meta_data",
+        "line_items",
+        "tax_lines",
+        "shipping_lines",
+        "fee_lines",
+        "coupon_lines",
+        "refunds",
+        "payment_url",
+        "is_editable",
+        "needs_payment",
+        "needs_processing",
+        "date_created_gmt",
+        "date_modified_gmt",
+        "date_completed_gmt",
+        "date_paid_gmt",
+        "currency_symbol",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/get.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/get.json
new file mode 100644
index 0000000000..891857aa6d
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/get.json
@@ -0,0 +1,646 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "version": {
+            "type": "string"
+        },
+        "prices_include_tax": {
+            "type": "boolean"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "discount_total": {
+            "type": "string"
+        },
+        "discount_tax": {
+            "type": "string"
+        },
+        "shipping_total": {
+            "type": "string"
+        },
+        "shipping_tax": {
+            "type": "string"
+        },
+        "cart_tax": {
+            "type": "string"
+        },
+        "total": {
+            "type": "string"
+        },
+        "total_tax": {
+            "type": "string"
+        },
+        "customer_id": {
+            "type": "integer"
+        },
+        "order_key": {
+            "type": "string"
+        },
+        "billing": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "state",
+                "postcode",
+                "country",
+                "email",
+                "phone"
+            ]
+        },
+        "shipping": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "state",
+                "postcode",
+                "country",
+                "phone"
+            ]
+        },
+        "payment_method": {
+            "type": "string"
+        },
+        "payment_method_title": {
+            "type": "string"
+        },
+        "transaction_id": {
+            "type": "string"
+        },
+        "customer_ip_address": {
+            "type": "string"
+        },
+        "customer_user_agent": {
+            "type": "string"
+        },
+        "created_via": {
+            "type": "string"
+        },
+        "customer_note": {
+            "type": "string"
+        },
+        "cart_hash": {
+            "type": "string"
+        },
+        "number": {
+            "type": "string"
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "line_items": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "variation_id": {
+                        "type": "integer"
+                    },
+                    "quantity": {
+                        "type": "integer"
+                    },
+                    "tax_class": {
+                        "type": "string"
+                    },
+                    "subtotal": {
+                        "type": "string"
+                    },
+                    "subtotal_tax": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    },
+                    "taxes": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "total": {
+                                    "type": "string"
+                                },
+                                "subtotal": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "total",
+                                "subtotal"
+                            ]
+                        }
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    },
+                    "image": {
+                        "type": "object",
+                        "properties": {
+                            "src": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "src"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "product_id",
+                    "variation_id",
+                    "quantity",
+                    "tax_class",
+                    "subtotal",
+                    "subtotal_tax",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data",
+                    "sku",
+                    "price",
+                    "image",
+                    "parent_name"
+                ]
+            }
+        },
+        "tax_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "rate_code": {
+                        "type": "string"
+                    },
+                    "rate_id": {
+                        "type": "integer"
+                    },
+                    "label": {
+                        "type": "string"
+                    },
+                    "compound": {
+                        "type": "boolean"
+                    },
+                    "tax_total": {
+                        "type": "string"
+                    },
+                    "shipping_tax_total": {
+                        "type": "string"
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                },
+                                "display_value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "rate_code",
+                    "rate_id",
+                    "label",
+                    "compound",
+                    "tax_total",
+                    "shipping_tax_total",
+                    "rate_percent",
+                    "meta_data"
+                ]
+            }
+        },
+        "shipping_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "method_title": {
+                        "type": "string"
+                    },
+                    "method_id": {
+                        "type": "string"
+                    },
+                    "instance_id": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    },
+                    "taxes": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "total": {
+                                    "type": "string"
+                                },
+                                "subtotal": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "total",
+                                "subtotal"
+                            ]
+                        }
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "method_title",
+                    "method_id",
+                    "instance_id",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data"
+                ]
+            }
+        },
+        "fee_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "tax_class": {
+                        "type": "string"
+                    },
+                    "tax_status": {
+                        "type": "string"
+                    },
+                    "amount": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "tax_class",
+                    "tax_status",
+                    "amount",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data"
+                ]
+            }
+        },
+        "coupon_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "code": {
+                        "type": "string"
+                    },
+                    "discount": {
+                        "type": "string"
+                    },
+                    "discount_tax": {
+                        "type": "string"
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    },
+                    "discount_type": {
+                        "type": "string"
+                    },
+                    "free_shipping": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "code",
+                    "discount",
+                    "discount_tax",
+                    "meta_data",
+                    "discount_type",
+                    "nominal_amount",
+                    "free_shipping"
+                ]
+            }
+        },
+        "refunds": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "reason": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "reason",
+                    "total"
+                ]
+            }
+        },
+        "payment_url": {
+            "type": "string"
+        },
+        "is_editable": {
+            "type": "boolean"
+        },
+        "needs_payment": {
+            "type": "boolean"
+        },
+        "needs_processing": {
+            "type": "boolean"
+        },
+        "date_created_gmt": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "currency_symbol": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/getAll.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/getAll.json
new file mode 100644
index 0000000000..974c87e974
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/order/getAll.json
@@ -0,0 +1,764 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "currency": {
+            "type": "string"
+        },
+        "version": {
+            "type": "string"
+        },
+        "prices_include_tax": {
+            "type": "boolean"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "discount_total": {
+            "type": "string"
+        },
+        "discount_tax": {
+            "type": "string"
+        },
+        "shipping_total": {
+            "type": "string"
+        },
+        "shipping_tax": {
+            "type": "string"
+        },
+        "cart_tax": {
+            "type": "string"
+        },
+        "total": {
+            "type": "string"
+        },
+        "total_tax": {
+            "type": "string"
+        },
+        "customer_id": {
+            "type": "integer"
+        },
+        "order_key": {
+            "type": "string"
+        },
+        "billing": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "state",
+                "postcode",
+                "country",
+                "email",
+                "phone"
+            ]
+        },
+        "shipping": {
+            "type": "object",
+            "properties": {
+                "first_name": {
+                    "type": "string"
+                },
+                "last_name": {
+                    "type": "string"
+                },
+                "company": {
+                    "type": "string"
+                },
+                "address_1": {
+                    "type": "string"
+                },
+                "address_2": {
+                    "type": "string"
+                },
+                "city": {
+                    "type": "string"
+                },
+                "state": {
+                    "type": "string"
+                },
+                "postcode": {
+                    "type": "string"
+                },
+                "country": {
+                    "type": "string"
+                },
+                "phone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "first_name",
+                "last_name",
+                "company",
+                "address_1",
+                "address_2",
+                "city",
+                "state",
+                "postcode",
+                "country"
+            ]
+        },
+        "payment_method": {
+            "type": "string"
+        },
+        "payment_method_title": {
+            "type": "string"
+        },
+        "transaction_id": {
+            "type": "string"
+        },
+        "customer_ip_address": {
+            "type": "string"
+        },
+        "customer_user_agent": {
+            "type": "string"
+        },
+        "created_via": {
+            "type": "string"
+        },
+        "customer_note": {
+            "type": "string"
+        },
+        "cart_hash": {
+            "type": "string"
+        },
+        "number": {
+            "type": "string"
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "line_items": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "product_id": {
+                        "type": "integer"
+                    },
+                    "variation_id": {
+                        "type": "integer"
+                    },
+                    "quantity": {
+                        "type": "integer"
+                    },
+                    "tax_class": {
+                        "type": "string"
+                    },
+                    "subtotal": {
+                        "type": "string"
+                    },
+                    "subtotal_tax": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    },
+                    "taxes": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "total": {
+                                    "type": "string"
+                                },
+                                "subtotal": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "total",
+                                "subtotal"
+                            ]
+                        }
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    },
+                    "sku": {
+                        "type": "string"
+                    },
+                    "image": {
+                        "type": "object",
+                        "properties": {
+                            "src": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "src"
+                        ]
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "product_id",
+                    "variation_id",
+                    "quantity",
+                    "tax_class",
+                    "subtotal",
+                    "subtotal_tax",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data",
+                    "sku",
+                    "price",
+                    "parent_name"
+                ]
+            }
+        },
+        "tax_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "rate_code": {
+                        "type": "string"
+                    },
+                    "rate_id": {
+                        "type": "integer"
+                    },
+                    "label": {
+                        "type": "string"
+                    },
+                    "compound": {
+                        "type": "boolean"
+                    },
+                    "tax_total": {
+                        "type": "string"
+                    },
+                    "shipping_tax_total": {
+                        "type": "string"
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                },
+                                "display_value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "rate_code",
+                    "rate_id",
+                    "label",
+                    "compound",
+                    "tax_total",
+                    "shipping_tax_total",
+                    "rate_percent",
+                    "meta_data"
+                ]
+            }
+        },
+        "shipping_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "method_title": {
+                        "type": "string"
+                    },
+                    "method_id": {
+                        "type": "string"
+                    },
+                    "instance_id": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    },
+                    "taxes": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "total": {
+                                    "type": "string"
+                                },
+                                "subtotal": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "total",
+                                "subtotal"
+                            ]
+                        }
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "method_title",
+                    "method_id",
+                    "instance_id",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data"
+                ]
+            }
+        },
+        "fee_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "tax_class": {
+                        "type": "string"
+                    },
+                    "tax_status": {
+                        "type": "string"
+                    },
+                    "amount": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    },
+                    "total_tax": {
+                        "type": "string"
+                    },
+                    "taxes": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "total": {
+                                    "type": "string"
+                                },
+                                "subtotal": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "total",
+                                "subtotal"
+                            ]
+                        }
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                },
+                                "display_value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "tax_class",
+                    "tax_status",
+                    "amount",
+                    "total",
+                    "total_tax",
+                    "taxes",
+                    "meta_data"
+                ]
+            }
+        },
+        "coupon_lines": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "code": {
+                        "type": "string"
+                    },
+                    "discount": {
+                        "type": "string"
+                    },
+                    "discount_tax": {
+                        "type": "string"
+                    },
+                    "meta_data": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                },
+                                "display_key": {
+                                    "type": "string"
+                                },
+                                "display_value": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "key",
+                                "value",
+                                "display_key",
+                                "display_value"
+                            ]
+                        }
+                    },
+                    "discount_type": {
+                        "type": "string"
+                    },
+                    "free_shipping": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "code",
+                    "discount",
+                    "discount_tax",
+                    "meta_data",
+                    "discount_type",
+                    "nominal_amount",
+                    "free_shipping"
+                ]
+            }
+        },
+        "refunds": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "reason": {
+                        "type": "string"
+                    },
+                    "total": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "reason",
+                    "total"
+                ]
+            }
+        },
+        "payment_url": {
+            "type": "string"
+        },
+        "is_editable": {
+            "type": "boolean"
+        },
+        "needs_payment": {
+            "type": "boolean"
+        },
+        "needs_processing": {
+            "type": "boolean"
+        },
+        "date_created_gmt": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "currency_symbol": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "customer": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "parent_id",
+        "status",
+        "currency",
+        "version",
+        "prices_include_tax",
+        "date_created",
+        "date_modified",
+        "discount_total",
+        "discount_tax",
+        "shipping_total",
+        "shipping_tax",
+        "cart_tax",
+        "total",
+        "total_tax",
+        "customer_id",
+        "order_key",
+        "billing",
+        "shipping",
+        "payment_method",
+        "payment_method_title",
+        "transaction_id",
+        "customer_ip_address",
+        "customer_user_agent",
+        "created_via",
+        "customer_note",
+        "date_completed",
+        "date_paid",
+        "cart_hash",
+        "number",
+        "meta_data",
+        "line_items",
+        "tax_lines",
+        "shipping_lines",
+        "fee_lines",
+        "coupon_lines",
+        "refunds",
+        "date_created_gmt",
+        "date_modified_gmt",
+        "date_completed_gmt",
+        "date_paid_gmt",
+        "currency_symbol",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/create.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/create.json
new file mode 100644
index 0000000000..d9ad61afa6
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/create.json
@@ -0,0 +1,413 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "date_created": {
+            "type": "string"
+        },
+        "date_created_gmt": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "featured": {
+            "type": "boolean"
+        },
+        "catalog_visibility": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "sku": {
+            "type": "string"
+        },
+        "price": {
+            "type": "string"
+        },
+        "regular_price": {
+            "type": "string"
+        },
+        "sale_price": {
+            "type": "string"
+        },
+        "date_on_sale_from": {
+            "type": "null"
+        },
+        "date_on_sale_from_gmt": {
+            "type": "null"
+        },
+        "date_on_sale_to": {
+            "type": "null"
+        },
+        "date_on_sale_to_gmt": {
+            "type": "null"
+        },
+        "on_sale": {
+            "type": "boolean"
+        },
+        "purchasable": {
+            "type": "boolean"
+        },
+        "total_sales": {
+            "type": "integer"
+        },
+        "virtual": {
+            "type": "boolean"
+        },
+        "downloadable": {
+            "type": "boolean"
+        },
+        "download_limit": {
+            "type": "integer"
+        },
+        "download_expiry": {
+            "type": "integer"
+        },
+        "external_url": {
+            "type": "string"
+        },
+        "button_text": {
+            "type": "string"
+        },
+        "tax_status": {
+            "type": "string"
+        },
+        "tax_class": {
+            "type": "string"
+        },
+        "manage_stock": {
+            "type": "boolean"
+        },
+        "backorders": {
+            "type": "string"
+        },
+        "backorders_allowed": {
+            "type": "boolean"
+        },
+        "backordered": {
+            "type": "boolean"
+        },
+        "sold_individually": {
+            "type": "boolean"
+        },
+        "weight": {
+            "type": "string"
+        },
+        "dimensions": {
+            "type": "object",
+            "properties": {
+                "length": {
+                    "type": "string"
+                },
+                "width": {
+                    "type": "string"
+                },
+                "height": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "length",
+                "width",
+                "height"
+            ]
+        },
+        "shipping_required": {
+            "type": "boolean"
+        },
+        "shipping_taxable": {
+            "type": "boolean"
+        },
+        "shipping_class": {
+            "type": "string"
+        },
+        "shipping_class_id": {
+            "type": "integer"
+        },
+        "reviews_allowed": {
+            "type": "boolean"
+        },
+        "average_rating": {
+            "type": "string"
+        },
+        "rating_count": {
+            "type": "integer"
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "purchase_note": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "date_created_gmt": {
+                        "type": "string"
+                    },
+                    "date_modified": {
+                        "type": "string"
+                    },
+                    "date_modified_gmt": {
+                        "type": "string"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "alt": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "date_created",
+                    "date_created_gmt",
+                    "date_modified",
+                    "date_modified_gmt",
+                    "src",
+                    "name",
+                    "alt"
+                ]
+            }
+        },
+        "menu_order": {
+            "type": "integer"
+        },
+        "price_html": {
+            "type": "string"
+        },
+        "related_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "stock_status": {
+            "type": "string"
+        },
+        "has_options": {
+            "type": "boolean"
+        },
+        "post_password": {
+            "type": "string"
+        },
+        "global_unique_id": {
+            "type": "string"
+        },
+        "permalink_template": {
+            "type": "string"
+        },
+        "generated_slug": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "slug",
+        "permalink",
+        "date_created",
+        "date_created_gmt",
+        "date_modified",
+        "date_modified_gmt",
+        "type",
+        "status",
+        "featured",
+        "catalog_visibility",
+        "description",
+        "short_description",
+        "sku",
+        "price",
+        "regular_price",
+        "sale_price",
+        "date_on_sale_from",
+        "date_on_sale_from_gmt",
+        "date_on_sale_to",
+        "date_on_sale_to_gmt",
+        "on_sale",
+        "purchasable",
+        "total_sales",
+        "virtual",
+        "downloadable",
+        "downloads",
+        "download_limit",
+        "download_expiry",
+        "external_url",
+        "button_text",
+        "tax_status",
+        "tax_class",
+        "manage_stock",
+        "stock_quantity",
+        "backorders",
+        "backorders_allowed",
+        "backordered",
+        "low_stock_amount",
+        "sold_individually",
+        "weight",
+        "dimensions",
+        "shipping_required",
+        "shipping_taxable",
+        "shipping_class",
+        "shipping_class_id",
+        "reviews_allowed",
+        "average_rating",
+        "rating_count",
+        "upsell_ids",
+        "cross_sell_ids",
+        "parent_id",
+        "purchase_note",
+        "categories",
+        "tags",
+        "images",
+        "attributes",
+        "default_attributes",
+        "variations",
+        "grouped_products",
+        "menu_order",
+        "price_html",
+        "related_ids",
+        "meta_data",
+        "stock_status",
+        "has_options",
+        "post_password",
+        "permalink_template",
+        "generated_slug",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/get.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/get.json
new file mode 100644
index 0000000000..cbe9469cee
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/get.json
@@ -0,0 +1,460 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "featured": {
+            "type": "boolean"
+        },
+        "catalog_visibility": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "sku": {
+            "type": "string"
+        },
+        "sale_price": {
+            "type": "string"
+        },
+        "on_sale": {
+            "type": "boolean"
+        },
+        "purchasable": {
+            "type": "boolean"
+        },
+        "virtual": {
+            "type": "boolean"
+        },
+        "downloadable": {
+            "type": "boolean"
+        },
+        "download_limit": {
+            "type": "integer"
+        },
+        "download_expiry": {
+            "type": "integer"
+        },
+        "external_url": {
+            "type": "string"
+        },
+        "button_text": {
+            "type": "string"
+        },
+        "tax_status": {
+            "type": "string"
+        },
+        "tax_class": {
+            "type": "string"
+        },
+        "manage_stock": {
+            "type": "boolean"
+        },
+        "backorders": {
+            "type": "string"
+        },
+        "backorders_allowed": {
+            "type": "boolean"
+        },
+        "backordered": {
+            "type": "boolean"
+        },
+        "sold_individually": {
+            "type": "boolean"
+        },
+        "weight": {
+            "type": "string"
+        },
+        "dimensions": {
+            "type": "object",
+            "properties": {
+                "length": {
+                    "type": "string"
+                },
+                "width": {
+                    "type": "string"
+                },
+                "height": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "length",
+                "width",
+                "height"
+            ]
+        },
+        "shipping_required": {
+            "type": "boolean"
+        },
+        "shipping_taxable": {
+            "type": "boolean"
+        },
+        "shipping_class": {
+            "type": "string"
+        },
+        "shipping_class_id": {
+            "type": "integer"
+        },
+        "reviews_allowed": {
+            "type": "boolean"
+        },
+        "average_rating": {
+            "type": "string"
+        },
+        "rating_count": {
+            "type": "integer"
+        },
+        "upsell_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "purchase_note": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "date_created_gmt": {
+                        "type": "string"
+                    },
+                    "date_modified": {
+                        "type": "string"
+                    },
+                    "date_modified_gmt": {
+                        "type": "string"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "alt": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "date_created",
+                    "date_created_gmt",
+                    "date_modified",
+                    "date_modified_gmt",
+                    "src",
+                    "name",
+                    "alt"
+                ]
+            }
+        },
+        "attributes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "visible": {
+                        "type": "boolean"
+                    },
+                    "variation": {
+                        "type": "boolean"
+                    },
+                    "options": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "default_attributes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "option": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "option"
+                ]
+            }
+        },
+        "variations": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "menu_order": {
+            "type": "integer"
+        },
+        "price_html": {
+            "type": "string"
+        },
+        "related_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "stock_status": {
+            "type": "string"
+        },
+        "has_options": {
+            "type": "boolean"
+        },
+        "post_password": {
+            "type": "string"
+        },
+        "global_unique_id": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "slug",
+        "permalink",
+        "date_created",
+        "date_created_gmt",
+        "date_modified",
+        "date_modified_gmt",
+        "type",
+        "status",
+        "featured",
+        "catalog_visibility",
+        "description",
+        "short_description",
+        "sku",
+        "price",
+        "regular_price",
+        "sale_price",
+        "date_on_sale_from",
+        "date_on_sale_from_gmt",
+        "date_on_sale_to",
+        "date_on_sale_to_gmt",
+        "on_sale",
+        "purchasable",
+        "total_sales",
+        "virtual",
+        "downloadable",
+        "downloads",
+        "download_limit",
+        "download_expiry",
+        "external_url",
+        "button_text",
+        "tax_status",
+        "tax_class",
+        "manage_stock",
+        "stock_quantity",
+        "backorders",
+        "backorders_allowed",
+        "backordered",
+        "low_stock_amount",
+        "sold_individually",
+        "weight",
+        "dimensions",
+        "shipping_required",
+        "shipping_taxable",
+        "shipping_class",
+        "shipping_class_id",
+        "reviews_allowed",
+        "average_rating",
+        "rating_count",
+        "upsell_ids",
+        "cross_sell_ids",
+        "parent_id",
+        "purchase_note",
+        "categories",
+        "tags",
+        "images",
+        "attributes",
+        "default_attributes",
+        "variations",
+        "grouped_products",
+        "menu_order",
+        "price_html",
+        "related_ids",
+        "meta_data",
+        "stock_status",
+        "has_options",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/getAll.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/getAll.json
new file mode 100644
index 0000000000..5c82c51025
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/getAll.json
@@ -0,0 +1,464 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "featured": {
+            "type": "boolean"
+        },
+        "catalog_visibility": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "sku": {
+            "type": "string"
+        },
+        "date_on_sale_from": {
+            "type": "null"
+        },
+        "date_on_sale_from_gmt": {
+            "type": "null"
+        },
+        "date_on_sale_to": {
+            "type": "null"
+        },
+        "date_on_sale_to_gmt": {
+            "type": "null"
+        },
+        "on_sale": {
+            "type": "boolean"
+        },
+        "purchasable": {
+            "type": "boolean"
+        },
+        "virtual": {
+            "type": "boolean"
+        },
+        "downloadable": {
+            "type": "boolean"
+        },
+        "download_limit": {
+            "type": "integer"
+        },
+        "download_expiry": {
+            "type": "integer"
+        },
+        "external_url": {
+            "type": "string"
+        },
+        "button_text": {
+            "type": "string"
+        },
+        "tax_status": {
+            "type": "string"
+        },
+        "tax_class": {
+            "type": "string"
+        },
+        "manage_stock": {
+            "type": "boolean"
+        },
+        "backorders": {
+            "type": "string"
+        },
+        "backorders_allowed": {
+            "type": "boolean"
+        },
+        "backordered": {
+            "type": "boolean"
+        },
+        "weight": {
+            "type": "string"
+        },
+        "dimensions": {
+            "type": "object",
+            "properties": {
+                "length": {
+                    "type": "string"
+                },
+                "width": {
+                    "type": "string"
+                },
+                "height": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "length",
+                "width",
+                "height"
+            ]
+        },
+        "shipping_required": {
+            "type": "boolean"
+        },
+        "shipping_taxable": {
+            "type": "boolean"
+        },
+        "shipping_class": {
+            "type": "string"
+        },
+        "shipping_class_id": {
+            "type": "integer"
+        },
+        "reviews_allowed": {
+            "type": "boolean"
+        },
+        "average_rating": {
+            "type": "string"
+        },
+        "rating_count": {
+            "type": "integer"
+        },
+        "upsell_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "cross_sell_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "purchase_note": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "date_created_gmt": {
+                        "type": "string"
+                    },
+                    "date_modified": {
+                        "type": "string"
+                    },
+                    "date_modified_gmt": {
+                        "type": "string"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "alt": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "date_created",
+                    "date_created_gmt",
+                    "date_modified",
+                    "date_modified_gmt",
+                    "src",
+                    "name",
+                    "alt"
+                ]
+            }
+        },
+        "attributes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "visible": {
+                        "type": "boolean"
+                    },
+                    "variation": {
+                        "type": "boolean"
+                    },
+                    "options": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "name"
+                ]
+            }
+        },
+        "default_attributes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "option": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "option"
+                ]
+            }
+        },
+        "variations": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "grouped_products": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "menu_order": {
+            "type": "integer"
+        },
+        "price_html": {
+            "type": "string"
+        },
+        "related_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "stock_status": {
+            "type": "string"
+        },
+        "has_options": {
+            "type": "boolean"
+        },
+        "post_password": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        },
+        "global_unique_id": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "slug",
+        "permalink",
+        "date_created",
+        "date_created_gmt",
+        "date_modified",
+        "date_modified_gmt",
+        "type",
+        "status",
+        "featured",
+        "catalog_visibility",
+        "description",
+        "short_description",
+        "sku",
+        "price",
+        "regular_price",
+        "sale_price",
+        "date_on_sale_from",
+        "date_on_sale_from_gmt",
+        "date_on_sale_to",
+        "date_on_sale_to_gmt",
+        "on_sale",
+        "purchasable",
+        "total_sales",
+        "virtual",
+        "downloadable",
+        "downloads",
+        "download_limit",
+        "download_expiry",
+        "external_url",
+        "button_text",
+        "tax_status",
+        "tax_class",
+        "manage_stock",
+        "stock_quantity",
+        "backorders",
+        "backorders_allowed",
+        "backordered",
+        "low_stock_amount",
+        "sold_individually",
+        "weight",
+        "dimensions",
+        "shipping_required",
+        "shipping_taxable",
+        "shipping_class",
+        "shipping_class_id",
+        "reviews_allowed",
+        "average_rating",
+        "rating_count",
+        "upsell_ids",
+        "cross_sell_ids",
+        "parent_id",
+        "purchase_note",
+        "categories",
+        "tags",
+        "images",
+        "attributes",
+        "default_attributes",
+        "variations",
+        "grouped_products",
+        "menu_order",
+        "price_html",
+        "related_ids",
+        "meta_data",
+        "stock_status",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/update.json b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/update.json
new file mode 100644
index 0000000000..77af06e970
--- /dev/null
+++ b/packages/nodes-base/nodes/WooCommerce/__schema__/v1.0.0/product/update.json
@@ -0,0 +1,520 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "permalink": {
+            "type": "string"
+        },
+        "date_modified": {
+            "type": "string"
+        },
+        "date_modified_gmt": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "featured": {
+            "type": "boolean"
+        },
+        "catalog_visibility": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "short_description": {
+            "type": "string"
+        },
+        "sku": {
+            "type": "string"
+        },
+        "price": {
+            "type": "string"
+        },
+        "regular_price": {
+            "type": "string"
+        },
+        "sale_price": {
+            "type": "string"
+        },
+        "date_on_sale_from": {
+            "type": "null"
+        },
+        "date_on_sale_from_gmt": {
+            "type": "null"
+        },
+        "date_on_sale_to": {
+            "type": "null"
+        },
+        "date_on_sale_to_gmt": {
+            "type": "null"
+        },
+        "on_sale": {
+            "type": "boolean"
+        },
+        "purchasable": {
+            "type": "boolean"
+        },
+        "total_sales": {
+            "type": "integer"
+        },
+        "virtual": {
+            "type": "boolean"
+        },
+        "downloadable": {
+            "type": "boolean"
+        },
+        "downloads": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "file": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "file"
+                ]
+            }
+        },
+        "download_limit": {
+            "type": "integer"
+        },
+        "download_expiry": {
+            "type": "integer"
+        },
+        "external_url": {
+            "type": "string"
+        },
+        "button_text": {
+            "type": "string"
+        },
+        "tax_status": {
+            "type": "string"
+        },
+        "tax_class": {
+            "type": "string"
+        },
+        "manage_stock": {
+            "type": "boolean"
+        },
+        "backorders": {
+            "type": "string"
+        },
+        "backorders_allowed": {
+            "type": "boolean"
+        },
+        "backordered": {
+            "type": "boolean"
+        },
+        "low_stock_amount": {
+            "type": "null"
+        },
+        "sold_individually": {
+            "type": "boolean"
+        },
+        "weight": {
+            "type": "string"
+        },
+        "dimensions": {
+            "type": "object",
+            "properties": {
+                "length": {
+                    "type": "string"
+                },
+                "width": {
+                    "type": "string"
+                },
+                "height": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "length",
+                "width",
+                "height"
+            ]
+        },
+        "shipping_required": {
+            "type": "boolean"
+        },
+        "shipping_taxable": {
+            "type": "boolean"
+        },
+        "shipping_class": {
+            "type": "string"
+        },
+        "shipping_class_id": {
+            "type": "integer"
+        },
+        "reviews_allowed": {
+            "type": "boolean"
+        },
+        "average_rating": {
+            "type": "string"
+        },
+        "rating_count": {
+            "type": "integer"
+        },
+        "upsell_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "parent_id": {
+            "type": "integer"
+        },
+        "purchase_note": {
+            "type": "string"
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug"
+                ]
+            }
+        },
+        "images": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "date_created": {
+                        "type": "string"
+                    },
+                    "date_created_gmt": {
+                        "type": "string"
+                    },
+                    "date_modified": {
+                        "type": "string"
+                    },
+                    "date_modified_gmt": {
+                        "type": "string"
+                    },
+                    "src": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "alt": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "date_created",
+                    "date_created_gmt",
+                    "date_modified",
+                    "date_modified_gmt",
+                    "src",
+                    "name",
+                    "alt"
+                ]
+            }
+        },
+        "attributes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "slug": {
+                        "type": "string"
+                    },
+                    "position": {
+                        "type": "integer"
+                    },
+                    "visible": {
+                        "type": "boolean"
+                    },
+                    "variation": {
+                        "type": "boolean"
+                    },
+                    "options": {
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "slug",
+                    "position",
+                    "visible",
+                    "variation",
+                    "options"
+                ]
+            }
+        },
+        "default_attributes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "option": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "option"
+                ]
+            }
+        },
+        "variations": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "menu_order": {
+            "type": "integer"
+        },
+        "price_html": {
+            "type": "string"
+        },
+        "related_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "meta_data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "key": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "key",
+                    "value"
+                ]
+            }
+        },
+        "stock_status": {
+            "type": "string"
+        },
+        "has_options": {
+            "type": "boolean"
+        },
+        "post_password": {
+            "type": "string"
+        },
+        "global_unique_id": {
+            "type": "string"
+        },
+        "permalink_template": {
+            "type": "string"
+        },
+        "generated_slug": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "slug",
+        "permalink",
+        "date_created",
+        "date_created_gmt",
+        "date_modified",
+        "date_modified_gmt",
+        "type",
+        "status",
+        "featured",
+        "catalog_visibility",
+        "description",
+        "short_description",
+        "sku",
+        "price",
+        "regular_price",
+        "sale_price",
+        "date_on_sale_from",
+        "date_on_sale_from_gmt",
+        "date_on_sale_to",
+        "date_on_sale_to_gmt",
+        "on_sale",
+        "purchasable",
+        "total_sales",
+        "virtual",
+        "downloadable",
+        "downloads",
+        "download_limit",
+        "download_expiry",
+        "external_url",
+        "button_text",
+        "tax_status",
+        "tax_class",
+        "manage_stock",
+        "stock_quantity",
+        "backorders",
+        "backorders_allowed",
+        "backordered",
+        "low_stock_amount",
+        "sold_individually",
+        "weight",
+        "dimensions",
+        "shipping_required",
+        "shipping_taxable",
+        "shipping_class",
+        "shipping_class_id",
+        "reviews_allowed",
+        "average_rating",
+        "rating_count",
+        "upsell_ids",
+        "cross_sell_ids",
+        "parent_id",
+        "purchase_note",
+        "categories",
+        "tags",
+        "images",
+        "attributes",
+        "default_attributes",
+        "variations",
+        "grouped_products",
+        "menu_order",
+        "price_html",
+        "related_ids",
+        "meta_data",
+        "stock_status",
+        "has_options",
+        "post_password",
+        "permalink_template",
+        "generated_slug",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index 4178e23b31..030a9170cd 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -29,6 +29,7 @@ export class Wordpress implements INodeType {
 		defaults: {
 			name: 'Wordpress',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/page/get.json b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/page/get.json
new file mode 100644
index 0000000000..bd17070757
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/page/get.json
@@ -0,0 +1,406 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "date": {
+            "type": "string"
+        },
+        "date_gmt": {
+            "type": "string"
+        },
+        "guid": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_gmt": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "title": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "content": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "excerpt": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "author": {
+            "type": "integer"
+        },
+        "featured_media": {
+            "type": "integer"
+        },
+        "parent": {
+            "type": "integer"
+        },
+        "menu_order": {
+            "type": "integer"
+        },
+        "comment_status": {
+            "type": "string"
+        },
+        "ping_status": {
+            "type": "string"
+        },
+        "template": {
+            "type": "string"
+        },
+        "meta": {
+            "type": "object",
+            "properties": {
+                "footnotes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "footnotes"
+            ]
+        },
+        "class_list": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "_elementor_import_session_id": {
+            "type": "null"
+        },
+        "_elementor_edit_mode": {
+            "type": "string"
+        },
+        "_elementor_template_type": {
+            "type": "string"
+        },
+        "_elementor_version": {
+            "type": "string"
+        },
+        "_elementor_pro_version": {
+            "type": "string"
+        },
+        "_wp_page_template": {
+            "type": "string"
+        },
+        "_elementor_page_settings": {
+            "type": "null"
+        },
+        "_elementor_css": {
+            "type": "object",
+            "properties": {
+                "0": {
+                    "type": "string"
+                },
+                "time": {
+                    "type": "integer"
+                },
+                "fonts": {
+                    "type": "object",
+                    "properties": {
+                        "0": {
+                            "type": "string"
+                        },
+                        "1": {
+                            "type": "string"
+                        },
+                        "2": {
+                            "type": "string"
+                        },
+                        "6": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "0",
+                        "1",
+                        "2",
+                        "6"
+                    ]
+                },
+                "icons": {
+                    "type": "object",
+                    "properties": {
+                        "0": {
+                            "type": "string"
+                        },
+                        "1": {
+                            "type": "string"
+                        },
+                        "9": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "0",
+                        "1",
+                        "9"
+                    ]
+                },
+                "status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "0",
+                "time",
+                "fonts",
+                "icons",
+                "dynamic_elements_ids",
+                "status"
+            ]
+        },
+        "_elementor_data": {
+            "type": "string"
+        },
+        "_elementor_page_assets": {
+            "type": "object",
+            "properties": {
+                "styles": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "styles"
+            ]
+        },
+        "_elementor_element_cache": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "about": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "author": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "replies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "version-history": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "count": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "count",
+                            "href"
+                        ]
+                    }
+                },
+                "predecessor-version": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:attachment": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "curies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "templated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "href",
+                            "templated"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection",
+                "about",
+                "author",
+                "replies",
+                "version-history",
+                "wp:attachment",
+                "curies"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/page/getAll.json b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/page/getAll.json
new file mode 100644
index 0000000000..7171e8c06b
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/page/getAll.json
@@ -0,0 +1,343 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "date": {
+            "type": "string"
+        },
+        "date_gmt": {
+            "type": "string"
+        },
+        "guid": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_gmt": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "title": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "content": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "excerpt": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "author": {
+            "type": "integer"
+        },
+        "featured_media": {
+            "type": "integer"
+        },
+        "parent": {
+            "type": "integer"
+        },
+        "menu_order": {
+            "type": "integer"
+        },
+        "comment_status": {
+            "type": "string"
+        },
+        "ping_status": {
+            "type": "string"
+        },
+        "template": {
+            "type": "string"
+        },
+        "meta": {
+            "type": "object",
+            "properties": {
+                "footnotes": {
+                    "type": "string"
+                },
+                "advanced_seo_description": {
+                    "type": "string"
+                },
+                "jetpack_seo_html_title": {
+                    "type": "string"
+                },
+                "jetpack_seo_noindex": {
+                    "type": "boolean"
+                },
+                "jetpack_post_was_ever_published": {
+                    "type": "boolean"
+                },
+                "_starter_page_template": {
+                    "type": "string"
+                },
+                "_wpcom_template_layout_category": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            },
+            "required": [
+                "footnotes"
+            ]
+        },
+        "class_list": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "about": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "author": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "replies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "version-history": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "count": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "count",
+                            "href"
+                        ]
+                    }
+                },
+                "predecessor-version": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:attachment": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "curies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "templated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "href",
+                            "templated"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection",
+                "about",
+                "author",
+                "replies",
+                "version-history",
+                "wp:attachment",
+                "curies"
+            ]
+        },
+        "jetpack_sharing_enabled": {
+            "type": "boolean"
+        },
+        "jetpack_likes_enabled": {
+            "type": "boolean"
+        },
+        "jetpack_shortlink": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "date",
+        "slug",
+        "type",
+        "link",
+        "title",
+        "excerpt",
+        "author",
+        "featured_media",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/create.json b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/create.json
new file mode 100644
index 0000000000..6e79a0ec76
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/create.json
@@ -0,0 +1,456 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "date": {
+            "type": "string"
+        },
+        "date_gmt": {
+            "type": "string"
+        },
+        "guid": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "raw": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered",
+                "raw"
+            ]
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_gmt": {
+            "type": "string"
+        },
+        "password": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "title": {
+            "type": "object",
+            "properties": {
+                "raw": {
+                    "type": "string"
+                },
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "raw",
+                "rendered"
+            ]
+        },
+        "content": {
+            "type": "object",
+            "properties": {
+                "raw": {
+                    "type": "string"
+                },
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                },
+                "block_version": {
+                    "type": "integer"
+                }
+            },
+            "required": [
+                "raw",
+                "rendered",
+                "protected",
+                "block_version"
+            ]
+        },
+        "excerpt": {
+            "type": "object",
+            "properties": {
+                "raw": {
+                    "type": "string"
+                },
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "raw",
+                "rendered",
+                "protected"
+            ]
+        },
+        "author": {
+            "type": "integer"
+        },
+        "featured_media": {
+            "type": "integer"
+        },
+        "comment_status": {
+            "type": "string"
+        },
+        "ping_status": {
+            "type": "string"
+        },
+        "sticky": {
+            "type": "boolean"
+        },
+        "template": {
+            "type": "string"
+        },
+        "format": {
+            "type": "string"
+        },
+        "meta": {
+            "type": "object",
+            "properties": {
+                "footnotes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "footnotes"
+            ]
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "permalink_template": {
+            "type": "string"
+        },
+        "generated_slug": {
+            "type": "string"
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "about": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "author": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "replies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "version-history": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "count": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "count",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:attachment": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:term": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "taxonomy": {
+                                "type": "string"
+                            },
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "taxonomy",
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-publish": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-unfiltered-html": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-sticky": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-assign-author": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-create-categories": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-assign-categories": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-create-tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:action-assign-tags": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "curies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "templated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "href",
+                            "templated"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection",
+                "about",
+                "author",
+                "replies",
+                "version-history",
+                "wp:attachment",
+                "wp:term",
+                "wp:action-assign-categories",
+                "wp:action-create-tags",
+                "wp:action-assign-tags",
+                "curies"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/get.json b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/get.json
new file mode 100644
index 0000000000..c09d9dd73b
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/get.json
@@ -0,0 +1,348 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "date": {
+            "type": "string"
+        },
+        "date_gmt": {
+            "type": "string"
+        },
+        "guid": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_gmt": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "title": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "content": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "excerpt": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "author": {
+            "type": "integer"
+        },
+        "featured_media": {
+            "type": "integer"
+        },
+        "comment_status": {
+            "type": "string"
+        },
+        "ping_status": {
+            "type": "string"
+        },
+        "sticky": {
+            "type": "boolean"
+        },
+        "template": {
+            "type": "string"
+        },
+        "format": {
+            "type": "string"
+        },
+        "meta": {
+            "type": "object",
+            "properties": {
+                "footnotes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "footnotes"
+            ]
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "about": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "author": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "replies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "version-history": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "count": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "count",
+                            "href"
+                        ]
+                    }
+                },
+                "predecessor-version": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:featuredmedia": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:attachment": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:term": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "taxonomy": {
+                                "type": "string"
+                            },
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "taxonomy",
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "curies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "templated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "href",
+                            "templated"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection",
+                "about",
+                "author",
+                "replies",
+                "version-history",
+                "wp:attachment",
+                "wp:term",
+                "curies"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/getAll.json b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/getAll.json
new file mode 100644
index 0000000000..d874395e20
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/post/getAll.json
@@ -0,0 +1,329 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "date": {
+            "type": "string"
+        },
+        "date_gmt": {
+            "type": "string"
+        },
+        "guid": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "modified": {
+            "type": "string"
+        },
+        "modified_gmt": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "type": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "title": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "rendered"
+            ]
+        },
+        "content": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "excerpt": {
+            "type": "object",
+            "properties": {
+                "rendered": {
+                    "type": "string"
+                },
+                "protected": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "rendered",
+                "protected"
+            ]
+        },
+        "author": {
+            "type": "integer"
+        },
+        "featured_media": {
+            "type": "integer"
+        },
+        "comment_status": {
+            "type": "string"
+        },
+        "ping_status": {
+            "type": "string"
+        },
+        "sticky": {
+            "type": "boolean"
+        },
+        "template": {
+            "type": "string"
+        },
+        "format": {
+            "type": "string"
+        },
+        "meta": {
+            "type": "object",
+            "properties": {
+                "footnotes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "footnotes"
+            ]
+        },
+        "categories": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            },
+                            "targetHints": {
+                                "type": "object",
+                                "properties": {
+                                    "allow": {
+                                        "type": "array",
+                                        "items": {
+                                            "type": "string"
+                                        }
+                                    }
+                                },
+                                "required": [
+                                    "allow"
+                                ]
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "about": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "author": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "replies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "version-history": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "count": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "count",
+                            "href"
+                        ]
+                    }
+                },
+                "predecessor-version": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "id": {
+                                "type": "integer"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "id",
+                            "href"
+                        ]
+                    }
+                },
+                "wp:attachment": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "wp:term": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "taxonomy": {
+                                "type": "string"
+                            },
+                            "embeddable": {
+                                "type": "boolean"
+                            },
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "taxonomy",
+                            "embeddable",
+                            "href"
+                        ]
+                    }
+                },
+                "curies": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "href": {
+                                "type": "string"
+                            },
+                            "templated": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "href",
+                            "templated"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection",
+                "about",
+                "replies",
+                "version-history",
+                "wp:attachment",
+                "wp:term",
+                "curies"
+            ]
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..3bf350fa3b
--- /dev/null
+++ b/packages/nodes-base/nodes/Wordpress/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "name": {
+            "type": "string"
+        },
+        "url": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "link": {
+            "type": "string"
+        },
+        "slug": {
+            "type": "string"
+        },
+        "avatar_urls": {
+            "type": "object",
+            "properties": {
+                "24": {
+                    "type": "string"
+                },
+                "48": {
+                    "type": "string"
+                },
+                "96": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "24",
+                "48",
+                "96"
+            ]
+        },
+        "_links": {
+            "type": "object",
+            "properties": {
+                "self": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                },
+                "collection": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "href": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "href"
+                        ]
+                    }
+                }
+            },
+            "required": [
+                "self",
+                "collection"
+            ]
+        }
+    },
+    "required": [
+        "id",
+        "name",
+        "url",
+        "description",
+        "link",
+        "slug",
+        "meta",
+        "_links"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index 894242fe7c..895e0ebdc9 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -28,6 +28,7 @@ export class Xero implements INodeType {
 		defaults: {
 			name: 'Xero',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..44b9b22af7
--- /dev/null
+++ b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,89 @@
+{
+    "type": "object",
+    "properties": {
+        "ContactID": {
+            "type": "string"
+        },
+        "ContactStatus": {
+            "type": "string"
+        },
+        "Name": {
+            "type": "string"
+        },
+        "EmailAddress": {
+            "type": "string"
+        },
+        "Addresses": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "AddressType": {
+                        "type": "string"
+                    },
+                    "City": {
+                        "type": "string"
+                    },
+                    "PostalCode": {
+                        "type": "string"
+                    },
+                    "AddressLine1": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "AddressType"
+                ]
+            }
+        },
+        "Phones": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "PhoneType": {
+                        "type": "string"
+                    },
+                    "PhoneNumber": {
+                        "type": "string"
+                    },
+                    "PhoneAreaCode": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "PhoneType"
+                ]
+            }
+        },
+        "UpdatedDateUTC": {
+            "type": "string"
+        },
+        "IsSupplier": {
+            "type": "boolean"
+        },
+        "IsCustomer": {
+            "type": "boolean"
+        },
+        "HasAttachments": {
+            "type": "boolean"
+        },
+        "HasValidationErrors": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "ContactID",
+        "ContactStatus",
+        "Name",
+        "Addresses",
+        "Phones",
+        "UpdatedDateUTC",
+        "ContactGroups",
+        "IsSupplier",
+        "IsCustomer",
+        "ContactPersons",
+        "HasAttachments",
+        "HasValidationErrors"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/create.json b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/create.json
new file mode 100644
index 0000000000..e9259fb5ab
--- /dev/null
+++ b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/create.json
@@ -0,0 +1,235 @@
+{
+    "type": "object",
+    "properties": {
+        "Type": {
+            "type": "string"
+        },
+        "InvoiceID": {
+            "type": "string"
+        },
+        "Reference": {
+            "type": "string"
+        },
+        "AmountPaid": {
+            "type": "integer"
+        },
+        "SentToContact": {
+            "type": "boolean"
+        },
+        "CurrencyRate": {
+            "type": "integer"
+        },
+        "IsDiscounted": {
+            "type": "boolean"
+        },
+        "HasErrors": {
+            "type": "boolean"
+        },
+        "Contact": {
+            "type": "object",
+            "properties": {
+                "ContactID": {
+                    "type": "string"
+                },
+                "ContactStatus": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "Addresses": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "AddressType": {
+                                "type": "string"
+                            },
+                            "City": {
+                                "type": "string"
+                            },
+                            "Region": {
+                                "type": "string"
+                            },
+                            "PostalCode": {
+                                "type": "string"
+                            },
+                            "Country": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "AddressType"
+                        ]
+                    }
+                },
+                "Phones": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "PhoneType": {
+                                "type": "string"
+                            },
+                            "PhoneNumber": {
+                                "type": "string"
+                            },
+                            "PhoneAreaCode": {
+                                "type": "string"
+                            },
+                            "PhoneCountryCode": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "PhoneType"
+                        ]
+                    }
+                },
+                "UpdatedDateUTC": {
+                    "type": "string"
+                },
+                "ContactGroups": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "ContactGroupID": {
+                                "type": "string"
+                            },
+                            "Name": {
+                                "type": "string"
+                            },
+                            "Status": {
+                                "type": "string"
+                            },
+                            "HasValidationErrors": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "ContactGroupID",
+                            "Name",
+                            "Status",
+                            "Contacts",
+                            "HasValidationErrors"
+                        ]
+                    }
+                },
+                "IsSupplier": {
+                    "type": "boolean"
+                },
+                "IsCustomer": {
+                    "type": "boolean"
+                },
+                "HasValidationErrors": {
+                    "type": "boolean"
+                },
+                "BankAccountDetails": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactID",
+                "ContactStatus",
+                "Name",
+                "Addresses",
+                "Phones",
+                "UpdatedDateUTC",
+                "ContactGroups",
+                "IsSupplier",
+                "IsCustomer",
+                "SalesTrackingCategories",
+                "PurchasesTrackingCategories",
+                "ContactPersons",
+                "HasValidationErrors"
+            ]
+        },
+        "DateString": {
+            "type": "string"
+        },
+        "Date": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        },
+        "LineAmountTypes": {
+            "type": "string"
+        },
+        "LineItems": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Description": {
+                        "type": "string"
+                    },
+                    "TaxType": {
+                        "type": "string"
+                    },
+                    "AccountCode": {
+                        "type": "string"
+                    },
+                    "LineItemID": {
+                        "type": "string"
+                    },
+                    "AccountID": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Tracking",
+                    "LineItemID",
+                    "ValidationErrors"
+                ]
+            }
+        },
+        "UpdatedDateUTC": {
+            "type": "string"
+        },
+        "CurrencyCode": {
+            "type": "string"
+        },
+        "InvoiceNumber": {
+            "type": "string"
+        },
+        "BrandingThemeID": {
+            "type": "string"
+        },
+        "DueDateString": {
+            "type": "string"
+        },
+        "DueDate": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Type",
+        "InvoiceID",
+        "Reference",
+        "Prepayments",
+        "Overpayments",
+        "AmountDue",
+        "AmountPaid",
+        "SentToContact",
+        "CurrencyRate",
+        "IsDiscounted",
+        "HasErrors",
+        "InvoicePaymentServices",
+        "Contact",
+        "DateString",
+        "Date",
+        "Status",
+        "LineAmountTypes",
+        "LineItems",
+        "SubTotal",
+        "TotalTax",
+        "Total",
+        "UpdatedDateUTC",
+        "CurrencyCode"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/get.json b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/get.json
new file mode 100644
index 0000000000..4780881513
--- /dev/null
+++ b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/get.json
@@ -0,0 +1,399 @@
+{
+    "type": "object",
+    "properties": {
+        "Type": {
+            "type": "string"
+        },
+        "InvoiceID": {
+            "type": "string"
+        },
+        "InvoiceNumber": {
+            "type": "string"
+        },
+        "Reference": {
+            "type": "string"
+        },
+        "SentToContact": {
+            "type": "boolean"
+        },
+        "CurrencyRate": {
+            "type": "integer"
+        },
+        "IsDiscounted": {
+            "type": "boolean"
+        },
+        "HasAttachments": {
+            "type": "boolean"
+        },
+        "HasErrors": {
+            "type": "boolean"
+        },
+        "Attachments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "AttachmentID": {
+                        "type": "string"
+                    },
+                    "FileName": {
+                        "type": "string"
+                    },
+                    "Url": {
+                        "type": "string"
+                    },
+                    "MimeType": {
+                        "type": "string"
+                    },
+                    "ContentLength": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "AttachmentID",
+                    "FileName",
+                    "Url",
+                    "MimeType",
+                    "ContentLength"
+                ]
+            }
+        },
+        "Contact": {
+            "type": "object",
+            "properties": {
+                "ContactID": {
+                    "type": "string"
+                },
+                "ContactStatus": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                },
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "AccountsReceivableTaxType": {
+                    "type": "string"
+                },
+                "Addresses": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "AddressType": {
+                                "type": "string"
+                            },
+                            "AddressLine1": {
+                                "type": "string"
+                            },
+                            "City": {
+                                "type": "string"
+                            },
+                            "PostalCode": {
+                                "type": "string"
+                            },
+                            "Country": {
+                                "type": "string"
+                            },
+                            "Region": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "AddressType"
+                        ]
+                    }
+                },
+                "Phones": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "PhoneType": {
+                                "type": "string"
+                            },
+                            "PhoneNumber": {
+                                "type": "string"
+                            },
+                            "PhoneAreaCode": {
+                                "type": "string"
+                            },
+                            "PhoneCountryCode": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "PhoneType"
+                        ]
+                    }
+                },
+                "UpdatedDateUTC": {
+                    "type": "string"
+                },
+                "ContactGroups": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "ContactGroupID": {
+                                "type": "string"
+                            },
+                            "Name": {
+                                "type": "string"
+                            },
+                            "Status": {
+                                "type": "string"
+                            },
+                            "HasValidationErrors": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "ContactGroupID",
+                            "Name",
+                            "Status",
+                            "Contacts",
+                            "HasValidationErrors"
+                        ]
+                    }
+                },
+                "IsSupplier": {
+                    "type": "boolean"
+                },
+                "IsCustomer": {
+                    "type": "boolean"
+                },
+                "DefaultCurrency": {
+                    "type": "string"
+                },
+                "SalesTrackingCategories": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "TrackingCategoryName": {
+                                "type": "string"
+                            },
+                            "TrackingOptionName": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "TrackingCategoryName",
+                            "TrackingOptionName"
+                        ]
+                    }
+                },
+                "PurchasesTrackingCategories": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "TrackingCategoryName": {
+                                "type": "string"
+                            },
+                            "TrackingOptionName": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "TrackingCategoryName",
+                            "TrackingOptionName"
+                        ]
+                    }
+                },
+                "ContactPersons": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "FirstName": {
+                                "type": "string"
+                            },
+                            "LastName": {
+                                "type": "string"
+                            },
+                            "EmailAddress": {
+                                "type": "string"
+                            },
+                            "IncludeInEmails": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "FirstName",
+                            "LastName",
+                            "EmailAddress",
+                            "IncludeInEmails"
+                        ]
+                    }
+                },
+                "HasValidationErrors": {
+                    "type": "boolean"
+                },
+                "BankAccountDetails": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactID",
+                "ContactStatus",
+                "Name",
+                "Addresses",
+                "Phones",
+                "UpdatedDateUTC",
+                "ContactGroups",
+                "IsSupplier",
+                "IsCustomer",
+                "SalesTrackingCategories",
+                "PurchasesTrackingCategories",
+                "ContactPersons",
+                "HasValidationErrors"
+            ]
+        },
+        "DateString": {
+            "type": "string"
+        },
+        "Date": {
+            "type": "string"
+        },
+        "DueDateString": {
+            "type": "string"
+        },
+        "DueDate": {
+            "type": "string"
+        },
+        "BrandingThemeID": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        },
+        "LineAmountTypes": {
+            "type": "string"
+        },
+        "LineItems": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Description": {
+                        "type": "string"
+                    },
+                    "TaxType": {
+                        "type": "string"
+                    },
+                    "AccountCode": {
+                        "type": "string"
+                    },
+                    "Tracking": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "Name": {
+                                    "type": "string"
+                                },
+                                "Option": {
+                                    "type": "string"
+                                },
+                                "TrackingCategoryID": {
+                                    "type": "string"
+                                },
+                                "TrackingOptionID": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "Name",
+                                "Option",
+                                "TrackingCategoryID",
+                                "TrackingOptionID"
+                            ]
+                        }
+                    },
+                    "LineItemID": {
+                        "type": "string"
+                    },
+                    "AccountID": {
+                        "type": "string"
+                    },
+                    "ItemCode": {
+                        "type": "string"
+                    },
+                    "Item": {
+                        "type": "object",
+                        "properties": {
+                            "ItemID": {
+                                "type": "string"
+                            },
+                            "Name": {
+                                "type": "string"
+                            },
+                            "Code": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "ItemID",
+                            "Name",
+                            "Code"
+                        ]
+                    }
+                },
+                "required": [
+                    "UnitAmount",
+                    "TaxAmount",
+                    "LineAmount",
+                    "Tracking",
+                    "Quantity",
+                    "LineItemID",
+                    "ValidationErrors"
+                ]
+            }
+        },
+        "UpdatedDateUTC": {
+            "type": "string"
+        },
+        "CurrencyCode": {
+            "type": "string"
+        },
+        "Url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "Type",
+        "InvoiceID",
+        "InvoiceNumber",
+        "Reference",
+        "Prepayments",
+        "Overpayments",
+        "AmountDue",
+        "AmountPaid",
+        "SentToContact",
+        "IsDiscounted",
+        "HasAttachments",
+        "HasErrors",
+        "Attachments",
+        "InvoicePaymentServices",
+        "Contact",
+        "DateString",
+        "Date",
+        "Status",
+        "LineAmountTypes",
+        "LineItems",
+        "SubTotal",
+        "TotalTax",
+        "Total",
+        "UpdatedDateUTC",
+        "CurrencyCode"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/getAll.json b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/getAll.json
new file mode 100644
index 0000000000..8043118eaf
--- /dev/null
+++ b/packages/nodes-base/nodes/Xero/__schema__/v1.0.0/invoice/getAll.json
@@ -0,0 +1,236 @@
+{
+    "type": "object",
+    "properties": {
+        "Type": {
+            "type": "string"
+        },
+        "InvoiceID": {
+            "type": "string"
+        },
+        "InvoiceNumber": {
+            "type": "string"
+        },
+        "Reference": {
+            "type": "string"
+        },
+        "Payments": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "PaymentID": {
+                        "type": "string"
+                    },
+                    "Date": {
+                        "type": "string"
+                    },
+                    "Reference": {
+                        "type": "string"
+                    },
+                    "CurrencyRate": {
+                        "type": "integer"
+                    },
+                    "HasAccount": {
+                        "type": "boolean"
+                    },
+                    "HasValidationErrors": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "PaymentID",
+                    "Date",
+                    "Amount",
+                    "HasAccount",
+                    "HasValidationErrors"
+                ]
+            }
+        },
+        "CreditNotes": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "CreditNoteID": {
+                        "type": "string"
+                    },
+                    "CreditNoteNumber": {
+                        "type": "string"
+                    },
+                    "ID": {
+                        "type": "string"
+                    },
+                    "HasErrors": {
+                        "type": "boolean"
+                    },
+                    "AppliedAmount": {
+                        "type": "number"
+                    },
+                    "DateString": {
+                        "type": "string"
+                    },
+                    "Date": {
+                        "type": "string"
+                    },
+                    "Total": {
+                        "type": "number"
+                    }
+                },
+                "required": [
+                    "CreditNoteID",
+                    "CreditNoteNumber",
+                    "ID",
+                    "HasErrors",
+                    "InvoiceAddresses",
+                    "AppliedAmount",
+                    "DateString",
+                    "Date",
+                    "LineItems",
+                    "Total"
+                ]
+            }
+        },
+        "IsDiscounted": {
+            "type": "boolean"
+        },
+        "HasAttachments": {
+            "type": "boolean"
+        },
+        "HasErrors": {
+            "type": "boolean"
+        },
+        "Contact": {
+            "type": "object",
+            "properties": {
+                "ContactID": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "HasValidationErrors": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "ContactID",
+                "Name",
+                "Addresses",
+                "Phones",
+                "ContactGroups",
+                "ContactPersons",
+                "HasValidationErrors"
+            ]
+        },
+        "DateString": {
+            "type": "string"
+        },
+        "Date": {
+            "type": "string"
+        },
+        "DueDateString": {
+            "type": "string"
+        },
+        "DueDate": {
+            "type": "string"
+        },
+        "Status": {
+            "type": "string"
+        },
+        "LineAmountTypes": {
+            "type": "string"
+        },
+        "LineItems": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "TaxType": {
+                        "type": "string"
+                    },
+                    "AccountCode": {
+                        "type": "string"
+                    },
+                    "Tracking": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "Name": {
+                                    "type": "string"
+                                },
+                                "Option": {
+                                    "type": "string"
+                                },
+                                "TrackingCategoryID": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "Name",
+                                "Option",
+                                "TrackingCategoryID",
+                                "Options"
+                            ]
+                        }
+                    },
+                    "Quantity": {
+                        "type": "integer"
+                    },
+                    "LineItemID": {
+                        "type": "string"
+                    },
+                    "AccountID": {
+                        "type": "string"
+                    },
+                    "Description": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "Tracking",
+                    "LineItemID"
+                ]
+            }
+        },
+        "UpdatedDateUTC": {
+            "type": "string"
+        },
+        "CurrencyCode": {
+            "type": "string"
+        },
+        "BrandingThemeID": {
+            "type": "string"
+        },
+        "SentToContact": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "Type",
+        "InvoiceID",
+        "Payments",
+        "CreditNotes",
+        "Prepayments",
+        "Overpayments",
+        "AmountDue",
+        "AmountPaid",
+        "AmountCredited",
+        "IsDiscounted",
+        "HasAttachments",
+        "InvoiceAddresses",
+        "HasErrors",
+        "InvoicePaymentServices",
+        "Contact",
+        "DateString",
+        "Date",
+        "Status",
+        "LineAmountTypes",
+        "LineItems",
+        "SubTotal",
+        "TotalTax",
+        "Total",
+        "UpdatedDateUTC",
+        "CurrencyCode"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Yourls/Yourls.node.ts b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
index c611ab2819..df5540749d 100644
--- a/packages/nodes-base/nodes/Yourls/Yourls.node.ts
+++ b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
@@ -23,6 +23,7 @@ export class Yourls implements INodeType {
 		defaults: {
 			name: 'Yourls',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
index 07f64c680b..434b8b6072 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.ts
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -51,6 +51,7 @@ export class Zammad implements INodeType {
 		defaults: {
 			name: 'Zammad',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/ticket/get.json b/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/ticket/get.json
new file mode 100644
index 0000000000..fe9d8a48c7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/ticket/get.json
@@ -0,0 +1,241 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "group_id": {
+            "type": "integer"
+        },
+        "priority_id": {
+            "type": "integer"
+        },
+        "state_id": {
+            "type": "integer"
+        },
+        "number": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "owner_id": {
+            "type": "integer"
+        },
+        "customer_id": {
+            "type": "integer"
+        },
+        "note": {
+            "type": "null"
+        },
+        "create_article_type_id": {
+            "type": "integer"
+        },
+        "create_article_sender_id": {
+            "type": "integer"
+        },
+        "article_count": {
+            "type": "integer"
+        },
+        "preferences": {
+            "type": "object",
+            "properties": {
+                "escalation_calculation": {
+                    "type": "object",
+                    "properties": {
+                        "first_response_at": {
+                            "type": "string"
+                        },
+                        "last_update_at": {
+                            "type": "string"
+                        },
+                        "last_contact_at": {
+                            "type": "string"
+                        },
+                        "sla_id": {
+                            "type": "integer"
+                        },
+                        "sla_updated_at": {
+                            "type": "string"
+                        },
+                        "calendar_id": {
+                            "type": "integer"
+                        },
+                        "calendar_updated_at": {
+                            "type": "string"
+                        },
+                        "escalation_disabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "escalation_disabled"
+                    ]
+                }
+            }
+        },
+        "updated_by_id": {
+            "type": "integer"
+        },
+        "created_by_id": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "checklist_id": {
+            "type": "null"
+        },
+        "product": {
+            "type": "string"
+        },
+        "ticket_severity": {
+            "type": "string"
+        },
+        "sub_priority": {
+            "type": "string"
+        },
+        "resolution": {
+            "type": "string"
+        },
+        "type_from_ahlsell": {
+            "type": "string"
+        },
+        "wait_for_3rd_party": {
+            "type": "string"
+        },
+        "internal_ticket": {
+            "type": "boolean"
+        },
+        "internal_issue_type": {
+            "type": "null"
+        },
+        "articles": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "ticket_id": {
+                        "type": "integer"
+                    },
+                    "type_id": {
+                        "type": "integer"
+                    },
+                    "sender_id": {
+                        "type": "integer"
+                    },
+                    "content_type": {
+                        "type": "string"
+                    },
+                    "body": {
+                        "type": "string"
+                    },
+                    "internal": {
+                        "type": "boolean"
+                    },
+                    "updated_by_id": {
+                        "type": "integer"
+                    },
+                    "created_by_id": {
+                        "type": "integer"
+                    },
+                    "created_at": {
+                        "type": "string"
+                    },
+                    "updated_at": {
+                        "type": "string"
+                    },
+                    "attachments": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "id": {
+                                    "type": "integer"
+                                },
+                                "store_file_id": {
+                                    "type": "integer"
+                                },
+                                "filename": {
+                                    "type": "string"
+                                },
+                                "size": {
+                                    "type": "string"
+                                },
+                                "preferences": {
+                                    "type": "object",
+                                    "properties": {
+                                        "Content-Type": {
+                                            "type": "string"
+                                        },
+                                        "Mime-Type": {
+                                            "type": "string"
+                                        },
+                                        "Content-ID": {
+                                            "type": "string"
+                                        },
+                                        "Content-Disposition": {
+                                            "type": "string"
+                                        }
+                                    }
+                                }
+                            },
+                            "required": [
+                                "id",
+                                "filename",
+                                "size",
+                                "preferences"
+                            ]
+                        }
+                    },
+                    "created_by": {
+                        "type": "string"
+                    },
+                    "updated_by": {
+                        "type": "string"
+                    },
+                    "type": {
+                        "type": "string"
+                    },
+                    "sender": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "id",
+                    "ticket_id",
+                    "type_id",
+                    "sender_id",
+                    "from",
+                    "to",
+                    "cc",
+                    "subject",
+                    "reply_to",
+                    "message_id",
+                    "message_id_md5",
+                    "in_reply_to",
+                    "content_type",
+                    "body",
+                    "internal",
+                    "preferences",
+                    "updated_by_id",
+                    "created_by_id",
+                    "origin_by_id",
+                    "created_at",
+                    "updated_at",
+                    "attachments",
+                    "created_by",
+                    "updated_by",
+                    "type",
+                    "sender"
+                ]
+            }
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/ticket/getAll.json b/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/ticket/getAll.json
new file mode 100644
index 0000000000..47abb1eeb2
--- /dev/null
+++ b/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/ticket/getAll.json
@@ -0,0 +1,122 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "group_id": {
+            "type": "integer"
+        },
+        "priority_id": {
+            "type": "integer"
+        },
+        "state_id": {
+            "type": "integer"
+        },
+        "number": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "owner_id": {
+            "type": "integer"
+        },
+        "customer_id": {
+            "type": "integer"
+        },
+        "note": {
+            "type": "null"
+        },
+        "first_response_escalation_at": {
+            "type": "null"
+        },
+        "first_response_in_min": {
+            "type": "null"
+        },
+        "first_response_diff_in_min": {
+            "type": "null"
+        },
+        "close_escalation_at": {
+            "type": "null"
+        },
+        "update_escalation_at": {
+            "type": "null"
+        },
+        "update_in_min": {
+            "type": "null"
+        },
+        "update_diff_in_min": {
+            "type": "null"
+        },
+        "create_article_type_id": {
+            "type": "integer"
+        },
+        "create_article_sender_id": {
+            "type": "integer"
+        },
+        "article_count": {
+            "type": "integer"
+        },
+        "escalation_at": {
+            "type": "null"
+        },
+        "pending_time": {
+            "type": "null"
+        },
+        "type": {
+            "type": "null"
+        },
+        "updated_by_id": {
+            "type": "integer"
+        },
+        "created_by_id": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id",
+        "group_id",
+        "priority_id",
+        "state_id",
+        "organization_id",
+        "number",
+        "title",
+        "owner_id",
+        "customer_id",
+        "note",
+        "first_response_at",
+        "first_response_escalation_at",
+        "first_response_in_min",
+        "first_response_diff_in_min",
+        "close_at",
+        "close_escalation_at",
+        "close_in_min",
+        "close_diff_in_min",
+        "update_escalation_at",
+        "update_in_min",
+        "update_diff_in_min",
+        "last_contact_at",
+        "last_contact_agent_at",
+        "last_contact_customer_at",
+        "last_owner_update_at",
+        "create_article_type_id",
+        "create_article_sender_id",
+        "article_count",
+        "escalation_at",
+        "pending_time",
+        "type",
+        "time_unit",
+        "preferences",
+        "updated_by_id",
+        "created_by_id",
+        "created_at",
+        "updated_at"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..d94297004e
--- /dev/null
+++ b/packages/nodes-base/nodes/Zammad/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,390 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "login": {
+            "type": "string"
+        },
+        "firstname": {
+            "type": "string"
+        },
+        "lastname": {
+            "type": "string"
+        },
+        "email": {
+            "type": "string"
+        },
+        "image_source": {
+            "type": "null"
+        },
+        "web": {
+            "type": "string"
+        },
+        "mobile": {
+            "type": "string"
+        },
+        "street": {
+            "type": "string"
+        },
+        "zip": {
+            "type": "string"
+        },
+        "city": {
+            "type": "string"
+        },
+        "vip": {
+            "type": "boolean"
+        },
+        "verified": {
+            "type": "boolean"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "note": {
+            "type": "string"
+        },
+        "login_failed": {
+            "type": "integer"
+        },
+        "out_of_office": {
+            "type": "boolean"
+        },
+        "out_of_office_start_at": {
+            "type": "null"
+        },
+        "out_of_office_end_at": {
+            "type": "null"
+        },
+        "out_of_office_replacement_id": {
+            "type": "null"
+        },
+        "preferences": {
+            "type": "object",
+            "properties": {
+                "notification_config": {
+                    "type": "object",
+                    "properties": {
+                        "matrix": {
+                            "type": "object",
+                            "properties": {
+                                "create": {
+                                    "type": "object",
+                                    "properties": {
+                                        "criteria": {
+                                            "type": "object",
+                                            "properties": {
+                                                "owned_by_me": {
+                                                    "type": "boolean"
+                                                },
+                                                "owned_by_nobody": {
+                                                    "type": "boolean"
+                                                },
+                                                "subscribed": {
+                                                    "type": "boolean"
+                                                },
+                                                "no": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "owned_by_me",
+                                                "owned_by_nobody",
+                                                "subscribed",
+                                                "no"
+                                            ]
+                                        },
+                                        "channel": {
+                                            "type": "object",
+                                            "properties": {
+                                                "email": {
+                                                    "type": "boolean"
+                                                },
+                                                "online": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "email",
+                                                "online"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "criteria",
+                                        "channel"
+                                    ]
+                                },
+                                "update": {
+                                    "type": "object",
+                                    "properties": {
+                                        "criteria": {
+                                            "type": "object",
+                                            "properties": {
+                                                "owned_by_me": {
+                                                    "type": "boolean"
+                                                },
+                                                "owned_by_nobody": {
+                                                    "type": "boolean"
+                                                },
+                                                "subscribed": {
+                                                    "type": "boolean"
+                                                },
+                                                "no": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "owned_by_me",
+                                                "owned_by_nobody",
+                                                "subscribed",
+                                                "no"
+                                            ]
+                                        },
+                                        "channel": {
+                                            "type": "object",
+                                            "properties": {
+                                                "email": {
+                                                    "type": "boolean"
+                                                },
+                                                "online": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "email",
+                                                "online"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "criteria",
+                                        "channel"
+                                    ]
+                                },
+                                "reminder_reached": {
+                                    "type": "object",
+                                    "properties": {
+                                        "criteria": {
+                                            "type": "object",
+                                            "properties": {
+                                                "owned_by_me": {
+                                                    "type": "boolean"
+                                                },
+                                                "owned_by_nobody": {
+                                                    "type": "boolean"
+                                                },
+                                                "subscribed": {
+                                                    "type": "boolean"
+                                                },
+                                                "no": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "owned_by_me",
+                                                "owned_by_nobody",
+                                                "subscribed",
+                                                "no"
+                                            ]
+                                        },
+                                        "channel": {
+                                            "type": "object",
+                                            "properties": {
+                                                "email": {
+                                                    "type": "boolean"
+                                                },
+                                                "online": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "email",
+                                                "online"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "criteria",
+                                        "channel"
+                                    ]
+                                },
+                                "escalation": {
+                                    "type": "object",
+                                    "properties": {
+                                        "criteria": {
+                                            "type": "object",
+                                            "properties": {
+                                                "owned_by_me": {
+                                                    "type": "boolean"
+                                                },
+                                                "owned_by_nobody": {
+                                                    "type": "boolean"
+                                                },
+                                                "subscribed": {
+                                                    "type": "boolean"
+                                                },
+                                                "no": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "owned_by_me",
+                                                "owned_by_nobody",
+                                                "subscribed",
+                                                "no"
+                                            ]
+                                        },
+                                        "channel": {
+                                            "type": "object",
+                                            "properties": {
+                                                "email": {
+                                                    "type": "boolean"
+                                                },
+                                                "online": {
+                                                    "type": "boolean"
+                                                }
+                                            },
+                                            "required": [
+                                                "email",
+                                                "online"
+                                            ]
+                                        }
+                                    },
+                                    "required": [
+                                        "criteria",
+                                        "channel"
+                                    ]
+                                }
+                            },
+                            "required": [
+                                "create",
+                                "update",
+                                "reminder_reached",
+                                "escalation"
+                            ]
+                        }
+                    },
+                    "required": [
+                        "matrix"
+                    ]
+                },
+                "locale": {
+                    "type": "string"
+                },
+                "intro": {
+                    "type": "boolean"
+                },
+                "theme": {
+                    "type": "string"
+                },
+                "secondaryAction": {
+                    "type": "string"
+                },
+                "tickets_closed": {
+                    "type": "integer"
+                },
+                "tickets_open": {
+                    "type": "integer"
+                },
+                "notification_sound": {
+                    "type": "object",
+                    "properties": {
+                        "file": {
+                            "type": "string"
+                        },
+                        "enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "file",
+                        "enabled"
+                    ]
+                }
+            },
+            "required": [
+                "locale"
+            ]
+        },
+        "updated_by_id": {
+            "type": "integer"
+        },
+        "created_by_id": {
+            "type": "integer"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "role_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "two_factor_preference_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "group_ids": {
+            "type": "object",
+            "properties": {
+                "1": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                }
+            }
+        }
+    },
+    "required": [
+        "id",
+        "organization_id",
+        "login",
+        "firstname",
+        "lastname",
+        "email",
+        "image",
+        "image_source",
+        "web",
+        "phone",
+        "fax",
+        "mobile",
+        "department",
+        "street",
+        "zip",
+        "city",
+        "country",
+        "address",
+        "vip",
+        "verified",
+        "active",
+        "note",
+        "last_login",
+        "source",
+        "login_failed",
+        "out_of_office",
+        "out_of_office_start_at",
+        "out_of_office_end_at",
+        "out_of_office_replacement_id",
+        "preferences",
+        "updated_by_id",
+        "created_by_id",
+        "created_at",
+        "updated_at",
+        "role_ids",
+        "two_factor_preference_ids",
+        "organization_ids",
+        "authorization_ids",
+        "overview_sorting_ids",
+        "group_ids"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index 8c492275a8..1140d776fd 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -29,6 +29,7 @@ export class Zendesk implements INodeType {
 		defaults: {
 			name: 'Zendesk',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/create.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/create.json
new file mode 100644
index 0000000000..fe0fe422c9
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/create.json
@@ -0,0 +1,140 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "via": {
+            "type": "object",
+            "properties": {
+                "channel": {
+                    "type": "string"
+                },
+                "source": {
+                    "type": "object",
+                    "properties": {
+                        "rel": {
+                            "type": "null"
+                        }
+                    },
+                    "required": [
+                        "from",
+                        "to",
+                        "rel"
+                    ]
+                }
+            },
+            "required": [
+                "channel",
+                "source"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "generated_timestamp": {
+            "type": "integer"
+        },
+        "description": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "submitter_id": {
+            "type": "integer"
+        },
+        "forum_topic_id": {
+            "type": "null"
+        },
+        "problem_id": {
+            "type": "null"
+        },
+        "has_incidents": {
+            "type": "boolean"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "due_at": {
+            "type": "null"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "satisfaction_rating": {
+            "type": "object",
+            "properties": {
+                "score": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "score"
+            ]
+        },
+        "custom_status_id": {
+            "type": "integer"
+        },
+        "encoded_id": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "ticket_form_id": {
+            "type": "integer"
+        },
+        "brand_id": {
+            "type": "integer"
+        },
+        "allow_channelback": {
+            "type": "boolean"
+        },
+        "allow_attachments": {
+            "type": "boolean"
+        },
+        "from_messaging_channel": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/get.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/get.json
new file mode 100644
index 0000000000..f15858bd26
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/get.json
@@ -0,0 +1,195 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "via": {
+            "type": "object",
+            "properties": {
+                "channel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channel",
+                "source"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "generated_timestamp": {
+            "type": "integer"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "raw_subject": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "submitter_id": {
+            "type": "integer"
+        },
+        "collaborator_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "follower_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "email_cc_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "forum_topic_id": {
+            "type": "null"
+        },
+        "problem_id": {
+            "type": "null"
+        },
+        "has_incidents": {
+            "type": "boolean"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "due_at": {
+            "type": "null"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "satisfaction_rating": {
+            "type": "object",
+            "properties": {
+                "score": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "score"
+            ]
+        },
+        "custom_status_id": {
+            "type": "integer"
+        },
+        "encoded_id": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "followup_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "brand_id": {
+            "type": "integer"
+        },
+        "allow_channelback": {
+            "type": "boolean"
+        },
+        "allow_attachments": {
+            "type": "boolean"
+        },
+        "from_messaging_channel": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "url",
+        "id",
+        "external_id",
+        "via",
+        "created_at",
+        "updated_at",
+        "generated_timestamp",
+        "type",
+        "subject",
+        "raw_subject",
+        "description",
+        "priority",
+        "status",
+        "recipient",
+        "requester_id",
+        "submitter_id",
+        "assignee_id",
+        "organization_id",
+        "group_id",
+        "collaborator_ids",
+        "follower_ids",
+        "email_cc_ids",
+        "forum_topic_id",
+        "problem_id",
+        "has_incidents",
+        "is_public",
+        "due_at",
+        "tags",
+        "custom_fields",
+        "satisfaction_rating",
+        "sharing_agreement_ids",
+        "custom_status_id",
+        "encoded_id",
+        "fields",
+        "followup_ids",
+        "brand_id",
+        "allow_channelback",
+        "allow_attachments",
+        "from_messaging_channel"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/getAll.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/getAll.json
new file mode 100644
index 0000000000..cb12b9535f
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/getAll.json
@@ -0,0 +1,164 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "via": {
+            "type": "object",
+            "properties": {
+                "channel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channel",
+                "source"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "generated_timestamp": {
+            "type": "integer"
+        },
+        "subject": {
+            "type": "string"
+        },
+        "raw_subject": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "submitter_id": {
+            "type": "integer"
+        },
+        "collaborator_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "follower_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "email_cc_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "forum_topic_id": {
+            "type": "null"
+        },
+        "problem_id": {
+            "type": "null"
+        },
+        "has_incidents": {
+            "type": "boolean"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "satisfaction_rating": {
+            "type": "object",
+            "properties": {
+                "score": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "score"
+            ]
+        },
+        "custom_status_id": {
+            "type": "integer"
+        },
+        "encoded_id": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "followup_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "brand_id": {
+            "type": "integer"
+        },
+        "allow_channelback": {
+            "type": "boolean"
+        },
+        "allow_attachments": {
+            "type": "boolean"
+        },
+        "from_messaging_channel": {
+            "type": "boolean"
+        },
+        "result_type": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "url",
+        "id",
+        "via",
+        "created_at",
+        "updated_at",
+        "subject",
+        "recipient",
+        "brand_id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/update.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/update.json
new file mode 100644
index 0000000000..eb6a4d780a
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticket/update.json
@@ -0,0 +1,142 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "via": {
+            "type": "object",
+            "properties": {
+                "channel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channel",
+                "source"
+            ]
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "generated_timestamp": {
+            "type": "integer"
+        },
+        "description": {
+            "type": "string"
+        },
+        "status": {
+            "type": "string"
+        },
+        "requester_id": {
+            "type": "integer"
+        },
+        "submitter_id": {
+            "type": "integer"
+        },
+        "collaborator_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "follower_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "email_cc_ids": {
+            "type": "array",
+            "items": {
+                "type": "integer"
+            }
+        },
+        "forum_topic_id": {
+            "type": "null"
+        },
+        "problem_id": {
+            "type": "null"
+        },
+        "has_incidents": {
+            "type": "boolean"
+        },
+        "is_public": {
+            "type": "boolean"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "custom_fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "satisfaction_rating": {
+            "type": "object",
+            "properties": {
+                "score": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "score"
+            ]
+        },
+        "custom_status_id": {
+            "type": "integer"
+        },
+        "encoded_id": {
+            "type": "string"
+        },
+        "fields": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    }
+                },
+                "required": [
+                    "id",
+                    "value"
+                ]
+            }
+        },
+        "ticket_form_id": {
+            "type": "integer"
+        },
+        "brand_id": {
+            "type": "integer"
+        },
+        "allow_channelback": {
+            "type": "boolean"
+        },
+        "allow_attachments": {
+            "type": "boolean"
+        },
+        "from_messaging_channel": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticketField/getAll.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticketField/getAll.json
new file mode 100644
index 0000000000..3787fe4c9e
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/ticketField/getAll.json
@@ -0,0 +1,126 @@
+{
+    "type": "object",
+    "properties": {
+        "url": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "type": {
+            "type": "string"
+        },
+        "title": {
+            "type": "string"
+        },
+        "raw_title": {
+            "type": "string"
+        },
+        "description": {
+            "type": "string"
+        },
+        "raw_description": {
+            "type": "string"
+        },
+        "position": {
+            "type": "integer"
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "required": {
+            "type": "boolean"
+        },
+        "collapsed_for_agents": {
+            "type": "boolean"
+        },
+        "regexp_for_validation": {
+            "type": "null"
+        },
+        "title_in_portal": {
+            "type": "string"
+        },
+        "raw_title_in_portal": {
+            "type": "string"
+        },
+        "visible_in_portal": {
+            "type": "boolean"
+        },
+        "editable_in_portal": {
+            "type": "boolean"
+        },
+        "required_in_portal": {
+            "type": "boolean"
+        },
+        "tag": {
+            "type": "null"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "removable": {
+            "type": "boolean"
+        },
+        "key": {
+            "type": "null"
+        },
+        "custom_field_options": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "raw_name": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "id",
+                    "name",
+                    "raw_name",
+                    "value",
+                    "default"
+                ]
+            }
+        }
+    },
+    "required": [
+        "url",
+        "id",
+        "type",
+        "title",
+        "raw_title",
+        "description",
+        "raw_description",
+        "position",
+        "active",
+        "required",
+        "collapsed_for_agents",
+        "regexp_for_validation",
+        "title_in_portal",
+        "raw_title_in_portal",
+        "visible_in_portal",
+        "editable_in_portal",
+        "required_in_portal",
+        "tag",
+        "created_at",
+        "updated_at",
+        "removable",
+        "key",
+        "agent_description"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/get.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/get.json
new file mode 100644
index 0000000000..800cdaea79
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/get.json
@@ -0,0 +1,68 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "url": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "time_zone": {
+            "type": "string"
+        },
+        "iana_time_zone": {
+            "type": "string"
+        },
+        "locale_id": {
+            "type": "integer"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "role": {
+            "type": "string"
+        },
+        "verified": {
+            "type": "boolean"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "shared": {
+            "type": "boolean"
+        },
+        "shared_agent": {
+            "type": "boolean"
+        },
+        "moderator": {
+            "type": "boolean"
+        },
+        "only_private_comments": {
+            "type": "boolean"
+        },
+        "restricted_agent": {
+            "type": "boolean"
+        },
+        "suspended": {
+            "type": "boolean"
+        },
+        "report_csv": {
+            "type": "boolean"
+        }
+    }
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/getAll.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/getAll.json
new file mode 100644
index 0000000000..a657774fca
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/getAll.json
@@ -0,0 +1,110 @@
+{
+	"type": "object",
+	"properties": {
+		"id": {
+			"type": "integer"
+		},
+		"url": {
+			"type": "string"
+		},
+		"name": {
+			"type": "string"
+		},
+		"created_at": {
+			"type": "string"
+		},
+		"updated_at": {
+			"type": "string"
+		},
+		"time_zone": {
+			"type": "string"
+		},
+		"iana_time_zone": {
+			"type": "string"
+		},
+		"locale_id": {
+			"type": "integer"
+		},
+		"locale": {
+			"type": "string"
+		},
+		"role": {
+			"type": "string"
+		},
+		"verified": {
+			"type": "boolean"
+		},
+		"tags": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
+		"active": {
+			"type": "boolean"
+		},
+		"shared": {
+			"type": "boolean"
+		},
+		"shared_agent": {
+			"type": "boolean"
+		},
+		"two_factor_auth_enabled": {
+			"type": "null"
+		},
+		"moderator": {
+			"type": "boolean"
+		},
+		"only_private_comments": {
+			"type": "boolean"
+		},
+		"restricted_agent": {
+			"type": "boolean"
+		},
+		"suspended": {
+			"type": "boolean"
+		},
+		"report_csv": {
+			"type": "boolean"
+		}
+	},
+	"required": [
+		"id",
+		"url",
+		"name",
+		"email",
+		"created_at",
+		"updated_at",
+		"time_zone",
+		"iana_time_zone",
+		"phone",
+		"shared_phone_number",
+		"photo",
+		"locale_id",
+		"locale",
+		"organization_id",
+		"role",
+		"verified",
+		"external_id",
+		"tags",
+		"alias",
+		"active",
+		"shared",
+		"shared_agent",
+		"last_login_at",
+		"two_factor_auth_enabled",
+		"signature",
+		"details",
+		"notes",
+		"role_type",
+		"custom_role_id",
+		"moderator",
+		"ticket_restriction",
+		"only_private_comments",
+		"restricted_agent",
+		"suspended",
+		"default_group_id",
+		"report_csv",
+		"user_fields"
+	]
+}
diff --git a/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/search.json b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/search.json
new file mode 100644
index 0000000000..67d340a070
--- /dev/null
+++ b/packages/nodes-base/nodes/Zendesk/__schema__/v1.0.0/user/search.json
@@ -0,0 +1,110 @@
+{
+    "type": "object",
+    "properties": {
+        "id": {
+            "type": "integer"
+        },
+        "url": {
+            "type": "string"
+        },
+        "name": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "updated_at": {
+            "type": "string"
+        },
+        "time_zone": {
+            "type": "string"
+        },
+        "iana_time_zone": {
+            "type": "string"
+        },
+        "locale_id": {
+            "type": "integer"
+        },
+        "locale": {
+            "type": "string"
+        },
+        "role": {
+            "type": "string"
+        },
+        "verified": {
+            "type": "boolean"
+        },
+        "tags": {
+            "type": "array",
+            "items": {
+                "type": "string"
+            }
+        },
+        "active": {
+            "type": "boolean"
+        },
+        "shared": {
+            "type": "boolean"
+        },
+        "shared_agent": {
+            "type": "boolean"
+        },
+        "two_factor_auth_enabled": {
+            "type": "null"
+        },
+        "moderator": {
+            "type": "boolean"
+        },
+        "only_private_comments": {
+            "type": "boolean"
+        },
+        "restricted_agent": {
+            "type": "boolean"
+        },
+        "suspended": {
+            "type": "boolean"
+        },
+        "report_csv": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "id",
+        "url",
+        "name",
+        "email",
+        "created_at",
+        "updated_at",
+        "time_zone",
+        "iana_time_zone",
+        "phone",
+        "shared_phone_number",
+        "photo",
+        "locale_id",
+        "locale",
+        "organization_id",
+        "role",
+        "verified",
+        "external_id",
+        "tags",
+        "alias",
+        "active",
+        "shared",
+        "shared_agent",
+        "last_login_at",
+        "two_factor_auth_enabled",
+        "signature",
+        "details",
+        "notes",
+        "role_type",
+        "custom_role_id",
+        "moderator",
+        "ticket_restriction",
+        "only_private_comments",
+        "restricted_agent",
+        "suspended",
+        "default_group_id",
+        "report_csv",
+        "user_fields"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index 67d76a33ab..95e6211eb4 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -76,6 +76,7 @@ export class ZohoCrm implements INodeType {
 		defaults: {
 			name: 'Zoho CRM',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/account/getAll.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/account/getAll.json
new file mode 100644
index 0000000000..8f04e6fced
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/account/getAll.json
@@ -0,0 +1,151 @@
+{
+    "type": "object",
+    "properties": {
+        "Owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$currency_symbol": {
+            "type": "string"
+        },
+        "$field_states": {
+            "type": "null"
+        },
+        "$review_process": {
+            "type": "object",
+            "properties": {
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "$review": {
+            "type": "null"
+        },
+        "$state": {
+            "type": "string"
+        },
+        "$process_flow": {
+            "type": "boolean"
+        },
+        "$locked_for_me": {
+            "type": "boolean"
+        },
+        "Account_Name": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "$approved": {
+            "type": "boolean"
+        },
+        "$approval": {
+            "type": "object",
+            "properties": {
+                "delegate": {
+                    "type": "boolean"
+                },
+                "takeover": {
+                    "type": "boolean"
+                },
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "delegate",
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "$editable": {
+            "type": "boolean"
+        },
+        "$in_merge": {
+            "type": "boolean"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "Tag": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name",
+                    "id"
+                ]
+            }
+        },
+        "$approval_state": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/create.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/create.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/create.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/get.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/get.json
new file mode 100644
index 0000000000..cd597e3997
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/get.json
@@ -0,0 +1,238 @@
+{
+    "type": "object",
+    "properties": {
+        "Owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$currency_symbol": {
+            "type": "string"
+        },
+        "$field_states": {
+            "type": "null"
+        },
+        "$state": {
+            "type": "string"
+        },
+        "Unsubscribed_Mode": {
+            "type": "null"
+        },
+        "$process_flow": {
+            "type": "boolean"
+        },
+        "$locked_for_me": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "$approved": {
+            "type": "boolean"
+        },
+        "$approval": {
+            "type": "object",
+            "properties": {
+                "delegate": {
+                    "type": "boolean"
+                },
+                "takeover": {
+                    "type": "boolean"
+                },
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "delegate",
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "$editable": {
+            "type": "boolean"
+        },
+        "Home_Phone": {
+            "type": "null"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$is_duplicate": {
+            "type": "boolean"
+        },
+        "$review_process": {
+            "type": "object",
+            "properties": {
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "Full_Name": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$review": {
+            "type": "null"
+        },
+        "Email_Opt_Out": {
+            "type": "boolean"
+        },
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Unsubscribed_Time": {
+            "type": "null"
+        },
+        "Last_Name": {
+            "type": "string"
+        },
+        "$in_merge": {
+            "type": "boolean"
+        },
+        "$approval_state": {
+            "type": "string"
+        },
+        "Locked__s": {
+            "type": "boolean"
+        },
+        "Secondary_Email": {
+            "type": "null"
+        },
+        "Vendor_Name": {
+            "type": "null"
+        },
+        "Date_of_Birth": {
+            "type": "null"
+        },
+        "Fax": {
+            "type": "null"
+        },
+        "Other_Country": {
+            "type": "null"
+        },
+        "Assistant": {
+            "type": "null"
+        },
+        "Other_Zip": {
+            "type": "null"
+        },
+        "Other_Street": {
+            "type": "null"
+        },
+        "Other_State": {
+            "type": "null"
+        },
+        "Reporting_To": {
+            "type": "null"
+        },
+        "Other_City": {
+            "type": "null"
+        },
+        "Asst_Phone": {
+            "type": "null"
+        },
+        "$canvas_id": {
+            "type": "null"
+        }
+    },
+    "required": [
+        "Owner",
+        "Email",
+        "$currency_symbol",
+        "$field_states",
+        "Mailing_State",
+        "Last_Activity_Time",
+        "$state",
+        "$process_flow",
+        "Mailing_Country",
+        "$locked_for_me",
+        "id",
+        "$approved",
+        "$approval",
+        "$editable",
+        "$zia_owner_assignment",
+        "Mailing_Zip",
+        "$review_process",
+        "Mailing_Street",
+        "Salutation",
+        "First_Name",
+        "Full_Name",
+        "$review",
+        "Mailing_City",
+        "$orchestration",
+        "Last_Name",
+        "$in_merge",
+        "$approval_state"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/getAll.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/getAll.json
new file mode 100644
index 0000000000..2570a9b453
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/getAll.json
@@ -0,0 +1,221 @@
+{
+    "type": "object",
+    "properties": {
+        "Owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$currency_symbol": {
+            "type": "string"
+        },
+        "$field_states": {
+            "type": "null"
+        },
+        "$state": {
+            "type": "string"
+        },
+        "Unsubscribed_Mode": {
+            "type": "null"
+        },
+        "$process_flow": {
+            "type": "boolean"
+        },
+        "Assistant": {
+            "type": "null"
+        },
+        "$locked_for_me": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "$approved": {
+            "type": "boolean"
+        },
+        "Reporting_To": {
+            "type": "null"
+        },
+        "$approval": {
+            "type": "object",
+            "properties": {
+                "delegate": {
+                    "type": "boolean"
+                },
+                "takeover": {
+                    "type": "boolean"
+                },
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "delegate",
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "$editable": {
+            "type": "boolean"
+        },
+        "Home_Phone": {
+            "type": "null"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$is_duplicate": {
+            "type": "boolean"
+        },
+        "$review_process": {
+            "type": "object",
+            "properties": {
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "Other_Zip": {
+            "type": "null"
+        },
+        "$layout_id": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Full_Name": {
+            "type": "string"
+        },
+        "Asst_Phone": {
+            "type": "null"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$review": {
+            "type": "null"
+        },
+        "Email_Opt_Out": {
+            "type": "boolean"
+        },
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Unsubscribed_Time": {
+            "type": "null"
+        },
+        "Other_Street": {
+            "type": "null"
+        },
+        "Last_Name": {
+            "type": "string"
+        },
+        "$in_merge": {
+            "type": "boolean"
+        },
+        "Locked__s": {
+            "type": "boolean"
+        },
+        "Tag": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name",
+                    "id"
+                ]
+            }
+        },
+        "$approval_state": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/update.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/update.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/update.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/upsert.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/upsert.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/contact/upsert.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/deal/getAll.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/deal/getAll.json
new file mode 100644
index 0000000000..05e3ee2e30
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/deal/getAll.json
@@ -0,0 +1,191 @@
+{
+    "type": "object",
+    "properties": {
+        "Owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$currency_symbol": {
+            "type": "string"
+        },
+        "$field_states": {
+            "type": "null"
+        },
+        "$review_process": {
+            "type": "object",
+            "properties": {
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "$layout_id": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Reason_For_Loss__s": {
+            "type": "null"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$review": {
+            "type": "null"
+        },
+        "$state": {
+            "type": "string"
+        },
+        "$process_flow": {
+            "type": "boolean"
+        },
+        "Deal_Name": {
+            "type": "string"
+        },
+        "$locked_for_me": {
+            "type": "boolean"
+        },
+        "Account_Name": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "id": {
+            "type": "string"
+        },
+        "$approved": {
+            "type": "boolean"
+        },
+        "$approval": {
+            "type": "object",
+            "properties": {
+                "delegate": {
+                    "type": "boolean"
+                },
+                "takeover": {
+                    "type": "boolean"
+                },
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "delegate",
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "Probability": {
+            "type": "integer"
+        },
+        "$editable": {
+            "type": "boolean"
+        },
+        "$in_merge": {
+            "type": "boolean"
+        },
+        "Locked__s": {
+            "type": "boolean"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$approval_state": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/deal/update.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/deal/update.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/deal/update.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/create.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/create.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/create.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/get.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/get.json
new file mode 100644
index 0000000000..f6406a2575
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/get.json
@@ -0,0 +1,261 @@
+{
+    "type": "object",
+    "properties": {
+        "data": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "Owner": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "id",
+                            "email"
+                        ]
+                    },
+                    "$currency_symbol": {
+                        "type": "string"
+                    },
+                    "$field_states": {
+                        "type": "null"
+                    },
+                    "$state": {
+                        "type": "string"
+                    },
+                    "Unsubscribed_Mode": {
+                        "type": "null"
+                    },
+                    "$converted": {
+                        "type": "boolean"
+                    },
+                    "$process_flow": {
+                        "type": "boolean"
+                    },
+                    "$locked_for_me": {
+                        "type": "boolean"
+                    },
+                    "id": {
+                        "type": "string"
+                    },
+                    "$approved": {
+                        "type": "boolean"
+                    },
+                    "$approval": {
+                        "type": "object",
+                        "properties": {
+                            "delegate": {
+                                "type": "boolean"
+                            },
+                            "takeover": {
+                                "type": "boolean"
+                            },
+                            "approve": {
+                                "type": "boolean"
+                            },
+                            "reject": {
+                                "type": "boolean"
+                            },
+                            "resubmit": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "delegate",
+                            "approve",
+                            "reject",
+                            "resubmit"
+                        ]
+                    },
+                    "Created_Time": {
+                        "type": "string"
+                    },
+                    "$editable": {
+                        "type": "boolean"
+                    },
+                    "No_of_Employees": {
+                        "type": "null"
+                    },
+                    "Created_By": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "id",
+                            "email"
+                        ]
+                    },
+                    "$zia_owner_assignment": {
+                        "type": "string"
+                    },
+                    "Annual_Revenue": {
+                        "type": "null"
+                    },
+                    "Secondary_Email": {
+                        "type": "null"
+                    },
+                    "Description": {
+                        "type": "null"
+                    },
+                    "Rating": {
+                        "type": "null"
+                    },
+                    "$review_process": {
+                        "type": "object",
+                        "properties": {
+                            "approve": {
+                                "type": "boolean"
+                            },
+                            "reject": {
+                                "type": "boolean"
+                            },
+                            "resubmit": {
+                                "type": "boolean"
+                            }
+                        },
+                        "required": [
+                            "approve",
+                            "reject",
+                            "resubmit"
+                        ]
+                    },
+                    "Twitter": {
+                        "type": "null"
+                    },
+                    "Salutation": {
+                        "type": "null"
+                    },
+                    "Full_Name": {
+                        "type": "string"
+                    },
+                    "Record_Image": {
+                        "type": "null"
+                    },
+                    "Modified_By": {
+                        "type": "object",
+                        "properties": {
+                            "name": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string"
+                            },
+                            "email": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "name",
+                            "id",
+                            "email"
+                        ]
+                    },
+                    "$review": {
+                        "type": "null"
+                    },
+                    "Skype_ID": {
+                        "type": "null"
+                    },
+                    "Email_Opt_Out": {
+                        "type": "boolean"
+                    },
+                    "Modified_Time": {
+                        "type": "string"
+                    },
+                    "Unsubscribed_Time": {
+                        "type": "null"
+                    },
+                    "Last_Name": {
+                        "type": "string"
+                    },
+                    "$in_merge": {
+                        "type": "boolean"
+                    },
+                    "Tag": {
+                        "type": "array",
+                        "items": {
+                            "type": "object",
+                            "properties": {
+                                "name": {
+                                    "type": "string"
+                                },
+                                "id": {
+                                    "type": "string"
+                                }
+                            },
+                            "required": [
+                                "name",
+                                "id"
+                            ]
+                        }
+                    },
+                    "Fax": {
+                        "type": "null"
+                    },
+                    "$approval_state": {
+                        "type": "string"
+                    },
+                    "Locked__s": {
+                        "type": "boolean"
+                    }
+                },
+                "required": [
+                    "Owner",
+                    "Email",
+                    "$currency_symbol",
+                    "$field_states",
+                    "Last_Activity_Time",
+                    "$state",
+                    "Unsubscribed_Mode",
+                    "$converted",
+                    "$process_flow",
+                    "$locked_for_me",
+                    "id",
+                    "$approved",
+                    "$approval",
+                    "Created_Time",
+                    "$editable",
+                    "Created_By",
+                    "$zia_owner_assignment",
+                    "$review_process",
+                    "Salutation",
+                    "First_Name",
+                    "Full_Name",
+                    "Lead_Status",
+                    "$review",
+                    "Phone",
+                    "$converted_detail",
+                    "Unsubscribed_Time",
+                    "$orchestration",
+                    "Last_Name",
+                    "$in_merge",
+                    "$approval_state"
+                ]
+            }
+        }
+    },
+    "required": [
+        "data"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/getAll.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/getAll.json
new file mode 100644
index 0000000000..83eff4259c
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/getAll.json
@@ -0,0 +1,181 @@
+{
+    "type": "object",
+    "properties": {
+        "Owner": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$currency_symbol": {
+            "type": "string"
+        },
+        "$field_states": {
+            "type": "null"
+        },
+        "$state": {
+            "type": "string"
+        },
+        "Unsubscribed_Mode": {
+            "type": "null"
+        },
+        "$converted": {
+            "type": "boolean"
+        },
+        "$process_flow": {
+            "type": "boolean"
+        },
+        "$locked_for_me": {
+            "type": "boolean"
+        },
+        "id": {
+            "type": "string"
+        },
+        "$approved": {
+            "type": "boolean"
+        },
+        "$approval": {
+            "type": "object",
+            "properties": {
+                "delegate": {
+                    "type": "boolean"
+                },
+                "takeover": {
+                    "type": "boolean"
+                },
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "delegate",
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "$editable": {
+            "type": "boolean"
+        },
+        "$review_process": {
+            "type": "object",
+            "properties": {
+                "approve": {
+                    "type": "boolean"
+                },
+                "reject": {
+                    "type": "boolean"
+                },
+                "resubmit": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "approve",
+                "reject",
+                "resubmit"
+            ]
+        },
+        "$layout_id": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Full_Name": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                },
+                "email": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id",
+                "email"
+            ]
+        },
+        "$review": {
+            "type": "null"
+        },
+        "Email_Opt_Out": {
+            "type": "boolean"
+        },
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Unsubscribed_Time": {
+            "type": "null"
+        },
+        "Last_Name": {
+            "type": "string"
+        },
+        "$in_merge": {
+            "type": "boolean"
+        },
+        "Locked__s": {
+            "type": "boolean"
+        },
+        "Tag": {
+            "type": "array",
+            "items": {
+                "type": "object",
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "id": {
+                        "type": "string"
+                    }
+                },
+                "required": [
+                    "name",
+                    "id"
+                ]
+            }
+        },
+        "$approval_state": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "id"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/update.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/update.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/update.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/upsert.json b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/upsert.json
new file mode 100644
index 0000000000..15496beeb7
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoho/__schema__/v1.0.0/lead/upsert.json
@@ -0,0 +1,51 @@
+{
+    "type": "object",
+    "properties": {
+        "Modified_Time": {
+            "type": "string"
+        },
+        "Modified_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        },
+        "Created_Time": {
+            "type": "string"
+        },
+        "id": {
+            "type": "string"
+        },
+        "Created_By": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "name",
+                "id"
+            ]
+        }
+    },
+    "required": [
+        "Modified_Time",
+        "Modified_By",
+        "Created_Time",
+        "id",
+        "Created_By"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 2a9f051765..a026daff6a 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -53,6 +53,7 @@ export class Zoom implements INodeType {
 			name: 'Zoom',
 		},
 		icon: 'file:zoom.svg',
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/create.json b/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/create.json
new file mode 100644
index 0000000000..fe412ef394
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/create.json
@@ -0,0 +1,303 @@
+{
+    "type": "object",
+    "properties": {
+        "uuid": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "host_id": {
+            "type": "string"
+        },
+        "host_email": {
+            "type": "string"
+        },
+        "topic": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "start_time": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "integer"
+        },
+        "timezone": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "start_url": {
+            "type": "string"
+        },
+        "join_url": {
+            "type": "string"
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "host_video": {
+                    "type": "boolean"
+                },
+                "participant_video": {
+                    "type": "boolean"
+                },
+                "cn_meeting": {
+                    "type": "boolean"
+                },
+                "in_meeting": {
+                    "type": "boolean"
+                },
+                "join_before_host": {
+                    "type": "boolean"
+                },
+                "jbh_time": {
+                    "type": "integer"
+                },
+                "mute_upon_entry": {
+                    "type": "boolean"
+                },
+                "watermark": {
+                    "type": "boolean"
+                },
+                "use_pmi": {
+                    "type": "boolean"
+                },
+                "approval_type": {
+                    "type": "integer"
+                },
+                "audio": {
+                    "type": "string"
+                },
+                "auto_recording": {
+                    "type": "string"
+                },
+                "enforce_login": {
+                    "type": "boolean"
+                },
+                "enforce_login_domains": {
+                    "type": "string"
+                },
+                "alternative_hosts": {
+                    "type": "string"
+                },
+                "alternative_host_update_polls": {
+                    "type": "boolean"
+                },
+                "close_registration": {
+                    "type": "boolean"
+                },
+                "show_share_button": {
+                    "type": "boolean"
+                },
+                "allow_multiple_devices": {
+                    "type": "boolean"
+                },
+                "registrants_confirmation_email": {
+                    "type": "boolean"
+                },
+                "waiting_room": {
+                    "type": "boolean"
+                },
+                "request_permission_to_unmute_participants": {
+                    "type": "boolean"
+                },
+                "registrants_email_notification": {
+                    "type": "boolean"
+                },
+                "meeting_authentication": {
+                    "type": "boolean"
+                },
+                "encryption_type": {
+                    "type": "string"
+                },
+                "approved_or_denied_countries_or_regions": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enable"
+                    ]
+                },
+                "breakout_room": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enable"
+                    ]
+                },
+                "internal_meeting": {
+                    "type": "boolean"
+                },
+                "continuous_meeting_chat": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        },
+                        "auto_add_invited_external_users": {
+                            "type": "boolean"
+                        },
+                        "auto_add_meeting_participants": {
+                            "type": "boolean"
+                        },
+                        "channel_id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "enable",
+                        "auto_add_invited_external_users",
+                        "channel_id"
+                    ]
+                },
+                "participant_focused_meeting": {
+                    "type": "boolean"
+                },
+                "push_change_to_calendar": {
+                    "type": "boolean"
+                },
+                "auto_start_meeting_summary": {
+                    "type": "boolean"
+                },
+                "auto_start_ai_companion_questions": {
+                    "type": "boolean"
+                },
+                "alternative_hosts_email_notification": {
+                    "type": "boolean"
+                },
+                "show_join_info": {
+                    "type": "boolean"
+                },
+                "device_testing": {
+                    "type": "boolean"
+                },
+                "focus_mode": {
+                    "type": "boolean"
+                },
+                "private_meeting": {
+                    "type": "boolean"
+                },
+                "email_notification": {
+                    "type": "boolean"
+                },
+                "host_save_video_order": {
+                    "type": "boolean"
+                },
+                "sign_language_interpretation": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enable"
+                    ]
+                },
+                "email_in_attendee_report": {
+                    "type": "boolean"
+                },
+                "enable_dedicated_group_chat": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "host_video",
+                "participant_video",
+                "cn_meeting",
+                "in_meeting",
+                "join_before_host",
+                "jbh_time",
+                "mute_upon_entry",
+                "watermark",
+                "use_pmi",
+                "approval_type",
+                "audio",
+                "auto_recording",
+                "enforce_login",
+                "enforce_login_domains",
+                "alternative_hosts",
+                "alternative_host_update_polls",
+                "close_registration",
+                "show_share_button",
+                "allow_multiple_devices",
+                "registrants_confirmation_email",
+                "waiting_room",
+                "request_permission_to_unmute_participants",
+                "registrants_email_notification",
+                "meeting_authentication",
+                "encryption_type",
+                "approved_or_denied_countries_or_regions",
+                "breakout_room",
+                "internal_meeting",
+                "continuous_meeting_chat",
+                "participant_focused_meeting",
+                "push_change_to_calendar",
+                "resources",
+                "alternative_hosts_email_notification",
+                "show_join_info",
+                "device_testing",
+                "focus_mode",
+                "meeting_invitees",
+                "private_meeting",
+                "email_notification",
+                "host_save_video_order",
+                "sign_language_interpretation",
+                "email_in_attendee_report"
+            ]
+        },
+        "supportGoLive": {
+            "type": "boolean"
+        },
+        "creation_source": {
+            "type": "string"
+        },
+        "pre_schedule": {
+            "type": "boolean"
+        },
+        "password": {
+            "type": "string"
+        },
+        "h323_password": {
+            "type": "string"
+        },
+        "pstn_password": {
+            "type": "string"
+        },
+        "encrypted_password": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "uuid",
+        "id",
+        "host_id",
+        "host_email",
+        "topic",
+        "type",
+        "status",
+        "start_time",
+        "duration",
+        "timezone",
+        "created_at",
+        "start_url",
+        "join_url",
+        "settings",
+        "pre_schedule"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/get.json b/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/get.json
new file mode 100644
index 0000000000..52650eb05f
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/get.json
@@ -0,0 +1,336 @@
+{
+    "type": "object",
+    "properties": {
+        "uuid": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "host_id": {
+            "type": "string"
+        },
+        "host_email": {
+            "type": "string"
+        },
+        "assistant_id": {
+            "type": "string"
+        },
+        "topic": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "status": {
+            "type": "string"
+        },
+        "start_time": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "integer"
+        },
+        "timezone": {
+            "type": "string"
+        },
+        "agenda": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "start_url": {
+            "type": "string"
+        },
+        "join_url": {
+            "type": "string"
+        },
+        "settings": {
+            "type": "object",
+            "properties": {
+                "host_video": {
+                    "type": "boolean"
+                },
+                "participant_video": {
+                    "type": "boolean"
+                },
+                "cn_meeting": {
+                    "type": "boolean"
+                },
+                "in_meeting": {
+                    "type": "boolean"
+                },
+                "join_before_host": {
+                    "type": "boolean"
+                },
+                "jbh_time": {
+                    "type": "integer"
+                },
+                "mute_upon_entry": {
+                    "type": "boolean"
+                },
+                "watermark": {
+                    "type": "boolean"
+                },
+                "use_pmi": {
+                    "type": "boolean"
+                },
+                "approval_type": {
+                    "type": "integer"
+                },
+                "audio": {
+                    "type": "string"
+                },
+                "auto_recording": {
+                    "type": "string"
+                },
+                "enforce_login": {
+                    "type": "boolean"
+                },
+                "enforce_login_domains": {
+                    "type": "string"
+                },
+                "alternative_hosts": {
+                    "type": "string"
+                },
+                "alternative_host_update_polls": {
+                    "type": "boolean"
+                },
+                "close_registration": {
+                    "type": "boolean"
+                },
+                "show_share_button": {
+                    "type": "boolean"
+                },
+                "allow_multiple_devices": {
+                    "type": "boolean"
+                },
+                "registrants_confirmation_email": {
+                    "type": "boolean"
+                },
+                "waiting_room": {
+                    "type": "boolean"
+                },
+                "request_permission_to_unmute_participants": {
+                    "type": "boolean"
+                },
+                "global_dial_in_countries": {
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
+                },
+                "global_dial_in_numbers": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "country_name": {
+                                "type": "string"
+                            },
+                            "number": {
+                                "type": "string"
+                            },
+                            "type": {
+                                "type": "string"
+                            },
+                            "country": {
+                                "type": "string"
+                            },
+                            "city": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "country_name",
+                            "number",
+                            "type",
+                            "country"
+                        ]
+                    }
+                },
+                "registrants_email_notification": {
+                    "type": "boolean"
+                },
+                "meeting_authentication": {
+                    "type": "boolean"
+                },
+                "encryption_type": {
+                    "type": "string"
+                },
+                "approved_or_denied_countries_or_regions": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enable"
+                    ]
+                },
+                "breakout_room": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enable"
+                    ]
+                },
+                "internal_meeting": {
+                    "type": "boolean"
+                },
+                "continuous_meeting_chat": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        },
+                        "auto_add_invited_external_users": {
+                            "type": "boolean"
+                        },
+                        "channel_id": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "enable",
+                        "auto_add_invited_external_users"
+                    ]
+                },
+                "participant_focused_meeting": {
+                    "type": "boolean"
+                },
+                "push_change_to_calendar": {
+                    "type": "boolean"
+                },
+                "auto_start_meeting_summary": {
+                    "type": "boolean"
+                },
+                "auto_start_ai_companion_questions": {
+                    "type": "boolean"
+                },
+                "alternative_hosts_email_notification": {
+                    "type": "boolean"
+                },
+                "show_join_info": {
+                    "type": "boolean"
+                },
+                "device_testing": {
+                    "type": "boolean"
+                },
+                "focus_mode": {
+                    "type": "boolean"
+                },
+                "meeting_invitees": {
+                    "type": "array",
+                    "items": {
+                        "type": "object",
+                        "properties": {
+                            "email": {
+                                "type": "string"
+                            }
+                        },
+                        "required": [
+                            "email"
+                        ]
+                    }
+                },
+                "private_meeting": {
+                    "type": "boolean"
+                },
+                "email_notification": {
+                    "type": "boolean"
+                },
+                "host_save_video_order": {
+                    "type": "boolean"
+                },
+                "sign_language_interpretation": {
+                    "type": "object",
+                    "properties": {
+                        "enable": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "enable"
+                    ]
+                },
+                "email_in_attendee_report": {
+                    "type": "boolean"
+                },
+                "enable_dedicated_group_chat": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "host_video",
+                "participant_video",
+                "cn_meeting",
+                "in_meeting",
+                "join_before_host",
+                "jbh_time",
+                "mute_upon_entry",
+                "watermark",
+                "use_pmi",
+                "approval_type",
+                "audio",
+                "auto_recording",
+                "enforce_login",
+                "enforce_login_domains",
+                "alternative_hosts",
+                "alternative_host_update_polls",
+                "close_registration",
+                "show_share_button",
+                "allow_multiple_devices",
+                "registrants_confirmation_email",
+                "waiting_room",
+                "request_permission_to_unmute_participants",
+                "registrants_email_notification",
+                "meeting_authentication",
+                "encryption_type",
+                "approved_or_denied_countries_or_regions",
+                "breakout_room",
+                "internal_meeting",
+                "continuous_meeting_chat",
+                "participant_focused_meeting",
+                "push_change_to_calendar",
+                "resources",
+                "alternative_hosts_email_notification",
+                "show_join_info",
+                "device_testing",
+                "focus_mode",
+                "meeting_invitees",
+                "private_meeting",
+                "email_notification",
+                "host_save_video_order",
+                "sign_language_interpretation",
+                "email_in_attendee_report"
+            ]
+        },
+        "pre_schedule": {
+            "type": "boolean"
+        }
+    },
+    "required": [
+        "uuid",
+        "id",
+        "host_id",
+        "host_email",
+        "assistant_id",
+        "topic",
+        "type",
+        "status",
+        "timezone",
+        "agenda",
+        "created_at",
+        "start_url",
+        "join_url",
+        "settings",
+        "pre_schedule"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/getAll.json b/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/getAll.json
new file mode 100644
index 0000000000..5dd22a0e76
--- /dev/null
+++ b/packages/nodes-base/nodes/Zoom/__schema__/v1.0.0/meeting/getAll.json
@@ -0,0 +1,46 @@
+{
+    "type": "object",
+    "properties": {
+        "uuid": {
+            "type": "string"
+        },
+        "id": {
+            "type": "integer"
+        },
+        "host_id": {
+            "type": "string"
+        },
+        "topic": {
+            "type": "string"
+        },
+        "type": {
+            "type": "integer"
+        },
+        "start_time": {
+            "type": "string"
+        },
+        "duration": {
+            "type": "integer"
+        },
+        "timezone": {
+            "type": "string"
+        },
+        "created_at": {
+            "type": "string"
+        },
+        "join_url": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "uuid",
+        "id",
+        "host_id",
+        "topic",
+        "type",
+        "duration",
+        "timezone",
+        "created_at",
+        "join_url"
+    ]
+}
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 67fab2e467..a32b7029cc 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -30,6 +30,7 @@ export class Zulip implements INodeType {
 		defaults: {
 			name: 'Zulip',
 		},
+		usableAsTool: true,
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		credentials: [
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 9e9e965229..266e51bebc 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,13 +1,13 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.75.0",
+  "version": "1.78.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-translations && pnpm n8n-generate-metadata",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-static-files && pnpm n8n-generate-translations && pnpm n8n-generate-metadata",
     "format": "biome format --write .",
     "format:check": "biome ci .",
     "lint": "eslint nodes credentials utils test --quiet && node ./scripts/validate-load-options-methods.js",
@@ -132,6 +132,7 @@
       "dist/credentials/GoogleBigQueryOAuth2Api.credentials.js",
       "dist/credentials/GoogleBooksOAuth2Api.credentials.js",
       "dist/credentials/GoogleCalendarOAuth2Api.credentials.js",
+      "dist/credentials/GoogleChatOAuth2Api.credentials.js",
       "dist/credentials/GoogleCloudNaturalLanguageOAuth2Api.credentials.js",
       "dist/credentials/GoogleCloudStorageOAuth2Api.credentials.js",
       "dist/credentials/GoogleContactsOAuth2Api.credentials.js",
@@ -181,6 +182,7 @@
       "dist/credentials/JenkinsApi.credentials.js",
       "dist/credentials/JiraSoftwareCloudApi.credentials.js",
       "dist/credentials/JiraSoftwareServerApi.credentials.js",
+      "dist/credentials/JiraSoftwareServerPatApi.credentials.js",
       "dist/credentials/JotFormApi.credentials.js",
       "dist/credentials/JwtAuth.credentials.js",
       "dist/credentials/Kafka.credentials.js",
@@ -217,7 +219,7 @@
       "dist/credentials/MetabaseApi.credentials.js",
       "dist/credentials/MessageBirdApi.credentials.js",
       "dist/credentials/MetabaseApi.credentials.js",
-      "dist/credentials/MicrosoftCosmosDbSharedKeyApi.credentials.js",
+      "dist/credentials/MicrosoftAzureMonitorOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftDynamicsOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftEntraOAuth2Api.credentials.js",
       "dist/credentials/MicrosoftExcelOAuth2Api.credentials.js",
@@ -231,6 +233,7 @@
       "dist/credentials/MicrosoftToDoOAuth2Api.credentials.js",
       "dist/credentials/MindeeInvoiceApi.credentials.js",
       "dist/credentials/MindeeReceiptApi.credentials.js",
+      "dist/credentials/MiroOAuth2Api.credentials.js",
       "dist/credentials/MispApi.credentials.js",
       "dist/credentials/MistApi.credentials.js",
       "dist/credentials/MoceanApi.credentials.js",
@@ -842,6 +845,7 @@
     "@types/nodemailer": "^6.4.14",
     "@types/promise-ftp": "^1.3.4",
     "@types/rfc2047": "^2.0.1",
+    "@types/sanitize-html": "^2.11.0",
     "@types/showdown": "^1.9.4",
     "@types/snowflake-sdk": "^1.6.24",
     "@types/ssh2-sftp-client": "^5.1.0",
@@ -907,6 +911,7 @@
     "rhea": "1.0.24",
     "rrule": "2.8.1",
     "rss-parser": "3.13.0",
+    "sanitize-html": "2.12.1",
     "semver": "7.5.4",
     "showdown": "2.1.0",
     "simple-git": "3.17.0",
diff --git a/packages/nodes-base/test/globalSetup.ts b/packages/nodes-base/test/globalSetup.ts
new file mode 100644
index 0000000000..49629bf321
--- /dev/null
+++ b/packages/nodes-base/test/globalSetup.ts
@@ -0,0 +1,5 @@
+import nock from 'nock';
+
+export default async () => {
+	nock.disableNetConnect();
+};
diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
index 3573edf2d4..bb200851a0 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -17,16 +17,11 @@ const records = [
 
 describe('Execute Airtable Node', () => {
 	beforeEach(() => {
-		nock.disableNetConnect();
 		nock('https://api.airtable.com/v0')
 			.get('/appIaXXdDqS5ORr4V/tbljyBEdYzCPF0NDh?pageSize=100')
 			.reply(200, { records });
 	});
 
-	afterEach(() => {
-		nock.restore();
-	});
-
 	const tests: WorkflowTestData[] = [
 		{
 			description: 'List Airtable Records',
diff --git a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
index 96445973e9..e7fee750f8 100644
--- a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
+++ b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
@@ -187,4 +187,24 @@ BQIDAQAB
 			expires_in: 86400,
 		},
 	},
+	spotifyOAuth2Api: {
+		accessTokenUrl: 'https://accounts.spotify.com/api/token',
+		authQueryParameters: '',
+		authUrl: 'https://accounts.spotify.com/authorize',
+		authentication: 'header',
+		clientId: 'CLIENT_ID',
+		clientSecret: 'CLIENT_SECRET',
+		grantType: 'authorizationCode',
+		oauthTokenData: {
+			access_token: 'ACCESS_TOKEN',
+			expires_in: 3600,
+			refresh_token: 'REFRESH_TOKEN',
+			scope:
+				'playlist-read-private playlist-read-collaborative user-modify-playback-state user-library-read user-follow-read playlist-modify-private playlist-modify-public user-read-playback-state user-read-currently-playing user-read-recently-played',
+			token_type: 'Bearer',
+		},
+		scope:
+			'user-read-playback-state playlist-read-collaborative user-modify-playback-state playlist-modify-public user-read-currently-playing playlist-read-private user-read-recently-played playlist-modify-private user-library-read user-follow-read',
+		server: 'https://api.spotify.com/',
+	},
 } as const;
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 017e2058f9..13ffe88de5 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -8,6 +8,7 @@ import {
 	Credentials,
 	UnrecognizedNodeTypeError,
 	constructExecutionMetaData,
+	ExecutionLifecycleHooks,
 } from 'n8n-core';
 import type {
 	CredentialLoadingDetails,
@@ -28,15 +29,13 @@ import type {
 	INodeTypeData,
 	INodeTypes,
 	IRun,
-	ITaskData,
 	IVersionedNodeType,
 	IWorkflowBase,
 	IWorkflowExecuteAdditionalData,
 	NodeLoadingDetails,
 	WorkflowTestData,
 } from 'n8n-workflow';
-import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
-import nock from 'nock';
+import { ApplicationError, ICredentialsHelper, NodeHelpers } from 'n8n-workflow';
 import { tmpdir } from 'os';
 import path from 'path';
 
@@ -156,22 +155,15 @@ export function WorkflowExecuteAdditionalData(
 	waitPromise: IDeferredPromise<IRun>,
 	nodeExecutionOrder: string[],
 ): IWorkflowExecuteAdditionalData {
-	const hookFunctions = {
-		nodeExecuteAfter: [
-			async (nodeName: string, _data: ITaskData): Promise<void> => {
-				nodeExecutionOrder.push(nodeName);
-			},
-		],
-		workflowExecuteAfter: [
-			async (fullRunData: IRun): Promise<void> => {
-				waitPromise.resolve(fullRunData);
-			},
-		],
-	};
+	const hooks = new ExecutionLifecycleHooks('trigger', '1', mock());
+	hooks.addHandler('nodeExecuteAfter', (nodeName) => {
+		nodeExecutionOrder.push(nodeName);
+	});
+	hooks.addHandler('workflowExecuteAfter', (fullRunData) => waitPromise.resolve(fullRunData));
 
 	return mock<IWorkflowExecuteAdditionalData>({
 		credentialsHelper: new CredentialsHelper(),
-		hooks: new WorkflowHooks(hookFunctions, 'trigger', '1', mock()),
+		hooks,
 		// Get from node.parameters
 		currentNodeParameters: undefined,
 	});
@@ -225,16 +217,6 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 		testData = [testData];
 	}
 
-	if (testData.some((t) => !!t.nock)) {
-		beforeAll(() => {
-			nock.disableNetConnect();
-		});
-
-		afterAll(() => {
-			nock.restore();
-		});
-	}
-
 	const nodeTypes = new NodeTypes();
 
 	const nodes = [...new Set(testData.flatMap((data) => data.input.workflowData.nodes))];
@@ -383,7 +365,6 @@ export const workflowToTests = (workflowFiles: string[]) => {
 
 export const testWorkflows = (workflows: string[]) => {
 	const tests = workflowToTests(workflows);
-
 	const nodeTypes = setup(tests);
 
 	for (const testData of tests) {
diff --git a/packages/nodes-base/test/nodes/TriggerHelpers.ts b/packages/nodes-base/test/nodes/TriggerHelpers.ts
index 7e04dcaa86..ce31937992 100644
--- a/packages/nodes-base/test/nodes/TriggerHelpers.ts
+++ b/packages/nodes-base/test/nodes/TriggerHelpers.ts
@@ -3,8 +3,9 @@ import { mock } from 'jest-mock-extended';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
-import { PollContext, returnJsonArray, type InstanceSettings } from 'n8n-core';
-import { ScheduledTaskManager } from 'n8n-core/dist/ScheduledTaskManager';
+import { PollContext, returnJsonArray } from 'n8n-core';
+import type { InstanceSettings, ExecutionLifecycleHooks } from 'n8n-core';
+import { ScheduledTaskManager } from 'n8n-core/dist/execution-engine/scheduled-task-manager';
 import type {
 	IBinaryData,
 	ICredentialDataDecryptedObject,
@@ -19,7 +20,6 @@ import type {
 	NodeTypeAndVersion,
 	VersionedNodeType,
 	Workflow,
-	WorkflowHooks,
 } from 'n8n-workflow';
 
 type MockDeepPartial<T> = Parameters<typeof mock<T>>[0];
@@ -212,7 +212,7 @@ export async function testPollingTriggerNode(
 					return options as IHttpRequestOptions;
 				},
 			}),
-			hooks: mock<WorkflowHooks>(),
+			hooks: mock<ExecutionLifecycleHooks>(),
 		}),
 		mode,
 		'init',
diff --git a/packages/nodes-base/test/setup.ts b/packages/nodes-base/test/setup.ts
index d2c9bc6e64..ff0fa69274 100644
--- a/packages/nodes-base/test/setup.ts
+++ b/packages/nodes-base/test/setup.ts
@@ -1 +1,6 @@
 import 'reflect-metadata';
+
+// Disable task runners until we have fixed the "run test workflows" test
+// to mock the Code Node execution
+process.env.N8N_RUNNERS_ENABLED = 'false';
+process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
diff --git a/packages/nodes-base/test/utils/utilities.test.ts b/packages/nodes-base/test/utils/utilities.test.ts
index 4ffc0835bb..a30552f6f5 100644
--- a/packages/nodes-base/test/utils/utilities.test.ts
+++ b/packages/nodes-base/test/utils/utilities.test.ts
@@ -1,3 +1,5 @@
+import type { INodeExecutionData } from 'n8n-workflow';
+
 import {
 	compareItems,
 	flattenKeys,
@@ -5,6 +7,7 @@ import {
 	getResolvables,
 	keysToLowercase,
 	shuffleArray,
+	sortItemKeysByPriorityList,
 	wrapData,
 } from '@utils/utilities';
 
@@ -252,3 +255,60 @@ describe('compareItems', () => {
 		expect(result).toBe(true);
 	});
 });
+
+describe('sortItemKeysByPriorityList', () => {
+	it('should reorder keys based on priority list', () => {
+		const data: INodeExecutionData[] = [{ json: { c: 3, a: 1, b: 2 } }];
+		const priorityList = ['b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['b', 'a', 'c']);
+	});
+
+	it('should sort keys not in the priority list alphabetically', () => {
+		const data: INodeExecutionData[] = [{ json: { c: 3, a: 1, b: 2, d: 4 } }];
+		const priorityList = ['b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['b', 'a', 'c', 'd']);
+	});
+
+	it('should sort all keys alphabetically when priority list is empty', () => {
+		const data: INodeExecutionData[] = [{ json: { c: 3, a: 1, b: 2 } }];
+		const priorityList: string[] = [];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['a', 'b', 'c']);
+	});
+
+	it('should handle an empty data array', () => {
+		const data: INodeExecutionData[] = [];
+		const priorityList = ['b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		// Expect an empty array since there is no data
+		expect(result).toEqual([]);
+	});
+
+	it('should handle a single object in the data array', () => {
+		const data: INodeExecutionData[] = [{ json: { d: 4, b: 2, a: 1 } }];
+		const priorityList = ['a', 'b', 'c'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['a', 'b', 'd']);
+	});
+
+	it('should handle duplicate keys in the priority list gracefully', () => {
+		const data: INodeExecutionData[] = [{ json: { d: 4, b: 2, a: 1 } }];
+		const priorityList = ['a', 'b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['a', 'b', 'd']);
+	});
+});
diff --git a/packages/nodes-base/utils/sendAndWait/descriptions.ts b/packages/nodes-base/utils/sendAndWait/descriptions.ts
new file mode 100644
index 0000000000..1549a6cc98
--- /dev/null
+++ b/packages/nodes-base/utils/sendAndWait/descriptions.ts
@@ -0,0 +1,22 @@
+import type { IWebhookDescription } from 'n8n-workflow';
+
+export const sendAndWaitWebhooksDescription: IWebhookDescription[] = [
+	{
+		name: 'default',
+		httpMethod: 'GET',
+		responseMode: 'onReceived',
+		responseData: '',
+		path: '={{ $nodeId }}',
+		restartWebhook: true,
+		isFullPath: true,
+	},
+	{
+		name: 'default',
+		httpMethod: 'POST',
+		responseMode: 'onReceived',
+		responseData: '',
+		path: '={{ $nodeId }}',
+		restartWebhook: true,
+		isFullPath: true,
+	},
+];
diff --git a/packages/nodes-base/utils/sendAndWait/test/util.test.ts b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
index 5194887f2f..c04c0fb4cb 100644
--- a/packages/nodes-base/utils/sendAndWait/test/util.test.ts
+++ b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
@@ -1,12 +1,13 @@
 import { type MockProxy, mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INodeProperties, IWebhookFunctions } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { NodeOperationError, WAIT_INDEFINITELY } from 'n8n-workflow';
 
 import {
 	getSendAndWaitProperties,
 	getSendAndWaitConfig,
 	createEmail,
 	sendAndWaitWebhook,
+	configureWaitTillDate,
 } from '../utils';
 
 describe('Send and Wait utils tests', () => {
@@ -240,6 +241,7 @@ describe('Send and Wait utils tests', () => {
 				validForm: true,
 				formTitle: '',
 				formDescription: 'Test message',
+				formDescriptionMetadata: 'Test message',
 				formSubmittedHeader: 'Got it, thanks',
 				formSubmittedText: 'This page can be closed now',
 				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
@@ -318,6 +320,7 @@ describe('Send and Wait utils tests', () => {
 				validForm: true,
 				formTitle: 'Test title',
 				formDescription: 'Test description',
+				formDescriptionMetadata: 'Test description',
 				formSubmittedHeader: 'Got it, thanks',
 				formSubmittedText: 'This page can be closed now',
 				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
@@ -367,3 +370,100 @@ describe('Send and Wait utils tests', () => {
 		});
 	});
 });
+
+describe('configureWaitTillDate', () => {
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return WAIT_INDEFINITELY if limitWaitTime is empty', () => {
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({});
+		const result = configureWaitTillDate(mockExecuteFunctions);
+		expect(result).toBe(WAIT_INDEFINITELY);
+	});
+
+	it('should calculate future date correctly for afterTimeInterval with minutes', () => {
+		const resumeAmount = 5;
+		const resumeUnit = 'minutes';
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+			limitType: 'afterTimeInterval',
+			resumeAmount,
+			resumeUnit,
+		});
+
+		const result = configureWaitTillDate(mockExecuteFunctions);
+		const expectedDate = new Date(new Date().getTime() + 5 * 60 * 1000);
+		expect(result.getTime()).toBeCloseTo(expectedDate.getTime(), -2); // Allowing 100ms difference
+	});
+
+	it('should calculate future date correctly for afterTimeInterval with hours', () => {
+		const resumeAmount = 2;
+		const resumeUnit = 'hours';
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+			limitType: 'afterTimeInterval',
+			resumeAmount,
+			resumeUnit,
+		});
+
+		const result = configureWaitTillDate(mockExecuteFunctions);
+		const expectedDate = new Date(new Date().getTime() + 2 * 60 * 60 * 1000);
+		expect(result.getTime()).toBeCloseTo(expectedDate.getTime(), -2);
+	});
+
+	it('should calculate future date correctly for afterTimeInterval with days', () => {
+		const resumeAmount = 1;
+		const resumeUnit = 'days';
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+			limitType: 'afterTimeInterval',
+			resumeAmount,
+			resumeUnit,
+		});
+
+		const result = configureWaitTillDate(mockExecuteFunctions);
+		const expectedDate = new Date(new Date().getTime() + 1 * 24 * 60 * 60 * 1000);
+		expect(result.getTime()).toBeCloseTo(expectedDate.getTime(), -2);
+	});
+
+	it('should return the specified maxDateAndTime for maxDateAndTime limitType', () => {
+		const maxDateAndTime = '2023-12-31T23:59:59Z';
+		mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+			limitType: 'maxDateAndTime',
+			maxDateAndTime,
+		});
+
+		const result = configureWaitTillDate(mockExecuteFunctions);
+		expect(result).toEqual(new Date(maxDateAndTime));
+	});
+
+	it('should throw NodeOperationError for invalid maxDateAndTime format', () => {
+		const invalidMaxDateAndTime = 'invalid-date';
+		mockExecuteFunctions.getNodeParameter.mockReturnValue({
+			limitType: 'maxDateAndTime',
+			maxDateAndTime: invalidMaxDateAndTime,
+		});
+
+		expect(() => configureWaitTillDate(mockExecuteFunctions)).toThrow(NodeOperationError);
+		expect(() => configureWaitTillDate(mockExecuteFunctions)).toThrow(
+			'Could not configure Limit Wait Time',
+		);
+	});
+
+	it('should throw NodeOperationError for invalid resumeAmount or resumeUnit', () => {
+		mockExecuteFunctions.getNodeParameter.mockReturnValue({
+			limitType: 'afterTimeInterval',
+			resumeAmount: 'invalid',
+			resumeUnit: 'minutes',
+		});
+
+		expect(() => configureWaitTillDate(mockExecuteFunctions)).toThrow(NodeOperationError);
+		expect(() => configureWaitTillDate(mockExecuteFunctions)).toThrow(
+			'Could not configure Limit Wait Time',
+		);
+	});
+});
diff --git a/packages/nodes-base/utils/sendAndWait/utils.ts b/packages/nodes-base/utils/sendAndWait/utils.ts
index 5328c2c8d3..218ca3c216 100644
--- a/packages/nodes-base/utils/sendAndWait/utils.ts
+++ b/packages/nodes-base/utils/sendAndWait/utils.ts
@@ -1,8 +1,10 @@
 import {
+	ApplicationError,
 	NodeOperationError,
 	SEND_AND_WAIT_OPERATION,
 	tryToParseJsonToFormFields,
 	updateDisplayOptions,
+	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 import type {
 	INodeProperties,
@@ -39,11 +41,107 @@ type FormResponseTypeOptions = {
 
 const INPUT_FIELD_IDENTIFIER = 'field-0';
 
+const limitWaitTimeProperties: INodeProperties = {
+	displayName: 'Limit Wait Time',
+	name: 'limitWaitTime',
+	type: 'fixedCollection',
+	description:
+		'Whether the workflow will automatically resume execution after the specified limit type',
+	default: { values: { limitType: 'afterTimeInterval', resumeAmount: 45, resumeUnit: 'minutes' } },
+	options: [
+		{
+			displayName: 'Values',
+			name: 'values',
+			values: [
+				{
+					displayName: 'Limit Type',
+					name: 'limitType',
+					type: 'options',
+					default: 'afterTimeInterval',
+					description:
+						'Sets the condition for the execution to resume. Can be a specified date or after some time.',
+					options: [
+						{
+							name: 'After Time Interval',
+							description: 'Waits for a certain amount of time',
+							value: 'afterTimeInterval',
+						},
+						{
+							name: 'At Specified Time',
+							description: 'Waits until the set date and time to continue',
+							value: 'atSpecifiedTime',
+						},
+					],
+				},
+				{
+					displayName: 'Amount',
+					name: 'resumeAmount',
+					type: 'number',
+					displayOptions: {
+						show: {
+							limitType: ['afterTimeInterval'],
+						},
+					},
+					typeOptions: {
+						minValue: 0,
+						numberPrecision: 2,
+					},
+					default: 1,
+					description: 'The time to wait',
+				},
+				{
+					displayName: 'Unit',
+					name: 'resumeUnit',
+					type: 'options',
+					displayOptions: {
+						show: {
+							limitType: ['afterTimeInterval'],
+						},
+					},
+					options: [
+						{
+							name: 'Minutes',
+							value: 'minutes',
+						},
+						{
+							name: 'Hours',
+							value: 'hours',
+						},
+						{
+							name: 'Days',
+							value: 'days',
+						},
+					],
+					default: 'hours',
+					description: 'Unit of the interval value',
+				},
+				{
+					displayName: 'Max Date and Time',
+					name: 'maxDateAndTime',
+					type: 'dateTime',
+					displayOptions: {
+						show: {
+							limitType: ['atSpecifiedTime'],
+						},
+					},
+					default: '',
+					description: 'Continue execution after the specified date and time',
+				},
+			],
+		},
+	],
+};
+
 // Operation Properties ----------------------------------------------------------
 export function getSendAndWaitProperties(
 	targetProperties: INodeProperties[],
 	resource: string = 'message',
 	additionalProperties: INodeProperties[] = [],
+	options?: {
+		noButtonStyle?: boolean;
+		defaultApproveLabel?: string;
+		defaultDisapproveLabel?: string;
+	},
 ) {
 	const buttonStyle: INodeProperties = {
 		displayName: 'Button Style',
@@ -61,6 +159,77 @@ export function getSendAndWaitProperties(
 			},
 		],
 	};
+	const approvalOptionsValues = [
+		{
+			displayName: 'Type of Approval',
+			name: 'approvalType',
+			type: 'options',
+			placeholder: 'Add option',
+			default: 'single',
+			options: [
+				{
+					name: 'Approve Only',
+					value: 'single',
+				},
+				{
+					name: 'Approve and Disapprove',
+					value: 'double',
+				},
+			],
+		},
+		{
+			displayName: 'Approve Button Label',
+			name: 'approveLabel',
+			type: 'string',
+			default: options?.defaultApproveLabel || 'Approve',
+			displayOptions: {
+				show: {
+					approvalType: ['single', 'double'],
+				},
+			},
+		},
+		...[
+			options?.noButtonStyle
+				? ({} as INodeProperties)
+				: {
+						...buttonStyle,
+						displayName: 'Approve Button Style',
+						name: 'buttonApprovalStyle',
+						displayOptions: {
+							show: {
+								approvalType: ['single', 'double'],
+							},
+						},
+					},
+		],
+		{
+			displayName: 'Disapprove Button Label',
+			name: 'disapproveLabel',
+			type: 'string',
+			default: options?.defaultDisapproveLabel || 'Decline',
+			displayOptions: {
+				show: {
+					approvalType: ['double'],
+				},
+			},
+		},
+		...[
+			options?.noButtonStyle
+				? ({} as INodeProperties)
+				: {
+						...buttonStyle,
+						displayName: 'Disapprove Button Style',
+						name: 'buttonDisapprovalStyle',
+						default: 'secondary',
+						displayOptions: {
+							show: {
+								approvalType: ['double'],
+							},
+						},
+					},
+		],
+	].filter((p) => Object.keys(p).length) as INodeProperties[];
+
 	const sendAndWait: INodeProperties[] = [
 		...targetProperties,
 		{
@@ -104,6 +273,15 @@ export function getSendAndWaitProperties(
 				},
 			],
 		},
+		...updateDisplayOptions(
+			{
+				show: {
+					responseType: ['customForm'],
+				},
+			},
+			formFieldsProperties,
+		),
+
 		{
 			displayName: 'Approval Options',
 			name: 'approvalOptions',
@@ -114,68 +292,7 @@ export function getSendAndWaitProperties(
 				{
 					displayName: 'Values',
 					name: 'values',
-					values: [
-						{
-							displayName: 'Type of Approval',
-							name: 'approvalType',
-							type: 'options',
-							placeholder: 'Add option',
-							default: 'single',
-							options: [
-								{
-									name: 'Approve Only',
-									value: 'single',
-								},
-								{
-									name: 'Approve and Disapprove',
-									value: 'double',
-								},
-							],
-						},
-						{
-							displayName: 'Approve Button Label',
-							name: 'approveLabel',
-							type: 'string',
-							default: 'Approve',
-							displayOptions: {
-								show: {
-									approvalType: ['single', 'double'],
-								},
-							},
-						},
-						{
-							...buttonStyle,
-							displayName: 'Approve Button Style',
-							name: 'buttonApprovalStyle',
-							displayOptions: {
-								show: {
-									approvalType: ['single', 'double'],
-								},
-							},
-						},
-						{
-							displayName: 'Disapprove Button Label',
-							name: 'disapproveLabel',
-							type: 'string',
-							default: 'Decline',
-							displayOptions: {
-								show: {
-									approvalType: ['double'],
-								},
-							},
-						},
-						{
-							...buttonStyle,
-							displayName: 'Disapprove Button Style',
-							name: 'buttonDisapprovalStyle',
-							default: 'secondary',
-							displayOptions: {
-								show: {
-									approvalType: ['double'],
-								},
-							},
-						},
-					],
+					values: approvalOptionsValues,
 				},
 			],
 			displayOptions: {
@@ -184,14 +301,19 @@ export function getSendAndWaitProperties(
 				},
 			},
 		},
-		...updateDisplayOptions(
-			{
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add option',
+			default: {},
+			options: [limitWaitTimeProperties],
+			displayOptions: {
 				show: {
-					responseType: ['customForm'],
+					responseType: ['approval'],
 				},
 			},
-			formFieldsProperties,
-		),
+		},
 		{
 			displayName: 'Options',
 			name: 'options',
@@ -225,6 +347,7 @@ export function getSendAndWaitProperties(
 					type: 'string',
 					default: 'Submit',
 				},
+				limitWaitTimeProperties,
 			],
 			displayOptions: {
 				show: {
@@ -446,7 +569,7 @@ export function getSendAndWaitConfig(context: IExecuteFunctions): SendAndWaitCon
 	return config;
 }
 
-function createButton(url: string, label: string, approved: string, style: string) {
+export function createButton(url: string, label: string, approved: string, style: string) {
 	let buttonStyle = BUTTON_STYLE_PRIMARY;
 	if (style === 'secondary') {
 		buttonStyle = BUTTON_STYLE_SECONDARY;
@@ -482,3 +605,46 @@ export function createEmail(context: IExecuteFunctions) {
 
 	return email;
 }
+
+export function configureWaitTillDate(context: IExecuteFunctions) {
+	let waitTill = WAIT_INDEFINITELY;
+	const limitWaitTime = context.getNodeParameter('options.limitWaitTime.values', 0, {}) as {
+		limitType?: string;
+		resumeAmount?: number;
+		resumeUnit?: string;
+		maxDateAndTime?: string;
+	};
+
+	if (Object.keys(limitWaitTime).length) {
+		try {
+			if (limitWaitTime.limitType === 'afterTimeInterval') {
+				let waitAmount = limitWaitTime.resumeAmount as number;
+
+				if (limitWaitTime.resumeUnit === 'minutes') {
+					waitAmount *= 60;
+				}
+				if (limitWaitTime.resumeUnit === 'hours') {
+					waitAmount *= 60 * 60;
+				}
+				if (limitWaitTime.resumeUnit === 'days') {
+					waitAmount *= 60 * 60 * 24;
+				}
+
+				waitAmount *= 1000;
+				waitTill = new Date(new Date().getTime() + waitAmount);
+			} else {
+				waitTill = new Date(limitWaitTime.maxDateAndTime as string);
+			}
+
+			if (isNaN(waitTill.getTime())) {
+				throw new ApplicationError('Invalid date format');
+			}
+		} catch (error) {
+			throw new NodeOperationError(context.getNode(), 'Could not configure Limit Wait Time', {
+				description: error.message,
+			});
+		}
+	}
+
+	return waitTill;
+}
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index cae18ae90b..0ff2b4212c 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -427,3 +427,43 @@ export function escapeHtml(text: string): string {
 		}
 	});
 }
+
+/**
+ * Sorts each item json's keys by a priority list
+ *
+ * @param {INodeExecutionData[]} data The array of items which keys will be sorted
+ * @param {string[]} priorityList The priority list, keys of item.json will be sorted in this order first then alphabetically
+ */
+export function sortItemKeysByPriorityList(data: INodeExecutionData[], priorityList: string[]) {
+	return data.map((item) => {
+		const itemKeys = Object.keys(item.json);
+
+		const updatedKeysOrder = itemKeys.sort((a, b) => {
+			const indexA = priorityList.indexOf(a);
+			const indexB = priorityList.indexOf(b);
+
+			if (indexA !== -1 && indexB !== -1) {
+				return indexA - indexB;
+			} else if (indexA !== -1) {
+				return -1;
+			} else if (indexB !== -1) {
+				return 1;
+			}
+			return a.localeCompare(b);
+		});
+
+		const updatedItem: IDataObject = {};
+		for (const key of updatedKeysOrder) {
+			updatedItem[key] = item.json[key];
+		}
+
+		item.json = updatedItem;
+		return item;
+	});
+}
+
+export function createUtmCampaignLink(nodeType: string, instanceId?: string) {
+	return `https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=${encodeURIComponent(
+		nodeType,
+	)}${instanceId ? '_' + instanceId : ''}`;
+}
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
index 964dc7b179..006d1bb091 100644
--- a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -9,8 +9,8 @@ import type {
 	IDataObject,
 	ResourceMapperField,
 	ILocalLoadOptionsFunctions,
-	ResourceMapperFields,
 	ISupplyDataFunctions,
+	WorkflowInputsData,
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError, EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 
@@ -65,7 +65,11 @@ function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
 	return generateSchemaFromExample(json) as JSONSchema7;
 }
 
-export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption[] {
+export function getFieldEntries(context: IWorkflowNodeContext): {
+	dataMode: WorkflowInputsData['dataMode'];
+	fields: FieldValueOption[];
+	subworkflowInfo?: WorkflowInputsData['subworkflowInfo'];
+} {
 	const inputSource = context.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH);
 	let result: FieldValueOption[] | string = 'Internal Error: Invalid input source';
 	try {
@@ -89,7 +93,9 @@ export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption
 	}
 
 	if (Array.isArray(result)) {
-		return result;
+		const dataMode = String(inputSource);
+		const workflow = context.getWorkflow();
+		return { fields: result, dataMode, subworkflowInfo: { id: workflow.id } };
 	}
 	throw new NodeOperationError(context.getNode(), result);
 }
@@ -97,7 +103,7 @@ export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption
 export function getWorkflowInputValues(this: ISupplyDataFunctions): INodeExecutionData[] {
 	const inputData = this.getInputData();
 
-	return inputData.map((item, itemIndex) => {
+	return inputData.map(({ json, binary }, itemIndex) => {
 		const itemFieldValues = this.getNodeParameter(
 			'workflowInputs.value',
 			itemIndex,
@@ -106,13 +112,14 @@ export function getWorkflowInputValues(this: ISupplyDataFunctions): INodeExecuti
 
 		return {
 			json: {
-				...item.json,
+				...json,
 				...itemFieldValues,
 			},
 			index: itemIndex,
 			pairedItem: {
 				item: itemIndex,
 			},
+			binary,
 		};
 	});
 }
@@ -139,14 +146,18 @@ export function getCurrentWorkflowInputData(this: ISupplyDataFunctions) {
 
 export async function loadWorkflowInputMappings(
 	this: ILocalLoadOptionsFunctions,
-): Promise<ResourceMapperFields> {
+): Promise<WorkflowInputsData> {
 	const nodeLoadContext = await this.getWorkflowNodeContext(EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE);
 	let fields: ResourceMapperField[] = [];
+	let dataMode: string = PASSTHROUGH;
+	let subworkflowInfo: { id?: string } | undefined;
 
 	if (nodeLoadContext) {
 		const fieldValues = getFieldEntries(nodeLoadContext);
+		dataMode = fieldValues.dataMode;
+		subworkflowInfo = fieldValues.subworkflowInfo;
 
-		fields = fieldValues.map((currentWorkflowInput) => {
+		fields = fieldValues.fields.map((currentWorkflowInput) => {
 			const field: ResourceMapperField = {
 				id: currentWorkflowInput.name,
 				displayName: currentWorkflowInput.name,
@@ -163,5 +174,5 @@ export async function loadWorkflowInputMappings(
 			return field;
 		});
 	}
-	return { fields };
+	return { fields, dataMode, subworkflowInfo };
 }
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/__tests__/GenericFunctions.test.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/__tests__/GenericFunctions.test.ts
new file mode 100644
index 0000000000..31b286ac15
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/__tests__/GenericFunctions.test.ts
@@ -0,0 +1,63 @@
+import { mock } from 'jest-mock-extended';
+import type { ISupplyDataFunctions } from 'n8n-workflow';
+
+import { getWorkflowInputValues } from '../GenericFunctions';
+
+describe('getWorkflowInputValues', () => {
+	const supplyDataFunctions = mock<ISupplyDataFunctions>();
+
+	it('should correctly map the binary property', () => {
+		supplyDataFunctions.getInputData.mockReturnValue([
+			{
+				json: { key1: 'value1' },
+				binary: { file1: { data: 'binaryData1', mimeType: 'image/png' } },
+			},
+			{
+				json: { key2: 'value2' },
+				binary: { file2: { data: 'binaryData2', mimeType: 'image/jpeg' } },
+			},
+		]);
+
+		supplyDataFunctions.getNodeParameter
+			.calledWith('workflowInputs.value', 0)
+			.mockReturnValueOnce({ additionalKey1: 'additionalValue1' });
+		supplyDataFunctions.getNodeParameter
+			.calledWith('workflowInputs.value', 1)
+			.mockReturnValueOnce({ additionalKey2: 'additionalValue2' });
+
+		const result = getWorkflowInputValues.call(supplyDataFunctions);
+
+		expect(result).toEqual([
+			{
+				json: {
+					key1: 'value1',
+					additionalKey1: 'additionalValue1',
+				},
+				binary: { file1: { data: 'binaryData1', mimeType: 'image/png' } },
+				index: 0,
+				pairedItem: { item: 0 },
+			},
+			{
+				json: {
+					key2: 'value2',
+					additionalKey2: 'additionalValue2',
+				},
+				binary: { file2: { data: 'binaryData2', mimeType: 'image/jpeg' } },
+				index: 1,
+				pairedItem: { item: 1 },
+			},
+		]);
+
+		expect(supplyDataFunctions.getInputData).toHaveBeenCalled();
+		expect(supplyDataFunctions.getNodeParameter).toHaveBeenCalledWith(
+			'workflowInputs.value',
+			0,
+			{},
+		);
+		expect(supplyDataFunctions.getNodeParameter).toHaveBeenCalledWith(
+			'workflowInputs.value',
+			1,
+			{},
+		);
+	});
+});
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 567c4d8d4d..50170b5edf 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.73.0",
+  "version": "1.77.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",
@@ -58,6 +58,7 @@
     "recast": "0.21.5",
     "title-case": "3.0.3",
     "transliteration": "2.3.5",
-    "xml2js": "catalog:"
+    "xml2js": "catalog:",
+    "zod": "catalog:"
   }
 }
diff --git a/packages/workflow/src/AugmentObject.ts b/packages/workflow/src/AugmentObject.ts
index 4334071e71..bb060a167d 100644
--- a/packages/workflow/src/AugmentObject.ts
+++ b/packages/workflow/src/AugmentObject.ts
@@ -2,6 +2,9 @@ import type { IDataObject } from './Interfaces';
 
 const defaultPropertyDescriptor = Object.freeze({ enumerable: true, configurable: true });
 
+// eslint-disable-next-line @typescript-eslint/unbound-method
+const { hasOwnProperty } = Object.prototype;
+
 const augmentedObjects = new WeakSet<object>();
 
 function augment<T>(value: T): T {
@@ -33,6 +36,7 @@ export function augmentArray<T>(data: T[]): T[] {
 			return Reflect.deleteProperty(getData(), key);
 		},
 		get(target, key: string, receiver): unknown {
+			if (key === 'constructor') return Array;
 			const value = Reflect.get(newData ?? target, key, receiver) as unknown;
 			const newValue = augment(value);
 			if (newValue !== value) {
@@ -80,11 +84,13 @@ export function augmentObject<T extends object>(data: T): T {
 
 	const proxy = new Proxy(data, {
 		get(target, key: string, receiver): unknown {
+			if (key === 'constructor') return Object;
+
 			if (deletedProperties.has(key)) {
 				return undefined;
 			}
 
-			if (newData[key] !== undefined) {
+			if (hasOwnProperty.call(newData, key)) {
 				return newData[key];
 			}
 
@@ -102,11 +108,11 @@ export function augmentObject<T extends object>(data: T): T {
 
 			return value;
 		},
-		deleteProperty(target, key: string) {
-			if (key in newData) {
+		deleteProperty(_target, key: string) {
+			if (hasOwnProperty.call(newData, key)) {
 				delete newData[key];
 			}
-			if (key in target) {
+			if (hasOwnProperty.call(data, key)) {
 				deletedProperties.add(key);
 			}
 
@@ -131,9 +137,10 @@ export function augmentObject<T extends object>(data: T): T {
 
 			return true;
 		},
-		has(target, key) {
+		has(_target, key) {
 			if (deletedProperties.has(key)) return false;
-			return Reflect.has(newData, key) || Reflect.has(target, key);
+			const target = hasOwnProperty.call(newData, key) ? newData : data;
+			return Reflect.has(target, key);
 		},
 		ownKeys(target) {
 			const originalKeys = Reflect.ownKeys(target);
@@ -145,7 +152,8 @@ export function augmentObject<T extends object>(data: T): T {
 
 		getOwnPropertyDescriptor(_target, key) {
 			if (deletedProperties.has(key)) return undefined;
-			return Object.getOwnPropertyDescriptor(key in newData ? newData : data, key);
+			const target = hasOwnProperty.call(newData, key) ? newData : data;
+			return Object.getOwnPropertyDescriptor(target, key);
 		},
 	});
 
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index 453b9be748..59e3c47d47 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -99,3 +99,5 @@ export const TRIMMED_TASK_DATA_CONNECTIONS_KEY = '__isTrimmedManualExecutionData
 export const OPEN_AI_API_CREDENTIAL_TYPE = 'openAiApi';
 export const FREE_AI_CREDITS_ERROR_TYPE = 'free_ai_credits_request_error';
 export const FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE = 400;
+
+export const FROM_AI_AUTO_GENERATED_MARKER = '/*n8n-auto-generated-fromAI-override*/';
diff --git a/packages/workflow/src/FromAIParseUtils.ts b/packages/workflow/src/FromAIParseUtils.ts
new file mode 100644
index 0000000000..b96c91ec25
--- /dev/null
+++ b/packages/workflow/src/FromAIParseUtils.ts
@@ -0,0 +1,317 @@
+import { z } from 'zod';
+
+import { jsonParse } from './utils';
+
+/**
+ * This file contains the logic for parsing node parameters and extracting $fromAI calls
+ */
+
+export type FromAIArgumentType = 'string' | 'number' | 'boolean' | 'json';
+export type FromAIArgument = {
+	key: string;
+	description?: string;
+	type?: FromAIArgumentType;
+	defaultValue?: string | number | boolean | Record<string, unknown>;
+};
+
+class ParseError extends Error {}
+
+/**
+ * Generates a Zod schema based on the provided FromAIArgument placeholder.
+ * @param placeholder The FromAIArgument object containing key, type, description, and defaultValue.
+ * @returns A Zod schema corresponding to the placeholder's type and constraints.
+ */
+export function generateZodSchema(placeholder: FromAIArgument): z.ZodTypeAny {
+	let schema: z.ZodTypeAny;
+
+	switch (placeholder.type?.toLowerCase()) {
+		case 'string':
+			schema = z.string();
+			break;
+		case 'number':
+			schema = z.number();
+			break;
+		case 'boolean':
+			schema = z.boolean();
+			break;
+		case 'json': {
+			interface CustomSchemaDef extends z.ZodTypeDef {
+				jsonSchema?: {
+					anyOf: [
+						{
+							type: 'object';
+							minProperties: number;
+							additionalProperties: boolean;
+						},
+						{
+							type: 'array';
+							minItems: number;
+						},
+					];
+				};
+			}
+
+			// Create a custom schema to validate that the incoming data is either a non-empty object or a non-empty array.
+			const customSchema = z.custom<Record<string, unknown> | unknown[]>(
+				(data: unknown) => {
+					if (data === null || typeof data !== 'object') return false;
+					if (Array.isArray(data)) {
+						return data.length > 0;
+					}
+					return Object.keys(data).length > 0;
+				},
+				{
+					message: 'Value must be a non-empty object or a non-empty array',
+				},
+			);
+
+			// Cast the custom schema to a type that includes our JSON metadata.
+			const typedSchema = customSchema as z.ZodType<
+				Record<string, unknown> | unknown[],
+				CustomSchemaDef
+			>;
+
+			// Attach the updated `jsonSchema` metadata to the internal definition.
+			typedSchema._def.jsonSchema = {
+				anyOf: [
+					{
+						type: 'object',
+						minProperties: 1,
+						additionalProperties: true,
+					},
+					{
+						type: 'array',
+						minItems: 1,
+					},
+				],
+			};
+
+			schema = typedSchema;
+			break;
+		}
+		default:
+			schema = z.string();
+	}
+
+	if (placeholder.description) {
+		schema = schema.describe(`${schema.description ?? ''} ${placeholder.description}`.trim());
+	}
+
+	if (placeholder.defaultValue !== undefined) {
+		schema = schema.default(placeholder.defaultValue);
+	}
+
+	return schema;
+}
+
+/**
+ * Parses the default value, preserving its original type.
+ * @param value The default value as a string.
+ * @returns The parsed default value in its appropriate type.
+ */
+function parseDefaultValue(
+	value: string | undefined,
+): string | number | boolean | Record<string, unknown> | undefined {
+	if (value === undefined || value === '') return undefined;
+	const lowerValue = value.toLowerCase();
+	if (lowerValue === 'true') return true;
+	if (lowerValue === 'false') return false;
+	if (!isNaN(Number(value))) return Number(value);
+	try {
+		return jsonParse(value);
+	} catch {
+		return value;
+	}
+}
+
+/**
+ * Parses the arguments of a single $fromAI function call.
+ * @param argsString The string containing the function arguments.
+ * @returns A FromAIArgument object.
+ */
+function parseArguments(argsString: string): FromAIArgument {
+	// Split arguments by commas not inside quotes
+	const args: string[] = [];
+	let currentArg = '';
+	let inQuotes = false;
+	let quoteChar = '';
+	let escapeNext = false;
+
+	for (let i = 0; i < argsString.length; i++) {
+		const char = argsString[i];
+
+		if (escapeNext) {
+			currentArg += char;
+			escapeNext = false;
+			continue;
+		}
+
+		if (char === '\\') {
+			escapeNext = true;
+			continue;
+		}
+
+		if (['"', "'", '`'].includes(char)) {
+			if (!inQuotes) {
+				inQuotes = true;
+				quoteChar = char;
+				currentArg += char;
+			} else if (char === quoteChar) {
+				inQuotes = false;
+				quoteChar = '';
+				currentArg += char;
+			} else {
+				currentArg += char;
+			}
+			continue;
+		}
+
+		if (char === ',' && !inQuotes) {
+			args.push(currentArg.trim());
+			currentArg = '';
+			continue;
+		}
+
+		currentArg += char;
+	}
+
+	if (currentArg) {
+		args.push(currentArg.trim());
+	}
+
+	// Remove surrounding quotes if present
+	const cleanArgs = args.map((arg) => {
+		const trimmed = arg.trim();
+		if (
+			(trimmed.startsWith("'") && trimmed.endsWith("'")) ||
+			(trimmed.startsWith('`') && trimmed.endsWith('`')) ||
+			(trimmed.startsWith('"') && trimmed.endsWith('"'))
+		) {
+			return trimmed
+				.slice(1, -1)
+				.replace(/\\'/g, "'")
+				.replace(/\\`/g, '`')
+				.replace(/\\"/g, '"')
+				.replace(/\\\\/g, '\\');
+		}
+		return trimmed;
+	});
+
+	const type = cleanArgs?.[2] || 'string';
+
+	if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
+		throw new ParseError(`Invalid type: ${type}`);
+	}
+
+	return {
+		key: cleanArgs[0] || '',
+		description: cleanArgs[1],
+		type: (cleanArgs?.[2] ?? 'string') as FromAIArgumentType,
+		defaultValue: parseDefaultValue(cleanArgs[3]),
+	};
+}
+
+/**
+ * Extracts all $fromAI calls from a given string
+ * @param str The string to search for $fromAI calls.
+ * @returns An array of FromAIArgument objects.
+ *
+ * This method uses a regular expression to find the start of each $fromAI function call
+ * in the input string. It then employs a character-by-character parsing approach to
+ * accurately extract the arguments of each call, handling nested parentheses and quoted strings.
+ *
+ * The parsing process:
+ * 1. Finds the starting position of a $fromAI call using regex.
+ * 2. Iterates through characters, keeping track of parentheses depth and quote status.
+ * 3. Handles escaped characters within quotes to avoid premature quote closing.
+ * 4. Builds the argument string until the matching closing parenthesis is found.
+ * 5. Parses the extracted argument string into a FromAIArgument object.
+ * 6. Repeats the process for all $fromAI calls in the input string.
+ *
+ */
+export function extractFromAICalls(str: string): FromAIArgument[] {
+	const args: FromAIArgument[] = [];
+	// Regular expression to match the start of a $fromAI function call
+	const pattern = /\$fromAI\s*\(\s*/gi;
+	let match: RegExpExecArray | null;
+
+	while ((match = pattern.exec(str)) !== null) {
+		const startIndex = match.index + match[0].length;
+		let current = startIndex;
+		let inQuotes = false;
+		let quoteChar = '';
+		let parenthesesCount = 1;
+		let argsString = '';
+
+		// Parse the arguments string, handling nested parentheses and quotes
+		while (current < str.length && parenthesesCount > 0) {
+			const char = str[current];
+
+			if (inQuotes) {
+				// Handle characters inside quotes, including escaped characters
+				if (char === '\\' && current + 1 < str.length) {
+					argsString += char + str[current + 1];
+					current += 2;
+					continue;
+				}
+
+				if (char === quoteChar) {
+					inQuotes = false;
+					quoteChar = '';
+				}
+				argsString += char;
+			} else {
+				// Handle characters outside quotes
+				if (['"', "'", '`'].includes(char)) {
+					inQuotes = true;
+					quoteChar = char;
+				} else if (char === '(') {
+					parenthesesCount++;
+				} else if (char === ')') {
+					parenthesesCount--;
+				}
+
+				// Only add characters if we're still inside the main parentheses
+				if (parenthesesCount > 0 || char !== ')') {
+					argsString += char;
+				}
+			}
+
+			current++;
+		}
+
+		// If parentheses are balanced, parse the arguments
+		if (parenthesesCount === 0) {
+			try {
+				const parsedArgs = parseArguments(argsString);
+				args.push(parsedArgs);
+			} catch (error) {
+				// If parsing fails, throw an ParseError with details
+				throw new ParseError(`Failed to parse $fromAI arguments: ${argsString}: ${String(error)}`);
+			}
+		} else {
+			// Log an error if parentheses are unbalanced
+			throw new ParseError(
+				`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
+			);
+		}
+	}
+
+	return args;
+}
+
+/**
+ * Recursively traverses the nodeParameters object to find all $fromAI calls.
+ * @param payload The current object or value being traversed.
+ * @param collectedArgs The array collecting FromAIArgument objects.
+ */
+export function traverseNodeParameters(payload: unknown, collectedArgs: FromAIArgument[]) {
+	if (typeof payload === 'string') {
+		const fromAICalls = extractFromAICalls(payload);
+		fromAICalls.forEach((call) => collectedArgs.push(call));
+	} else if (Array.isArray(payload)) {
+		payload.forEach((item: unknown) => traverseNodeParameters(item, collectedArgs));
+	} else if (typeof payload === 'object' && payload !== null) {
+		Object.values(payload).forEach((value) => traverseNodeParameters(value, collectedArgs));
+	}
+}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 2161569b7d..dbba497357 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -24,7 +24,6 @@ import type { ExecutionStatus } from './ExecutionStatus';
 import type { Result } from './result';
 import type { Workflow } from './Workflow';
 import type { EnvProviderState } from './WorkflowDataProxyEnvProvider';
-import type { WorkflowHooks } from './WorkflowHooks';
 
 export interface IAdditionalCredentialOptions {
 	oauth2?: IOAuth2Options;
@@ -398,26 +397,6 @@ export interface INodeTypeNameVersion {
 	version: number;
 }
 
-export interface IGetExecutePollFunctions {
-	(
-		workflow: Workflow,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): IPollFunctions;
-}
-
-export interface IGetExecuteTriggerFunctions {
-	(
-		workflow: Workflow,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): ITriggerFunctions;
-}
-
 export interface IRunNodeResponse {
 	data: INodeExecutionData[][] | NodeExecutionOutput | null | undefined;
 	closeFunction?: CloseFunction;
@@ -759,7 +738,7 @@ export interface DeduplicationHelperFunctions {
 		options: ICheckProcessedOptions,
 	): Promise<number>;
 }
-export interface NodeHelperFunctions {
+interface NodeHelperFunctions {
 	copyBinaryFile(filePath: string, fileName: string, mimeType?: string): Promise<IBinaryData>;
 }
 
@@ -852,6 +831,7 @@ export type NodeTypeAndVersion = {
 	type: string;
 	typeVersion: number;
 	disabled: boolean;
+	parameters?: INodeParameters;
 };
 
 export interface FunctionsBase {
@@ -869,7 +849,10 @@ export interface FunctionsBase {
 	getRestApiUrl(): string;
 	getInstanceBaseUrl(): string;
 	getInstanceId(): string;
-	getChildNodes(nodeName: string): NodeTypeAndVersion[];
+	getChildNodes(
+		nodeName: string,
+		options?: { includeNodeParameters?: boolean },
+	): NodeTypeAndVersion[];
 	getParentNodes(nodeName: string): NodeTypeAndVersion[];
 	getKnownNodeTypes(): IDataObject;
 	getMode?: () => WorkflowExecuteMode;
@@ -1026,7 +1009,7 @@ export interface ILoadOptionsFunctions extends FunctionsBase {
 export type FieldValueOption = { name: string; type: FieldType | 'any' };
 
 export type IWorkflowNodeContext = ExecuteFunctions.GetNodeParameterFn &
-	Pick<FunctionsBase, 'getNode'>;
+	Pick<FunctionsBase, 'getNode' | 'getWorkflow'>;
 
 export interface ILocalLoadOptionsFunctions {
 	getWorkflowNodeContext(nodeType: string): Promise<IWorkflowNodeContext | null>;
@@ -1192,11 +1175,6 @@ export interface INodeExecutionData {
 	index?: number;
 }
 
-export interface INodeExecuteFunctions {
-	getExecutePollFunctions: IGetExecutePollFunctions;
-	getExecuteTriggerFunctions: IGetExecuteTriggerFunctions;
-}
-
 export type NodeParameterValue = string | number | boolean | undefined | null;
 
 export type ResourceLocatorModes = 'id' | 'url' | 'list' | string;
@@ -2258,17 +2236,6 @@ export interface IWorkflowCredentials {
 	};
 }
 
-export interface IWorkflowExecuteHooks {
-	[key: string]: Array<(...args: any[]) => Promise<void>> | undefined;
-	nodeExecuteAfter?: Array<
-		(nodeName: string, data: ITaskData, executionData: IRunExecutionData) => Promise<void>
-	>;
-	nodeExecuteBefore?: Array<(nodeName: string) => Promise<void>>;
-	workflowExecuteAfter?: Array<(data: IRun, newStaticData: IDataObject) => Promise<void>>;
-	workflowExecuteBefore?: Array<(workflow?: Workflow, data?: IRunExecutionData) => Promise<void>>;
-	sendResponse?: Array<(response: IExecuteResponsePromiseData) => Promise<void>>;
-}
-
 export interface IWorkflowExecutionDataProcess {
 	destinationNode?: string;
 	restartExecutionId?: string;
@@ -2280,7 +2247,7 @@ export interface IWorkflowExecutionDataProcess {
 	executionData?: IRunExecutionData;
 	runData?: IRunData;
 	pinData?: IPinData;
-	retryOf?: string;
+	retryOf?: string | null;
 	pushRef?: string;
 	startNodes?: StartNodeData[];
 	workflowData: IWorkflowBase;
@@ -2289,12 +2256,10 @@ export interface IWorkflowExecutionDataProcess {
 	/**
 	 * Defines which version of the partial execution flow is used.
 	 * Possible values are:
-	 *  0 - use the old flow
-	 *  1 - use the new flow
-	 * -1 - the backend chooses which flow based on the environment variable
-	 *      PARTIAL_EXECUTION_VERSION_DEFAULT
+	 *  1 - use the old flow
+	 *  2 - use the new flow
 	 */
-	partialExecutionVersion?: string;
+	partialExecutionVersion?: 1 | 2;
 	dirtyNodeNames?: string[];
 	triggerToStartFrom?: {
 		name: string;
@@ -2348,7 +2313,6 @@ export interface IWorkflowExecuteAdditionalData {
 	) => Promise<ExecuteWorkflowData>;
 	executionId?: string;
 	restartExecutionId?: string;
-	hooks?: WorkflowHooks;
 	httpResponse?: express.Response;
 	httpRequest?: express.Request;
 	restApiUrl: string;
@@ -2405,11 +2369,6 @@ export type WorkflowActivateMode =
 	| 'manual' // unused
 	| 'leadershipChange';
 
-export interface IWorkflowHooksOptionalParameters {
-	retryOf?: string;
-	pushRef?: string;
-}
-
 export namespace WorkflowSettings {
 	export type CallerPolicy = 'any' | 'none' | 'workflowsFromAList' | 'workflowsFromSameOwner';
 	export type SaveDataExecution = 'DEFAULT' | 'all' | 'none';
@@ -2656,6 +2615,13 @@ export interface IExecutionSummaryNodeExecutionResult {
 
 export interface ResourceMapperFields {
 	fields: ResourceMapperField[];
+	emptyFieldsNotice?: string;
+}
+
+export interface WorkflowInputsData {
+	fields: ResourceMapperField[];
+	dataMode: string;
+	subworkflowInfo?: { id?: string };
 }
 
 export interface ResourceMapperField {
@@ -2673,6 +2639,7 @@ export interface ResourceMapperField {
 
 export type FormFieldsParameter = Array<{
 	fieldLabel: string;
+	elementName?: string;
 	fieldType?: string;
 	requiredField?: boolean;
 	fieldOptions?: { values: Array<{ option: string }> };
@@ -2680,7 +2647,10 @@ export type FormFieldsParameter = Array<{
 	multipleFiles?: boolean;
 	acceptFileTypes?: string;
 	formatDate?: string;
+	html?: string;
 	placeholder?: string;
+	fieldName?: string;
+	fieldValue?: string;
 }>;
 
 export type FieldTypeMap = {
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 22883a73bb..bbeeca87c0 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1404,7 +1404,7 @@ function addToIssuesIfMissing(
 	if (
 		(nodeProperties.type === 'string' && (value === '' || value === undefined)) ||
 		(nodeProperties.type === 'multiOptions' && Array.isArray(value) && value.length === 0) ||
-		(nodeProperties.type === 'dateTime' && value === undefined) ||
+		(nodeProperties.type === 'dateTime' && (value === '' || value === undefined)) ||
 		(nodeProperties.type === 'options' && (value === '' || value === undefined)) ||
 		((nodeProperties.type === 'resourceLocator' || nodeProperties.type === 'workflowSelector') &&
 			!isValidResourceLocatorParameterValue(value as INodeParameterResourceLocator))
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 51d56ef154..cbe9a0bb54 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -6,6 +6,7 @@ import {
 	EXECUTE_WORKFLOW_NODE_TYPE,
 	FREE_AI_CREDITS_ERROR_TYPE,
 	FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE,
+	FROM_AI_AUTO_GENERATED_MARKER,
 	HTTP_REQUEST_NODE_TYPE,
 	HTTP_REQUEST_TOOL_LANGCHAIN_NODE_TYPE,
 	LANGCHAIN_CUSTOM_TOOLS,
@@ -525,3 +526,60 @@ export const userInInstanceRanOutOfFreeAiCredits = (runData: IRun): boolean => {
 
 	return false;
 };
+
+export type FromAICount = {
+	aiNodeCount: number;
+	aiToolCount: number;
+	fromAIOverrideCount: number;
+	fromAIExpressionCount: number;
+};
+
+export function resolveAIMetrics(nodes: INode[], nodeTypes: INodeTypes): FromAICount | {} {
+	const resolvedNodes = nodes
+		.map((x) => [x, nodeTypes.getByNameAndVersion(x.type, x.typeVersion)] as const)
+		.filter((x) => !!x[1]?.description);
+
+	const aiNodeCount = resolvedNodes.reduce(
+		(acc, x) => acc + Number(x[1].description.codex?.categories?.includes('AI')),
+		0,
+	);
+
+	if (aiNodeCount === 0) return {};
+
+	let fromAIOverrideCount = 0;
+	let fromAIExpressionCount = 0;
+
+	const tools = resolvedNodes.filter((node) =>
+		node[1].description.codex?.subcategories?.AI?.includes('Tools'),
+	);
+
+	for (const [node, _] of tools) {
+		// FlatMap to support values in resourceLocators
+		const values = Object.values(node.parameters).flatMap((param) => {
+			if (param && typeof param === 'object' && 'value' in param) param = param.value;
+			return typeof param === 'string' ? param : [];
+		});
+
+		// Note that we don't match the i in `fromAI` to support lower case i (though we miss fromai)
+		const overrides = values.reduce(
+			(acc, value) => acc + Number(value.startsWith(`={{ ${FROM_AI_AUTO_GENERATED_MARKER} $fromA`)),
+			0,
+		);
+
+		fromAIOverrideCount += overrides;
+		// check for = to avoid scanning lengthy text fields
+		// this will re-count overrides
+		fromAIExpressionCount +=
+			values.reduce(
+				(acc, value) => acc + Number(value[0] === '=' && value.includes('$fromA', 2)),
+				0,
+			) - overrides;
+	}
+
+	return {
+		aiNodeCount,
+		aiToolCount: tools.length,
+		fromAIOverrideCount,
+		fromAIExpressionCount,
+	};
+}
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index ef314cee18..600821e44c 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -164,8 +164,9 @@ export class WorkflowDataProxy {
 	 *
 	 * @private
 	 * @param {string} nodeName The name of the node to query data from
+	 * @param {boolean} [resolveValue=true] If the expression value should get resolved
 	 */
-	private nodeParameterGetter(nodeName: string) {
+	private nodeParameterGetter(nodeName: string, resolveValue = true) {
 		const that = this;
 		const node = this.workflow.nodes[nodeName];
 
@@ -223,7 +224,7 @@ export class WorkflowDataProxy {
 					}
 				}
 
-				if (typeof returnValue === 'string' && returnValue.charAt(0) === '=') {
+				if (resolveValue && typeof returnValue === 'string' && returnValue.charAt(0) === '=') {
 					// The found value is an expression so resolve it
 					return that.workflow.expression.getParameterValue(
 						returnValue,
@@ -703,17 +704,19 @@ export class WorkflowDataProxy {
 			});
 		};
 
-		const createMissingPairedItemError = (nodeCause: string) => {
-			return createExpressionError("Can't get data for expression", {
-				messageTemplate: 'Info for expression missing from previous node',
+		const createMissingPairedItemError = (
+			nodeCause: string,
+			usedMethodName: 'itemMatching' | 'pairedItem' | 'item' | '$getPairedItem' = 'pairedItem',
+		) => {
+			const message = `Using the ${usedMethodName} method doesn't work with pinned data in this scenario. Please unpin '${nodeCause}' and try again.`;
+			return new ExpressionError(message, {
+				runIndex: that.runIndex,
+				itemIndex: that.itemIndex,
 				functionality: 'pairedItem',
-				functionOverrides: {
-					message: "Can't get data",
-				},
-				nodeCause,
 				descriptionKey: isScriptingNode(nodeCause, that.workflow)
 					? 'pairedItemNoInfoCodeNode'
 					: 'pairedItemNoInfo',
+				nodeCause,
 				causeDetailed: `Missing pairedItem data (node '${nodeCause}' probably didn't supply it)`,
 				type: 'paired_item_no_info',
 			});
@@ -737,6 +740,7 @@ export class WorkflowDataProxy {
 			destinationNodeName: string,
 			incomingSourceData: ISourceData | null,
 			pairedItem: IPairedItemData,
+			usedMethodName: 'pairedItem' | 'itemMatching' | 'item' | '$getPairedItem' = '$getPairedItem',
 		): INodeExecutionData | null => {
 			let taskData: ITaskData | undefined;
 
@@ -790,7 +794,7 @@ export class WorkflowDataProxy {
 				const itemPreviousNode: INodeExecutionData = previousNodeOutputData[pairedItem.item];
 
 				if (itemPreviousNode.pairedItem === undefined) {
-					throw createMissingPairedItemError(sourceData.previousNode);
+					throw createMissingPairedItemError(sourceData.previousNode, usedMethodName);
 				}
 
 				if (Array.isArray(itemPreviousNode.pairedItem)) {
@@ -806,7 +810,7 @@ export class WorkflowDataProxy {
 									throw new ApplicationError('Not found');
 								}
 
-								return getPairedItem(destinationNodeName, source[itemInput], item);
+								return getPairedItem(destinationNodeName, source[itemInput], item, usedMethodName);
 							} catch (error) {
 								// Means pairedItem could not be found
 								return null;
@@ -858,6 +862,7 @@ export class WorkflowDataProxy {
 						// A trigger node got reached, so looks like that that item can not be resolved
 						throw createNoConnectionError(destinationNodeName);
 					}
+
 					throw createExpressionError('Can’t get data for expression', {
 						messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
 						functionality: 'pairedItem',
@@ -1039,7 +1044,7 @@ export class WorkflowDataProxy {
 								);
 							}
 
-							if (['pairedItem', 'itemMatching', 'item'].includes(property as string)) {
+							if (property === 'pairedItem' || property === 'itemMatching' || property === 'item') {
 								// Before resolving the pairedItem make sure that the requested node comes in the
 								// graph before the current one
 								const activeNode = that.workflow.getNode(that.activeNodeName);
@@ -1101,7 +1106,7 @@ export class WorkflowDataProxy {
 									const pairedItem = input.pairedItem as IPairedItemData;
 
 									if (pairedItem === undefined) {
-										throw createMissingPairedItemError(that.activeNodeName);
+										throw createMissingPairedItemError(that.activeNodeName, property);
 									}
 
 									if (!that.executeData?.source) {
@@ -1122,7 +1127,7 @@ export class WorkflowDataProxy {
 										that.executeData.source.main[pairedItem.input || 0] ??
 										that.executeData.source.main[0];
 
-									return getPairedItem(nodeName, sourceData, pairedItem);
+									return getPairedItem(nodeName, sourceData, pairedItem, property);
 								};
 
 								if (property === 'item') {
@@ -1355,6 +1360,7 @@ export class WorkflowDataProxy {
 			$node: this.nodeGetter(),
 			$self: this.selfGetter(),
 			$parameter: this.nodeParameterGetter(this.activeNodeName),
+			$rawParameter: this.nodeParameterGetter(this.activeNodeName, false),
 			$prevNode: this.prevNodeGetter(),
 			$runIndex: this.runIndex,
 			$mode: this.mode,
diff --git a/packages/workflow/src/WorkflowHooks.ts b/packages/workflow/src/WorkflowHooks.ts
deleted file mode 100644
index feb7a46e20..0000000000
--- a/packages/workflow/src/WorkflowHooks.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import type {
-	IWorkflowBase,
-	IWorkflowExecuteHooks,
-	IWorkflowHooksOptionalParameters,
-	WorkflowExecuteMode,
-} from './Interfaces';
-
-export class WorkflowHooks {
-	mode: WorkflowExecuteMode;
-
-	workflowData: IWorkflowBase;
-
-	executionId: string;
-
-	pushRef?: string;
-
-	retryOf?: string;
-
-	hookFunctions: IWorkflowExecuteHooks;
-
-	constructor(
-		hookFunctions: IWorkflowExecuteHooks,
-		mode: WorkflowExecuteMode,
-		executionId: string,
-		workflowData: IWorkflowBase,
-		optionalParameters?: IWorkflowHooksOptionalParameters,
-	) {
-		// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-		optionalParameters = optionalParameters || {};
-
-		this.hookFunctions = hookFunctions;
-		this.mode = mode;
-		this.executionId = executionId;
-		this.workflowData = workflowData;
-		this.pushRef = optionalParameters.pushRef;
-		// retryOf might be `null` from TypeORM
-		this.retryOf = optionalParameters.retryOf ?? undefined;
-	}
-
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	async executeHookFunctions(hookName: string, parameters: any[]) {
-		const hooks = this.hookFunctions[hookName];
-		if (hooks !== undefined && Array.isArray(hooks)) {
-			for (const hookFunction of hooks) {
-				await hookFunction.apply(this, parameters);
-			}
-		}
-	}
-}
diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
index ce038ab054..9203a7ecda 100644
--- a/packages/workflow/src/errors/node-operation.error.ts
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -19,7 +19,7 @@ export class NodeOperationError extends NodeError {
 		}
 
 		if (typeof error === 'string') {
-			error = new ApplicationError(error);
+			error = new ApplicationError(error, { level: options.level ?? 'warning' });
 		}
 
 		super(node, error);
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 992a27921f..111bc16a32 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -13,11 +13,11 @@ export * from './Interfaces';
 export * from './MessageEventBus';
 export * from './ExecutionStatus';
 export * from './Expression';
+export * from './FromAIParseUtils';
 export * from './NodeHelpers';
 export * from './Workflow';
 export * from './WorkflowDataProxy';
 export * from './WorkflowDataProxyEnvProvider';
-export * from './WorkflowHooks';
 export * from './VersionedNodeType';
 export * from './TypeValidation';
 export * from './result';
diff --git a/packages/workflow/test/AugmentObject.test.ts b/packages/workflow/test/AugmentObject.test.ts
index 457567b993..831f08e020 100644
--- a/packages/workflow/test/AugmentObject.test.ts
+++ b/packages/workflow/test/AugmentObject.test.ts
@@ -10,6 +10,8 @@ describe('AugmentObject', () => {
 
 			const augmentedObject = augmentArray(originalObject);
 
+			expect(augmentedObject.constructor.name).toEqual('Array');
+
 			expect(augmentedObject.push(5)).toEqual(6);
 			expect(augmentedObject).toEqual([1, 2, 3, 4, null, 5]);
 			expect(originalObject).toEqual(copyOriginal);
@@ -207,6 +209,8 @@ describe('AugmentObject', () => {
 
 			const augmentedObject = augmentObject(originalObject);
 
+			expect(augmentedObject.constructor.name).toEqual('Object');
+
 			augmentedObject[1] = 911;
 			expect(originalObject[1]).toEqual(11);
 			expect(augmentedObject[1]).toEqual(911);
@@ -572,5 +576,46 @@ describe('AugmentObject', () => {
 			expect('z' in augmentedObject.x).toBe(true);
 			expect('y' in augmentedObject.x).toBe(true);
 		});
+
+		test('should ignore non-enumerable keys', () => {
+			const originalObject: { toString?: string } = { toString: '123' };
+			const augmentedObject = augmentObject(originalObject);
+			expect('toString' in augmentedObject).toBe(true);
+			expect(Object.keys(augmentedObject)).toEqual(['toString']);
+			expect(Object.getOwnPropertyDescriptor(augmentedObject, 'toString')?.value).toEqual(
+				originalObject.toString,
+			);
+			expect(augmentedObject.toString).toEqual(originalObject.toString);
+
+			augmentedObject.toString = '456';
+			expect(augmentedObject.toString).toBe('456');
+
+			delete augmentedObject.toString;
+			expect(augmentedObject.toString).toBeUndefined();
+		});
+
+		test('should handle constructor property correctly', () => {
+			const originalObject: any = {
+				a: {
+					b: {
+						c: {
+							d: '4',
+						},
+					},
+				},
+			};
+			const augmentedObject = augmentObject(originalObject);
+
+			expect(augmentedObject.constructor.name).toEqual('Object');
+			expect(augmentedObject.a.constructor.name).toEqual('Object');
+			expect(augmentedObject.a.b.constructor.name).toEqual('Object');
+			expect(augmentedObject.a.b.c.constructor.name).toEqual('Object');
+
+			augmentedObject.constructor = {};
+			expect(augmentedObject.constructor.name).toEqual('Object');
+
+			delete augmentedObject.constructor;
+			expect(augmentedObject.constructor.name).toEqual('Object');
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
index d85ec4a257..bec75c3f6a 100644
--- a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
@@ -2,8 +2,9 @@
  * @jest-environment jsdom
  */
 
+import { arrayExtensions } from '@/Extensions/ArrayExtensions';
+
 import { evaluate } from './Helpers';
-import { arrayExtensions } from '../../src/Extensions/ArrayExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Array Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
index 842158a5b3..8aeb57fb20 100644
--- a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
@@ -2,8 +2,9 @@
  * @jest-environment jsdom
  */
 
+import { booleanExtensions } from '@/Extensions/BooleanExtensions';
+
 import { evaluate } from './Helpers';
-import { booleanExtensions } from '../../src/Extensions/BooleanExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Boolean Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index 09a5761d65..3ac22f96ec 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -4,10 +4,10 @@
 
 import { DateTime } from 'luxon';
 
+import { dateExtensions } from '@/Extensions/DateExtensions';
 import { getGlobalState } from '@/GlobalState';
 
 import { evaluate, getLocalISOString } from './Helpers';
-import { dateExtensions } from '../../src/Extensions/DateExtensions';
 
 const { defaultTimezone } = getGlobalState();
 
@@ -20,41 +20,43 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 23).isWeekend() }}')).toBe(false);
 		});
 
-		test('.beginningOf("week") should work correctly on a date', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 20).beginningOf("week") }}')).toEqual(
-				DateTime.local(2023, 1, 16, { zone: defaultTimezone }),
-			);
+		describe('.beginningOf', () => {
+			test('.beginningOf("week") should work correctly on a date', () => {
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).beginningOf("week") }}')).toEqual(
+					DateTime.local(2023, 1, 16, { zone: defaultTimezone }),
+				);
 
-			expect(evaluate('={{ new Date(2023, 0, 20).beginningOf("week") }}')).toEqual(
-				DateTime.local(2023, 1, 16, { zone: defaultTimezone }).toJSDate(),
-			);
-		});
+				expect(evaluate('={{ new Date(2023, 0, 20).beginningOf("week") }}')).toEqual(
+					DateTime.local(2023, 1, 16, { zone: defaultTimezone }).toJSDate(),
+				);
+			});
 
-		test('.beginningOf("week") should work correctly on a string', () => {
-			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("week") }}');
-			const expectedDate = DateTime.local(2023, 1, 23, { zone: defaultTimezone }).toJSDate();
+			test('.beginningOf("week") should work correctly on a string', () => {
+				const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("week") }}');
+				const expectedDate = DateTime.local(2023, 1, 23, { zone: defaultTimezone }).toJSDate();
 
-			if (evaluatedDate && evaluatedDate instanceof Date) {
-				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
-			}
-		});
+				if (evaluatedDate && evaluatedDate instanceof Date) {
+					expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+				}
+			});
 
-		test('.beginningOf("month") should work correctly on a string', () => {
-			const evaluatedDate = evaluate('={{ "2023-06-16".toDate().beginningOf("month") }}');
-			const expectedDate = DateTime.local(2023, 6, 1, { zone: defaultTimezone }).toJSDate();
+			test('.beginningOf("month") should work correctly on a string', () => {
+				const evaluatedDate = evaluate('={{ "2023-06-16".toDate().beginningOf("month") }}');
+				const expectedDate = DateTime.local(2023, 6, 1, { zone: defaultTimezone }).toJSDate();
 
-			if (evaluatedDate && evaluatedDate instanceof Date) {
-				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
-			}
-		});
+				if (evaluatedDate && evaluatedDate instanceof Date) {
+					expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+				}
+			});
 
-		test('.beginningOf("year") should work correctly on a string', () => {
-			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("year") }}');
-			const expectedDate = DateTime.local(2023, 1, 1, { zone: defaultTimezone }).toJSDate();
+			test('.beginningOf("year") should work correctly on a string', () => {
+				const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("year") }}');
+				const expectedDate = DateTime.local(2023, 1, 1, { zone: defaultTimezone }).toJSDate();
 
-			if (evaluatedDate && evaluatedDate instanceof Date) {
-				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
-			}
+				if (evaluatedDate && evaluatedDate instanceof Date) {
+					expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+				}
+			});
 		});
 
 		test('.endOfMonth() should work correctly on a date', () => {
@@ -66,18 +68,75 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
-		test('.extract("day") should work correctly on a date', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("day") }}')).toEqual(20);
+		describe('.extract', () => {
+			test('.extract("day") should work correctly on a date', () => {
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("day") }}')).toEqual(20);
+			});
+
+			test('should extract year from a date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49").extract("year") }}')).toEqual(2024);
+			});
+
+			test('should extract yearDayNumber from a date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49").extract("yearDayNumber") }}')).toEqual(
+					90,
+				);
+			});
+
+			test('should extract month from a date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49").extract("month") }}')).toEqual(3);
+			});
+
+			test('should extract week from a date', () => {
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).extract() }}')).toEqual(3);
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("week") }}')).toEqual(3);
+			});
+
+			test('should extract day from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("day") }}')).toEqual(30);
+			});
+
+			test('should extract hour from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("hour") }}')).toEqual(18);
+			});
+
+			test('should extract minute from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("minute") }}')).toEqual(
+					49,
+				);
+			});
+
+			test('should extract second from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("second") }}')).toEqual(
+					0,
+				);
+			});
+
+			test('should extract millisecond from a date', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49:00.123Z").extract("millisecond") }}'),
+				).toEqual(123);
+			});
+
+			test('should return undefined for invalid unit', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("invalid") }}')).toBe(
+					null,
+				);
+			});
 		});
 
-		test('.extract() should extract week for no args', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract() }}')).toEqual(3);
-		});
+		describe('.format', () => {
+			test('should format date with custom format', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49").format("yyyy LLL dd") }}'),
+				).toEqual('2024 Mar 30');
+			});
 
-		test('.format("yyyy LLL dd") should work correctly on a date', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 16).format("yyyy LLL dd") }}')).toEqual(
-				'2023 Jan 16',
-			);
+			test('should format date with ISO format', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49").format("yyyy-MM-dd\'T\'HH:mm:ss") }}'),
+				).toEqual('2024-03-30T18:49:00');
+			});
 		});
 
 		test('.toDate() should work on a string', () => {
@@ -85,49 +144,103 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate(`={{ "${getLocalISOString(date)}".toDate() }}`)).toEqual(date);
 		});
 
-		test('.inBetween() should work on string and Date', () => {
-			expect(evaluate("={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}")).toBeDefined();
+		describe('.inBetween', () => {
+			test('should work on string and Date', () => {
+				expect(
+					evaluate("={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}"),
+				).toBeDefined();
+			});
+
+			test('should work on string and DateTime', () => {
+				expect(evaluate("={{ $now.isBetween($now, '2023-06-23') }}")).toBeDefined();
+			});
+
+			test('should not work for invalid strings', () => {
+				expect(evaluate("={{ $now.isBetween($now, 'invalid') }}")).toBeUndefined();
+			});
+
+			test('should not work for numbers', () => {
+				expect(evaluate('={{ $now.isBetween($now, 1) }}')).toBeUndefined();
+			});
+
+			test('should not work for a single argument', () => {
+				expect(() => evaluate('={{ $now.isBetween($now) }}')).toThrow();
+			});
+
+			test('should not work for a more than two arguments', () => {
+				expect(() =>
+					evaluate("={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}"),
+				).toThrow();
+			});
 		});
 
-		test('.inBetween() should work on string and DateTime', () => {
-			expect(evaluate("={{ $now.isBetween($now, '2023-06-23') }}")).toBeDefined();
+		describe('.diffTo', () => {
+			test('should work with a single unit', () => {
+				expect(
+					evaluate(
+						"={{ '2025-01-01'.toDateTime().diffTo('2024-03-30T18:49:07.234', 'days').floor() }}",
+					),
+				).toEqual(276);
+			});
+
+			test('should work with an array of units', () => {
+				expect(
+					evaluate(
+						"={{ '2025-01-01T00:00:00.000'.toDateTime().diffTo('2024-03-30T18:49:07.234', ['months', 'days']) }}",
+					),
+				).toEqual({ months: 9, days: 1.2158884953703704 });
+			});
+
+			test('should return difference in days', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-25T18:49:00Z", "days") }}',
+					),
+				).toEqual(5);
+			});
+
+			test('should return difference in hours', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T12:49:00Z", "hours") }}',
+					),
+				).toEqual(6);
+			});
+
+			test('should return difference in minutes', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T18:44:00Z", "minutes") }}',
+					),
+				).toEqual(5);
+			});
+
+			test('should return difference in seconds', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T18:48:55Z", "seconds") }}',
+					),
+				).toEqual(5);
+			});
+
+			test('should return difference in milliseconds', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00.500Z").diffTo("2024-03-30T18:49:00.000Z", "milliseconds") }}',
+					),
+				).toEqual(500);
+			});
+
+			test('should throw for invalid unit', () => {
+				expect(() =>
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T18:49:00Z", "invalid") }}',
+					),
+				).toThrow('Unsupported unit');
+			});
 		});
 
-		test('.inBetween() should not work for invalid strings', () => {
-			expect(evaluate("={{ $now.isBetween($now, 'invalid') }}")).toBeUndefined();
-		});
-
-		test('.inBetween() should not work for numbers', () => {
-			expect(evaluate('={{ $now.isBetween($now, 1) }}')).toBeUndefined();
-		});
-
-		test('.inBetween() should not work for a single argument', () => {
-			expect(() => evaluate('={{ $now.isBetween($now) }}')).toThrow();
-		});
-
-		test('.inBetween() should not work for a more than two arguments', () => {
-			expect(() =>
-				evaluate("={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}"),
-			).toThrow();
-		});
-
-		test('.diffTo() should work with a single unit', () => {
-			expect(
-				evaluate(
-					"={{ '2025-01-01'.toDateTime().diffTo('2024-03-30T18:49:07.234', 'days').floor() }}",
-				),
-			).toEqual(276);
-		});
-
-		test('.diffTo() should work with an array of units', () => {
-			expect(
-				evaluate(
-					"={{ '2025-01-01T00:00:00.000'.toDateTime().diffTo('2024-03-30T18:49:07.234', ['months', 'days']) }}",
-				),
-			).toEqual({ months: 9, days: 1.2158884953703704 });
-		});
-
-		describe('toDateTime', () => {
+		describe('.toDateTime', () => {
 			test('should return itself for DateTime', () => {
 				const result = evaluate(
 					"={{ DateTime.fromFormat('01-01-2024', 'dd-MM-yyyy').toDateTime() }}",
@@ -149,7 +262,7 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
-		describe('toInt/toFloat', () => {
+		describe('.toInt/.toFloat', () => {
 			test('should return milliseconds for DateTime', () => {
 				expect(evaluate("={{ DateTime.fromISO('2024-01-01T00:00:00.000Z').toInt() }}")).toEqual(
 					1704067200000,
@@ -168,7 +281,7 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
-		describe('toBoolean', () => {
+		describe('.toBoolean', () => {
 			test('should return undefined', () => {
 				expect(evaluate('={{ new Date("2024-01-01T00:00:00.000Z").toBoolean() }}')).toBeUndefined();
 			});
@@ -177,5 +290,93 @@ describe('Data Transformation Functions', () => {
 				expect(dateExtensions.functions.toBoolean.doc).toBeUndefined();
 			});
 		});
+
+		describe('.isInLast', () => {
+			it('should return true if the date is within the last n minutes', () => {
+				expect(
+					evaluate(
+						`={{ new Date("${DateTime.now().minus({ minutes: 5 }).toISO()}").isInLast(10, "minutes") }}`,
+					),
+				).toBe(true);
+			});
+
+			it('should return false if the date is not within the last n minutes', () => {
+				expect(
+					evaluate(
+						`={{ new Date("${DateTime.now().minus({ minutes: 15 }).toISO()}").isInLast(10, "minutes") }}`,
+					),
+				).toBe(false);
+			});
+
+			it('should handle default unit as minutes', () => {
+				expect(
+					evaluate(
+						`={{ new Date("${DateTime.now().minus({ minutes: 5 }).toISO()}").isInLast(10) }}`,
+					),
+				).toBe(true);
+			});
+		});
+
+		describe('.minus', () => {
+			it('should subtract days from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").minus(7, "days") }}')).toEqual(
+					new Date('2024-03-23T18:49:00.000Z'),
+				);
+			});
+
+			it('should subtract years from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").minus(4, "years") }}')).toEqual(
+					new Date('2020-03-30T18:49:00.000Z'),
+				);
+			});
+
+			it('should handle default unit as milliseconds', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").minus(1000) }}')).toEqual(
+					new Date('2024-03-30T18:48:59.000Z'),
+				);
+			});
+
+			it('should handle DateTime instances', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49:00Z").minus(1, "day").toJSDate() }}'),
+				).toEqual(new Date('2024-03-29T18:49:00.000Z'));
+			});
+		});
+
+		describe('.plus', () => {
+			it('should subtract days from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").plus(7, "days") }}')).toEqual(
+					new Date('2024-04-06T18:49:00.000Z'),
+				);
+			});
+
+			it('should subtract years from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").plus(4, "years") }}')).toEqual(
+					new Date('2028-03-30T18:49:00.000Z'),
+				);
+			});
+
+			it('should handle default unit as milliseconds', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").plus(1000) }}')).toEqual(
+					new Date('2024-03-30T18:49:01.000Z'),
+				);
+			});
+
+			it('should handle DateTime instances', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49:00Z").plus(1, "day").toJSDate() }}'),
+				).toEqual(new Date('2024-03-31T18:49:00.000Z'));
+			});
+		});
+
+		describe('.isDst', () => {
+			test('should return true for a date in DST', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-06-30T18:49:00Z").isDst() }}')).toBe(true);
+			});
+
+			test('should return false for a date not in DST', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-01-30T18:49:00Z").isDst() }}')).toBe(false);
+			});
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index e08f4f05c4..fc107484cb 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -4,11 +4,11 @@
 
 /* eslint-disable n8n-local-rules/no-interpolation-in-regular-string */
 
+import { ExpressionExtensionError } from '@/errors/expression-extension.error';
 import { extendTransform, extend } from '@/Extensions';
 import { joinExpression, splitExpression } from '@/Extensions/ExpressionParser';
 
 import { evaluate } from './Helpers';
-import { ExpressionExtensionError } from '../../src/errors/expression-extension.error';
 
 describe('Expression Extension Transforms', () => {
 	describe('extend() transform', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
index 1107ceae54..120e5aa9d7 100644
--- a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
@@ -1,16 +1,31 @@
+import { objectExtensions } from '@/Extensions/ObjectExtensions';
+
 import { evaluate } from './Helpers';
-import { objectExtensions } from '../../src/Extensions/ObjectExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Object Data Transformation Functions', () => {
-		test('.isEmpty() should work correctly on an object', () => {
-			expect(evaluate('={{({}).isEmpty()}}')).toEqual(true);
-			expect(evaluate('={{({ test1: 1 }).isEmpty()}}')).toEqual(false);
+		describe('.isEmpty', () => {
+			test('should return true for an empty object', () => {
+				expect(evaluate('={{ ({}).isEmpty() }}')).toBe(true);
+			});
+
+			test('should return false for a non-empty object', () => {
+				expect(evaluate('={{ ({ test: 1 }).isEmpty() }}')).toBe(false);
+			});
+
+			test('should return true for an object with only null/undefined values', () => {
+				expect(evaluate('={{ ({ test1: null, test2: undefined }).isEmpty() }}')).toBe(false);
+			});
 		});
 
-		test('.hasField should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1 }).hasField("test1") }}')).toEqual(true);
-			expect(evaluate('={{ ({ test1: 1 }).hasField("test2") }}')).toEqual(false);
+		describe('.hasField', () => {
+			test('should return true if the key exists in the object', () => {
+				expect(evaluate('={{ ({ test1: 1 }).hasField("test1") }}')).toBe(true);
+			});
+
+			test('should return false if the key does not exist in the object', () => {
+				expect(evaluate('={{ ({ test1: 1 }).hasField("test2") }}')).toBe(false);
+			});
 		});
 
 		test('.removeField should work on an object', () => {
@@ -27,68 +42,119 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
-		test('.removeFieldsContaining should work on an object', () => {
-			expect(
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("removed") }}',
-				),
-			).toEqual({
-				test1: 'i exist',
+		describe('.removeFieldsContaining', () => {
+			test('should work on an object', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("removed") }}',
+					),
+				).toEqual({
+					test1: 'i exist',
+				});
+			});
+
+			test('should not work for empty string', () => {
+				expect(() =>
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("") }}',
+					),
+				).toThrow();
 			});
 		});
 
-		test('.removeFieldsContaining should not work for empty string', () => {
-			expect(() =>
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("") }}',
-				),
-			).toThrow();
-		});
+		describe('.keepFieldsContaining', () => {
+			test('.keepFieldsContaining should work on an object', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("exist") }}',
+					),
+				).toEqual({
+					test1: 'i exist',
+				});
+			});
 
-		test('.keepFieldsContaining should work on an object', () => {
-			expect(
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("exist") }}',
-				),
-			).toEqual({
-				test1: 'i exist',
+			test('.keepFieldsContaining should work on a nested object', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: { test4: "me too" } }).keepFieldsContaining("exist") }}',
+					),
+				).toEqual({
+					test1: 'i exist',
+				});
+			});
+
+			test('.keepFieldsContaining should not work for empty string', () => {
+				expect(() =>
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("") }}',
+					),
+				).toThrow();
 			});
 		});
 
-		test('.keepFieldsContaining should work on a nested object', () => {
-			expect(
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: { test4: "me too" } }).keepFieldsContaining("exist") }}',
-				),
-			).toEqual({
-				test1: 'i exist',
+		describe('.compact', () => {
+			test('should work on an object', () => {
+				expect(
+					evaluate('={{ ({ test1: 1, test2: "2", test3: undefined, test4: null }).compact() }}'),
+				).toEqual({ test1: 1, test2: '2' });
 			});
-		});
 
-		test('.keepFieldsContaining should not work for empty string', () => {
-			expect(() =>
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("") }}',
-				),
-			).toThrow();
-		});
+			test('should remove fields with null, undefined, empty string, or "nil"', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: 0, test2: false, test3: "", test4: "nil", test5: NaN }).compact() }}',
+					),
+				).toEqual({ test1: 0, test2: false, test5: NaN });
+			});
 
-		test('.compact should work on an object', () => {
-			expect(
-				evaluate('={{ ({ test1: 1, test2: "2", test3: undefined, test4: null }).compact() }}'),
-			).toEqual({ test1: 1, test2: '2' });
+			test('should work on an empty object', () => {
+				expect(evaluate('={{ ({}).compact() }}')).toEqual({});
+			});
+
+			test('should work on an object with all null/undefined values', () => {
+				expect(evaluate('={{ ({ test1: undefined, test2: null }).compact() }}')).toEqual({});
+			});
+
+			test('should work on an object with nested null/undefined values', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: 1, test2: { nested1: null, nested2: "value" }, test3: undefined }).compact() }}',
+					),
+				).toEqual({ test1: 1, test2: { nested2: 'value' } });
+			});
+
+			test('should not allow prototype pollution', () => {
+				['{__proto__: {polluted: true}}', '{constructor: {prototype: {polluted: true}}}'].forEach(
+					(testExpression) => {
+						expect(evaluate(`={{ (${testExpression}).compact() }}`)).toEqual(null);
+						expect(({} as any).polluted).toBeUndefined();
+					},
+				);
+			});
 		});
 
 		test('.urlEncode should work on an object', () => {
 			expect(evaluate('={{ ({ test1: 1, test2: "2" }).urlEncode() }}')).toEqual('test1=1&test2=2');
 		});
 
-		test('.keys should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1, test2: "2" }).keys() }}')).toEqual(['test1', 'test2']);
+		describe('.keys', () => {
+			test('should return an array of keys from the object', () => {
+				expect(evaluate('={{ ({ test1: 1, test2: 2 }).keys() }}')).toEqual(['test1', 'test2']);
+			});
+
+			test('should return an empty array for an empty object', () => {
+				expect(evaluate('={{ ({}).keys() }}')).toEqual([]);
+			});
 		});
 
-		test('.values should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1, test2: "2" }).values() }}')).toEqual([1, '2']);
+		describe('.values', () => {
+			test('should return an array of values from the object', () => {
+				expect(evaluate('={{ ({ test1: 1, test2: "value" }).values() }}')).toEqual([1, 'value']);
+			});
+
+			test('should return an empty array for an empty object', () => {
+				expect(evaluate('={{ ({}).values() }}')).toEqual([]);
+			});
 		});
 
 		test('.toJsonString() should work on an object', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
index 35b2318868..8986e5ad0e 100644
--- a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
@@ -3,21 +3,39 @@
  */
 import { DateTime } from 'luxon';
 
+import { ExpressionExtensionError } from '@/errors';
+
 import { evaluate } from './Helpers';
-import { ExpressionExtensionError } from '../../src/errors';
 
 describe('Data Transformation Functions', () => {
 	describe('String Data Transformation Functions', () => {
-		test('.isEmpty() should work correctly on a string that is not empty', () => {
-			expect(evaluate('={{"NotBlank".isEmpty()}}')).toEqual(false);
+		describe('.isEmpty', () => {
+			test('should work correctly on a string that is not empty', () => {
+				expect(evaluate('={{"NotBlank".isEmpty()}}')).toEqual(false);
+			});
+
+			test('should work correctly on a string that is empty', () => {
+				expect(evaluate('={{"".isEmpty()}}')).toEqual(true);
+			});
 		});
 
-		test('.isEmpty() should work correctly on a string that is empty', () => {
-			expect(evaluate('={{"".isEmpty()}}')).toEqual(true);
+		describe('.isNotEmpty', () => {
+			test('should work correctly on a string that is not empty', () => {
+				expect(evaluate('={{"NotBlank".isNotEmpty()}}')).toEqual(true);
+			});
+
+			test('should work correctly on a string that is empty', () => {
+				expect(evaluate('={{"".isNotEmpty()}}')).toEqual(false);
+			});
+		});
+
+		test('.length should return the string length', () => {
+			expect(evaluate('={{"String".length()}}')).toEqual(6);
 		});
 
 		describe('.hash()', () => {
 			test.each([
+				['base64', 'MTIzNDU='],
 				['md5', '827ccb0eea8a706c4c34a16891f84e7b'],
 				['sha1', '8cb2237d0679ca88db6464eac60da96345513964'],
 				['sha224', 'a7470858e79c282bc2f6adfd831b132672dfd1224c1e78cbf5bcd057'],
@@ -38,6 +56,10 @@ describe('Data Transformation Functions', () => {
 				expect(evaluate(`={{ "12345".hash("${hashFn}") }}`)).toEqual(hashValue);
 				expect(evaluate(`={{ "12345".hash("${hashFn.toLowerCase()}") }}`)).toEqual(hashValue);
 			});
+
+			test('should throw on invalid algorithm', () => {
+				expect(() => evaluate('={{ "12345".hash("invalid") }}')).toThrow('Unknown algorithm');
+			});
 		});
 
 		test('.urlDecode should work correctly on a string', () => {
@@ -64,10 +86,18 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ "TEST".toLowerCase() }}')).toEqual('test');
 		});
 
-		test('.toDate should work correctly on a date string', () => {
-			expect(evaluate('={{ "2022-09-01T19:42:28.164Z".toDate() }}')).toEqual(
-				new Date('2022-09-01T19:42:28.164Z'),
-			);
+		describe('.toDate', () => {
+			test('should work correctly on a date string', () => {
+				expect(evaluate('={{ "2022-09-01T19:42:28.164Z".toDate() }}')).toEqual(
+					new Date('2022-09-01T19:42:28.164Z'),
+				);
+			});
+
+			test('should throw on invalid date', () => {
+				expect(() => evaluate('={{ "2022-09-32T19:42:28.164Z".toDate() }}')).toThrow(
+					'cannot convert to date',
+				);
+			});
 		});
 
 		test('.toFloat should work correctly on a string', () => {
diff --git a/packages/workflow/test/FromAIParseUtils.test.ts b/packages/workflow/test/FromAIParseUtils.test.ts
new file mode 100644
index 0000000000..7f55ebf746
--- /dev/null
+++ b/packages/workflow/test/FromAIParseUtils.test.ts
@@ -0,0 +1,146 @@
+import {
+	extractFromAICalls,
+	traverseNodeParameters,
+	type FromAIArgument,
+	generateZodSchema,
+} from '@/FromAIParseUtils';
+
+// Note that for historic reasons a lot of testing of this file happens indirectly in `packages/core/test/CreateNodeAsTool.test.ts`
+
+describe('extractFromAICalls', () => {
+	test.each<[string, [unknown, unknown, unknown, unknown]]>([
+		['$fromAI("a", "b", "string")', ['a', 'b', 'string', undefined]],
+		['$fromAI("a", "b", "number", 5)', ['a', 'b', 'number', 5]],
+		['$fromAI("a", "`", "number", 5)', ['a', '`', 'number', 5]],
+		['$fromAI("a", "\\`", "number", 5)', ['a', '`', 'number', 5]], // this is a bit surprising, but intended
+		['$fromAI("a", "\\n", "number", 5)', ['a', 'n', 'number', 5]], // this is a bit surprising, but intended
+		['{{ $fromAI("a", "b", "boolean") }}', ['a', 'b', 'boolean', undefined]],
+	])('should parse args as expected for %s', (formula, [key, description, type, defaultValue]) => {
+		expect(extractFromAICalls(formula)).toEqual([
+			{
+				key,
+				description,
+				type,
+				defaultValue,
+			},
+		]);
+	});
+
+	test.each([
+		['$fromAI("a", "b", "c")'],
+		['$fromAI("a", "b", "string"'],
+		['$fromAI("a", "b", "string, "d")'],
+	])('should throw as expected for %s', (formula) => {
+		expect(() => extractFromAICalls(formula)).toThrowError();
+	});
+
+	it('supports multiple calls', () => {
+		const code = '$fromAI("a", "b", "number"); $fromAI("c", "d", "string")';
+
+		expect(extractFromAICalls(code)).toEqual([
+			{
+				key: 'a',
+				description: 'b',
+				type: 'number',
+				defaultValue: undefined,
+			},
+			{
+				key: 'c',
+				description: 'd',
+				type: 'string',
+				defaultValue: undefined,
+			},
+		]);
+	});
+
+	it('supports no calls', () => {
+		const code = 'fromAI("a", "b", "number")';
+
+		expect(extractFromAICalls(code)).toEqual([]);
+	});
+});
+
+describe('traverseNodeParameters', () => {
+	test.each<[string | string[] | Record<string, string>, [unknown, unknown, unknown, unknown]]>([
+		['$fromAI("a", "b", "string")', ['a', 'b', 'string', undefined]],
+		['$fromAI("a", "b", "number", 5)', ['a', 'b', 'number', 5]],
+		['{{ $fromAI("a", "b", "boolean") }}', ['a', 'b', 'boolean', undefined]],
+		[{ a: '{{ $fromAI("a", "b", "boolean") }}', b: 'five' }, ['a', 'b', 'boolean', undefined]],
+		[
+			['red', '{{ $fromAI("a", "b", "boolean") }}'],
+			['a', 'b', 'boolean', undefined],
+		],
+	])(
+		'should parse args as expected for %s',
+		(parameters, [key, description, type, defaultValue]) => {
+			const out: FromAIArgument[] = [];
+			traverseNodeParameters(parameters, out);
+			expect(out).toEqual([
+				{
+					key,
+					description,
+					type,
+					defaultValue,
+				},
+			]);
+		},
+	);
+});
+
+describe('JSON Type Parsing via generateZodSchema', () => {
+	it('should correctly parse a JSON parameter without default', () => {
+		// Use an actual $fromAI call string via extractFromAICalls:
+		const [arg] = extractFromAICalls(
+			'$fromAI("jsonWithoutDefault", "JSON parameter without default", "json")',
+		);
+		const schema = generateZodSchema(arg);
+
+		// Valid non-empty JSON objects should pass.
+		expect(() => schema.parse({ key: 'value' })).not.toThrow();
+		expect(schema.parse({ key: 'value' })).toEqual({ key: 'value' });
+
+		// Parsing an empty object should throw a validation error.
+		expect(() => schema.parse({})).toThrowError(
+			/Value must be a non-empty object or a non-empty array/,
+		);
+	});
+
+	it('should correctly parse a JSON parameter with a valid default', () => {
+		const [arg] = extractFromAICalls(
+			'$fromAI("jsonWithValidDefault", "JSON parameter with valid default", "json", "{"key": "defaultValue"}")',
+		);
+		const schema = generateZodSchema(arg);
+
+		// The default value is now stored as a parsed object.
+		expect(schema._def.defaultValue()).toEqual({ key: 'defaultValue' });
+	});
+
+	it('should parse a JSON parameter with an empty default', () => {
+		const [arg] = extractFromAICalls(
+			'$fromAI("jsonEmptyDefault", "JSON parameter with empty default", "json", "{}")',
+		);
+		const schema = generateZodSchema(arg);
+
+		// The default value is stored as an empty object.
+		expect(schema._def.defaultValue()).toEqual({});
+
+		// Parsing an empty object should throw a validation error.
+		expect(() => schema.parse({})).toThrowError(
+			/Value must be a non-empty object or a non-empty array/,
+		);
+	});
+
+	it('should use provided JSON value over the default value', () => {
+		const [arg] = extractFromAICalls(
+			'$fromAI("jsonParamCustom", "JSON parameter with custom default", "json", "{"initial": "value"}")',
+		);
+		const schema = generateZodSchema(arg);
+
+		// Check that the stored default value parses to the expected object.
+		expect(schema._def.defaultValue()).toEqual({ initial: 'value' });
+
+		// When a new valid value is provided, the schema should use it.
+		const newValue = { newKey: 'newValue' };
+		expect(schema.parse(newValue)).toEqual(newValue);
+	});
+});
diff --git a/packages/workflow/test/NodeErrors.test.ts b/packages/workflow/test/NodeErrors.test.ts
index 04aafb1610..e7e4def835 100644
--- a/packages/workflow/test/NodeErrors.test.ts
+++ b/packages/workflow/test/NodeErrors.test.ts
@@ -1,9 +1,8 @@
+import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '@/Constants';
 import { NodeOperationError } from '@/errors';
 import { NodeApiError } from '@/errors/node-api.error';
 import type { INode, JsonObject } from '@/Interfaces';
 
-import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '../src/Constants';
-
 const node: INode = {
 	id: '1',
 	name: 'Postgres node',
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 8b3d9b3b02..964dedc6a9 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -4195,4 +4195,57 @@ describe('NodeHelpers', () => {
 			});
 		}
 	});
+
+	describe('getParameterIssues, required parameters validation', () => {
+		const testNode: INode = {
+			id: '12345',
+			name: 'Test Node',
+			typeVersion: 1,
+			type: 'n8n-nodes-base.testNode',
+			position: [1, 1],
+			parameters: {},
+		};
+
+		it('Should validate required dateTime parameters if empty string', () => {
+			const nodeProperties: INodeProperties = {
+				displayName: 'Date Time',
+				name: 'testDateTime',
+				type: 'dateTime',
+				default: '',
+				required: true,
+			};
+			const nodeValues: INodeParameters = {
+				testDateTime: '',
+			};
+
+			const result = getParameterIssues(nodeProperties, nodeValues, '', testNode);
+
+			expect(result).toEqual({
+				parameters: {
+					testDateTime: ['Parameter "Date Time" is required.'],
+				},
+			});
+		});
+
+		it('Should validate required dateTime parameters if empty undefined', () => {
+			const nodeProperties: INodeProperties = {
+				displayName: 'Date Time',
+				name: 'testDateTime',
+				type: 'dateTime',
+				default: '',
+				required: true,
+			};
+			const nodeValues: INodeParameters = {
+				testDateTime: undefined,
+			};
+
+			const result = getParameterIssues(nodeProperties, nodeValues, '', testNode);
+
+			expect(result).toEqual({
+				parameters: {
+					testDateTime: ['Parameter "Date Time" is required.'],
+				},
+			});
+		});
+	});
 });
diff --git a/packages/workflow/test/NodeTypes.ts b/packages/workflow/test/NodeTypes.ts
index 9cd5c548f2..ba1a6ee766 100644
--- a/packages/workflow/test/NodeTypes.ts
+++ b/packages/workflow/test/NodeTypes.ts
@@ -604,12 +604,237 @@ const manualTriggerNode: LoadedClass<INodeType> = {
 	},
 };
 
+const executeWorkflowNode: LoadedClass<INodeType> = {
+	type: {
+		description: {
+			name: 'n8n-nodes-base.executeWorkflow',
+			displayName: 'Execute Sub-workflow',
+			icon: 'fa:sign-in-alt',
+			iconColor: 'orange-red',
+			group: ['transform'],
+			version: [1, 1.1, 1.2],
+			subtitle: '={{"Workflow: " + $parameter["workflowId"]}}',
+			description: 'Execute another workflow',
+			defaults: { name: 'Execute Workflow', color: '#ff6d5a' },
+			inputs: [],
+			outputs: [],
+			properties: [
+				{
+					displayName: 'Operation',
+					name: 'operation',
+					type: 'hidden',
+					noDataExpression: true,
+					default: 'call_workflow',
+					options: [{ name: 'Execute a Sub-Workflow', value: 'call_workflow' }],
+				},
+				{
+					displayName:
+						'This node is out of date. Please upgrade by removing it and adding a new one',
+					name: 'outdatedVersionWarning',
+					type: 'notice',
+					displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+					default: '',
+				},
+				{
+					displayName: 'Source',
+					name: 'source',
+					type: 'options',
+					options: [
+						{
+							name: 'Database',
+							value: 'database',
+							description: 'Load the workflow from the database by ID',
+						},
+						{
+							name: 'Local File',
+							value: 'localFile',
+							description: 'Load the workflow from a locally saved file',
+						},
+						{
+							name: 'Parameter',
+							value: 'parameter',
+							description: 'Load the workflow from a parameter',
+						},
+						{ name: 'URL', value: 'url', description: 'Load the workflow from an URL' },
+					],
+					default: 'database',
+					description: 'Where to get the workflow to execute from',
+					displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+				},
+				{
+					displayName: 'Source',
+					name: 'source',
+					type: 'options',
+					options: [
+						{
+							name: 'Database',
+							value: 'database',
+							description: 'Load the workflow from the database by ID',
+						},
+						{
+							name: 'Define Below',
+							value: 'parameter',
+							description: 'Pass the JSON code of a workflow',
+						},
+					],
+					default: 'database',
+					description: 'Where to get the workflow to execute from',
+					displayOptions: { show: { '@version': [{ _cnd: { gte: 1.2 } }] } },
+				},
+				{
+					displayName: 'Workflow ID',
+					name: 'workflowId',
+					type: 'string',
+					displayOptions: { show: { source: ['database'], '@version': [1] } },
+					default: '',
+					required: true,
+					hint: 'Can be found in the URL of the workflow',
+					description:
+						"Note on using an expression here: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+				},
+				{
+					displayName: 'Workflow',
+					name: 'workflowId',
+					type: 'workflowSelector',
+					displayOptions: { show: { source: ['database'], '@version': [{ _cnd: { gte: 1.1 } }] } },
+					default: '',
+					required: true,
+				},
+				{
+					displayName: 'Workflow Path',
+					name: 'workflowPath',
+					type: 'string',
+					displayOptions: { show: { source: ['localFile'] } },
+					default: '',
+					placeholder: '/data/workflow.json',
+					required: true,
+					description: 'The path to local JSON workflow file to execute',
+				},
+				{
+					displayName: 'Workflow JSON',
+					name: 'workflowJson',
+					type: 'json',
+					typeOptions: { rows: 10 },
+					displayOptions: { show: { source: ['parameter'] } },
+					default: '\n\n\n',
+					required: true,
+					description: 'The workflow JSON code to execute',
+				},
+				{
+					displayName: 'Workflow URL',
+					name: 'workflowUrl',
+					type: 'string',
+					displayOptions: { show: { source: ['url'] } },
+					default: '',
+					placeholder: 'https://example.com/workflow.json',
+					required: true,
+					description: 'The URL from which to load the workflow from',
+				},
+				{
+					displayName:
+						'Any data you pass into this node will be output by the Execute Workflow Trigger. <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/" target="_blank">More info</a>',
+					name: 'executeWorkflowNotice',
+					type: 'notice',
+					default: '',
+					displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+				},
+				{
+					displayName: 'Workflow Inputs',
+					name: 'workflowInputs',
+					type: 'resourceMapper',
+					noDataExpression: true,
+					default: { mappingMode: 'defineBelow', value: null },
+					required: true,
+					typeOptions: {
+						loadOptionsDependsOn: ['workflowId.value'],
+						resourceMapper: {
+							localResourceMapperMethod: 'loadSubWorkflowInputs',
+							valuesLabel: 'Workflow Inputs',
+							mode: 'map',
+							fieldWords: { singular: 'input', plural: 'inputs' },
+							addAllFields: true,
+							multiKeyMatch: false,
+							supportAutoMap: false,
+							showTypeConversionOptions: true,
+						},
+					},
+					displayOptions: {
+						show: { source: ['database'], '@version': [{ _cnd: { gte: 1.2 } }] },
+						hide: { workflowId: [''] },
+					},
+				},
+				{
+					displayName: 'Mode',
+					name: 'mode',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Run once with all items',
+							value: 'once',
+							description: 'Pass all items into a single execution of the sub-workflow',
+						},
+						{
+							name: 'Run once for each item',
+							value: 'each',
+							description: 'Call the sub-workflow individually for each item',
+						},
+					],
+					default: 'once',
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					default: {},
+					placeholder: 'Add option',
+					options: [
+						{
+							displayName: 'Wait For Sub-Workflow Completion',
+							name: 'waitForSubWorkflow',
+							type: 'boolean',
+							default: true,
+							description:
+								'Whether the main workflow should wait for the sub-workflow to complete its execution before proceeding',
+						},
+					],
+				},
+			],
+			hints: [
+				{
+					type: 'info',
+					message:
+						"Note on using an expression for workflow ID: if this node is set to run once with all items, they will all be sent to the <em>same</em> workflow. That workflow's ID will be calculated by evaluating the expression for the <strong>first input item</strong>.",
+					displayCondition:
+						'={{ $rawParameter.workflowId.startsWith("=") && $nodeVersion >= 1.2 }}',
+					whenToDisplay: 'always',
+					location: 'outputPane',
+				},
+			],
+			codex: {
+				categories: ['Core Nodes'],
+				subcategories: { 'Core Nodes': ['Helpers', 'Flow'] },
+				alias: ['n8n', 'call', 'sub', 'workflow', 'sub-workflow', 'subworkflow'],
+				resources: {
+					primaryDocumentation: [
+						{
+							url: 'https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.executeworkflow/',
+						},
+					],
+				},
+			},
+		},
+	},
+	sourcePath: '',
+};
+
 export class NodeTypes implements INodeTypes {
 	nodeTypes: INodeTypeData = {
 		'n8n-nodes-base.stickyNote': stickyNode,
 		'n8n-nodes-base.set': setNode,
 		'test.googleSheets': googleSheetsNode,
 		'test.set': setNode,
+		'n8n-nodes-base.executeWorkflow': executeWorkflowNode,
 		'test.setMulti': {
 			sourcePath: '',
 			type: {
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index 4cb923bb9d..f7cd8c6190 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -3,7 +3,7 @@ import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
 
 import { STICKY_NODE_TYPE } from '@/Constants';
 import { ApplicationError, ExpressionError, NodeApiError } from '@/errors';
-import type { IRun, IRunData } from '@/Interfaces';
+import type { INode, INodeTypeDescription, IRun, IRunData } from '@/Interfaces';
 import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
 import * as nodeHelpers from '@/NodeHelpers';
 import {
@@ -12,11 +12,13 @@ import {
 	generateNodesGraph,
 	getDomainBase,
 	getDomainPath,
+	resolveAIMetrics,
 	userInInstanceRanOutOfFreeAiCredits,
 } from '@/TelemetryHelpers';
 import { randomInt } from '@/utils';
 
 import { nodeTypes } from './ExpressionExtensions/Helpers';
+import type { NodeTypes } from './NodeTypes';
 
 describe('getDomainBase should return protocol plus domain', () => {
 	test('in valid URLs', () => {
@@ -1541,3 +1543,109 @@ function generateTestWorkflowAndRunData(): { workflow: Partial<IWorkflowBase>; r
 
 	return { workflow, runData };
 }
+
+describe('makeAIMetrics', () => {
+	const makeNode = (parameters: object, type: string) =>
+		({
+			parameters,
+			type,
+			typeVersion: 2.1,
+			id: '7cb0b373-715c-4a89-8bbb-3f238907bc86',
+			name: 'a name',
+			position: [0, 0],
+		}) as INode;
+
+	it('should count applicable nodes and parameters', async () => {
+		const nodes = [
+			makeNode(
+				{
+					sendTo: "={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('To', ``, 'string') }}",
+					sendTwo: "={{ /*n8n-auto-generated-fromAI-override*/ $fromAI('To', ``, 'string') }}",
+					subject: "={{ $fromAI('Subject', ``, 'string') }}",
+				},
+				'n8n-nodes-base.gmailTool',
+			),
+			makeNode(
+				{
+					subject: "={{ $fromAI('Subject', ``, 'string') }}",
+					verb: "={{ $fromAI('Verb', ``, 'string') }}",
+				},
+				'n8n-nodes-base.gmailTool',
+			),
+			makeNode(
+				{
+					subject: "'A Subject'",
+				},
+				'n8n-nodes-base.gmailTool',
+			),
+		];
+
+		const nodeTypes = mock<NodeTypes>({
+			getByNameAndVersion: () => ({
+				description: {
+					codex: {
+						categories: ['AI'],
+						subcategories: { AI: ['Tools'] },
+					},
+				} as unknown as INodeTypeDescription,
+			}),
+		});
+
+		const result = resolveAIMetrics(nodes, nodeTypes);
+		expect(result).toMatchObject({
+			aiNodeCount: 3,
+			aiToolCount: 3,
+			fromAIOverrideCount: 2,
+			fromAIExpressionCount: 3,
+		});
+	});
+
+	it('should not count non-applicable nodes and parameters', async () => {
+		const nodes = [
+			makeNode(
+				{
+					sendTo: 'someone',
+				},
+				'n8n-nodes-base.gmail',
+			),
+		];
+
+		const nodeTypes = mock<NodeTypes>({
+			getByNameAndVersion: () => ({
+				description: {} as unknown as INodeTypeDescription,
+			}),
+		});
+
+		const result = resolveAIMetrics(nodes, nodeTypes);
+		expect(result).toMatchObject({});
+	});
+
+	it('should count ai nodes without tools', async () => {
+		const nodes = [
+			makeNode(
+				{
+					sendTo: 'someone',
+				},
+				'n8n-nodes-base.gmailTool',
+			),
+		];
+
+		const nodeTypes = mock<NodeTypes>({
+			getByNameAndVersion: () => ({
+				description: {
+					codex: {
+						categories: ['AI'],
+					},
+				} as unknown as INodeTypeDescription,
+			}),
+		});
+
+		const result = resolveAIMetrics(nodes, nodeTypes);
+		expect(result).toMatchObject({
+			aiNodeCount: 1,
+			aiToolCount: 0,
+			fromAIOverrideCount: 0,
+			fromAIExpressionCount: 0,
+		});
+	});
+});
diff --git a/packages/workflow/test/WorkflowDataProxy.test.ts b/packages/workflow/test/WorkflowDataProxy.test.ts
index 8c41b0571c..943d765280 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -1,3 +1,4 @@
+import { ensureError } from '@/errors/ensure-error';
 import { ExpressionError } from '@/errors/expression.error';
 import {
 	NodeConnectionType,
@@ -334,7 +335,9 @@ describe('WorkflowDataProxy', () => {
 			} catch (error) {
 				expect(error).toBeInstanceOf(ExpressionError);
 				const exprError = error as ExpressionError;
-				expect(exprError.message).toEqual("Can't get data for expression");
+				expect(exprError.message).toEqual(
+					"Using the item method doesn't work with pinned data in this scenario. Please unpin 'Break pairedItem chain' and try again.",
+				);
 				expect(exprError.context.type).toEqual('paired_item_no_info');
 				done();
 			}
@@ -412,6 +415,66 @@ describe('WorkflowDataProxy', () => {
 		});
 	});
 
+	describe('Pinned data with paired items', () => {
+		const fixture = loadFixture('pindata_paireditem');
+		const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'Set', 'manual', {
+			runIndex: 0,
+			throwOnMissingExecutionData: false,
+		});
+
+		test.each([{ methodName: 'itemMatching' }, { methodName: 'pairedItem' }])(
+			'$methodName should throw when it cannot find a paired item',
+			async ({ methodName }) => {
+				try {
+					proxy.$('DebugHelper')[methodName](0);
+					fail('should throw');
+				} catch (e) {
+					const error = ensureError(e);
+					expect(error.message).toEqual(
+						`Using the ${methodName} method doesn't work with pinned data in this scenario. Please unpin 'Edit Fields' and try again.`,
+					);
+
+					expect(error).toMatchObject({
+						functionality: 'pairedItem',
+						context: {
+							runIndex: 0,
+							itemIndex: 0,
+							type: 'paired_item_no_info',
+							descriptionKey: 'pairedItemNoInfo',
+							nodeCause: 'Edit Fields',
+							causeDetailed:
+								"Missing pairedItem data (node 'Edit Fields' probably didn't supply it)",
+						},
+					});
+				}
+			},
+		);
+
+		test('item should throw when it cannot find a paired item', async () => {
+			try {
+				proxy.$('DebugHelper').item;
+				fail('should throw');
+			} catch (e) {
+				const error = ensureError(e);
+				expect(error.message).toEqual(
+					"Using the item method doesn't work with pinned data in this scenario. Please unpin 'Edit Fields' and try again.",
+				);
+
+				expect(error).toMatchObject({
+					functionality: 'pairedItem',
+					context: {
+						runIndex: 0,
+						itemIndex: 0,
+						type: 'paired_item_no_info',
+						descriptionKey: 'pairedItemNoInfo',
+						nodeCause: 'Edit Fields',
+						causeDetailed: "Missing pairedItem data (node 'Edit Fields' probably didn't supply it)",
+					},
+				});
+			}
+		});
+	});
+
 	describe('Partial data', () => {
 		const fixture = loadFixture('partial_data');
 
@@ -486,4 +549,45 @@ describe('WorkflowDataProxy', () => {
 			expect(() => getFromAIProxy().$fromAI('invalid!')).toThrow(ExpressionError);
 		});
 	});
+
+	describe('$rawParameter', () => {
+		const fixture = loadFixture('rawParameter');
+		const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'Execute Workflow', 'manual', {
+			connectionType: NodeConnectionType.Main,
+			throwOnMissingExecutionData: false,
+			runIndex: 0,
+		});
+
+		test('returns simple raw parameter value', () => {
+			expect(proxy.$rawParameter.options).toEqual({
+				waitForSubWorkflow: '={{ true }}',
+			});
+		});
+
+		test('returns raw parameter value for resource locator values', () => {
+			expect(proxy.$rawParameter.workflowId).toEqual('={{ $json.foo }}');
+		});
+
+		test('returns raw parameter value when there is no run data', () => {
+			const noRunDataProxy = getProxyFromFixture(
+				fixture.workflow,
+				{
+					data: { resultData: { runData: {} } },
+					mode: 'manual',
+					startedAt: new Date(),
+					status: 'success',
+				},
+				'Execute Workflow',
+				'manual',
+				{
+					connectionType: NodeConnectionType.Main,
+					throwOnMissingExecutionData: false,
+					runIndex: 0,
+				},
+			);
+			expect(noRunDataProxy.$rawParameter.options).toEqual({
+				waitForSubWorkflow: '={{ true }}',
+			});
+		});
+	});
 });
diff --git a/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts b/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
index 15ce485140..81049b1f55 100644
--- a/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
+++ b/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
@@ -1,5 +1,5 @@
-import { ExpressionError } from '../src/errors/expression.error';
-import { createEnvProvider, createEnvProviderState } from '../src/WorkflowDataProxyEnvProvider';
+import { ExpressionError } from '@/errors/expression.error';
+import { createEnvProvider, createEnvProviderState } from '@/WorkflowDataProxyEnvProvider';
 
 describe('createEnvProviderState', () => {
 	afterEach(() => {
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_run.json
new file mode 100644
index 0000000000..9a3b02a0ab
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_run.json
@@ -0,0 +1,216 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"When clicking ‘Test workflow’": [
+					{
+						"hints": [],
+						"startTime": 1737031584297,
+						"executionTime": 1,
+						"source": [],
+						"executionStatus": "success",
+						"data": { "main": [[{ "json": {}, "pairedItem": { "item": 0 } }]] }
+					}
+				],
+				"DebugHelper": [
+					{
+						"hints": [],
+						"startTime": 1737031584299,
+						"executionTime": 1,
+						"source": [{ "previousNode": "When clicking ‘Test workflow’" }],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"uid": "3c54ac5d-5c75-409d-9975-76ee151e5fc9",
+											"email": "Troy.Volkman@gmail.com",
+											"firstname": "Betty",
+											"lastname": "Wolf",
+											"password": "c~837Nv"
+										},
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": {
+											"uid": "5b0d9bd7-2ecf-47fb-b484-3eb1e76fa901",
+											"email": "Martha.Moore@hotmail.com",
+											"firstname": "Shannon",
+											"lastname": "Champlin",
+											"password": "48FF,6dnx"
+										},
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": {
+											"uid": "76437ebe-d406-447a-ab89-3b10f5183480",
+											"email": "Wanda_Witting@hotmail.com",
+											"firstname": "Alma",
+											"lastname": "Conn",
+											"password": "6$G2R3nT"
+										},
+										"pairedItem": { "item": 0 }
+									}
+								]
+							]
+						}
+					}
+				],
+				"Edit Fields": [
+					{
+						"hints": [],
+						"startTime": 1737031584301,
+						"executionTime": 0,
+						"source": [{ "previousNode": "DebugHelper" }],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+											"email": "Joanna_Willms@yahoo.com",
+											"firstname": "Laurie",
+											"lastname": "Krajcik",
+											"password": "k%Y2I9oq",
+											"test": "1"
+										}
+									},
+									{
+										"json": {
+											"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+											"email": "Elaine_Feeney@gmail.com",
+											"firstname": "Tracy",
+											"lastname": "Mraz",
+											"password": "t48s3-r",
+											"test": "1"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Set": [
+					{
+						"hints": [],
+						"startTime": 1737031584301,
+						"executionTime": 0,
+						"source": [{ "previousNode": "Edit Fields" }],
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+											"email": "Joanna_Willms@yahoo.com",
+											"firstname": "Laurie",
+											"lastname": "Krajcik",
+											"password": "k%Y2I9oq",
+											"test": "1"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+											"email": "Elaine_Feeney@gmail.com",
+											"firstname": "Tracy",
+											"lastname": "Mraz",
+											"password": "t48s3-r",
+											"test": "1"
+										},
+										"pairedItem": {
+											"item": 1
+										}
+									}
+								]
+							]
+						}
+					}
+				]
+			},
+			"pinData": {
+				"Edit Fields": [
+					{
+						"json": {
+							"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+							"email": "Joanna_Willms@yahoo.com",
+							"firstname": "Laurie",
+							"lastname": "Krajcik",
+							"password": "k%Y2I9oq",
+							"test": "1"
+						}
+					},
+					{
+						"json": {
+							"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+							"email": "Elaine_Feeney@gmail.com",
+							"firstname": "Tracy",
+							"lastname": "Mraz",
+							"password": "t48s3-r",
+							"test": "1"
+						}
+					}
+				]
+			},
+			"lastNodeExecuted": "Set"
+		},
+		"executionData": {
+			"contextData": {},
+			"nodeExecutionStack": [
+				{
+					"node": {
+						"parameters": {
+							"mode": "runOnceForAllItems",
+							"language": "javaScript",
+							"jsCode": "for (let i = 0; i < $input.all().length; i++) {   $(\"DebugHelper\").itemMatching(i) }  return []",
+							"notice": ""
+						},
+						"type": "n8n-nodes-base.code",
+						"typeVersion": 2,
+						"position": [720, 0],
+						"id": "d4e8b6a2-cd73-452d-b5f0-986753f5dc4a",
+						"name": "Set"
+					},
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+										"email": "Joanna_Willms@yahoo.com",
+										"firstname": "Laurie",
+										"lastname": "Krajcik",
+										"password": "k%Y2I9oq",
+										"test": "1"
+									},
+									"pairedItem": { "item": 0 }
+								},
+								{
+									"json": {
+										"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+										"email": "Elaine_Feeney@gmail.com",
+										"firstname": "Tracy",
+										"lastname": "Mraz",
+										"password": "t48s3-r",
+										"test": "1"
+									},
+									"pairedItem": { "item": 1 }
+								}
+							]
+						]
+					},
+					"source": { "main": [{ "previousNode": "Edit Fields" }] }
+				}
+			],
+			"metadata": {},
+			"waitingExecution": {},
+			"waitingExecutionSource": {}
+		}
+	}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_workflow.json
new file mode 100644
index 0000000000..8ae5af273e
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_workflow.json
@@ -0,0 +1,106 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "df3ea0b2-913b-4736-a3c6-f61b35abd1e1",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"category": "randomData",
+				"randomDataCount": 3
+			},
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [280, 0],
+			"id": "e31f942c-876a-43ae-b883-0b7566d44750",
+			"name": "DebugHelper"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "049c69e3-969d-4df9-bf93-e44c1da06ba1",
+							"name": "test",
+							"value": "1",
+							"type": "string"
+						}
+					]
+				},
+				"includeOtherFields": true,
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [500, 0],
+			"id": "eb20f04e-875f-4a2d-853c-f2e30014b821",
+			"name": "Edit Fields"
+		},
+		{
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [720, 0],
+			"id": "d4e8b6a2-cd73-452d-b5f0-986753f5dc4a",
+			"name": "Set"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"DebugHelper": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"Edit Fields": [
+			{
+				"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+				"email": "Joanna_Willms@yahoo.com",
+				"firstname": "Laurie",
+				"lastname": "Krajcik",
+				"password": "k%Y2I9oq",
+				"test": "1"
+			},
+			{
+				"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+				"email": "Elaine_Feeney@gmail.com",
+				"firstname": "Tracy",
+				"lastname": "Mraz",
+				"password": "t48s3-r",
+				"test": "1"
+			}
+		]
+	}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/rawParameter_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/rawParameter_run.json
new file mode 100644
index 0000000000..431dc9efbb
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/rawParameter_run.json
@@ -0,0 +1,117 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"_custom": {
+					"type": "reactive",
+					"stateTypeName": "Reactive",
+					"value": {
+						"Manual trigger": [
+							{
+								"_custom": {
+									"type": "reactive",
+									"stateTypeName": "Reactive",
+									"value": {
+										"hints": [],
+										"startTime": 1738314562475,
+										"executionTime": 1,
+										"source": [],
+										"executionStatus": "success",
+										"data": { "main": [[{ "json": {}, "pairedItem": { "item": 0 } }]] }
+									}
+								}
+							}
+						],
+						"Edit Fields": [
+							{
+								"_custom": {
+									"type": "reactive",
+									"stateTypeName": "Reactive",
+									"value": {
+										"hints": [],
+										"startTime": 1738314562477,
+										"executionTime": 0,
+										"source": [{ "previousNode": "Manual trigger" }],
+										"executionStatus": "success",
+										"data": {
+											"main": [[{ "json": { "foo": "test" }, "pairedItem": { "item": 0 } }]]
+										}
+									}
+								}
+							}
+						],
+						"Execute Workflow": [
+							{
+								"hints": [],
+								"startTime": 1738314562478,
+								"executionTime": 2,
+								"source": [{ "previousNode": "Edit Fields" }],
+								"executionStatus": "error",
+								"error": {
+									"level": "error",
+									"tags": { "packageName": "cli" },
+									"extra": { "workflowId": "1.2" },
+									"message": "Workflow does not exist.",
+									"stack": "Error: Workflow does not exist.\n    at getWorkflowData (/Users/miloradfilipovic/workspace/n8n/packages/cli/src/workflow-execute-additional-data.ts:124:10)\n    at Object.executeWorkflow (/Users/miloradfilipovic/workspace/n8n/packages/cli/src/workflow-execute-additional-data.ts:155:4)\n    at ExecuteContext.executeWorkflow (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts:120:18)\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts:397:50)\n    at WorkflowExecute.runNode (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1097:8)\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1503:27\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:2064:11"
+								}
+							}
+						]
+					}
+				}
+			},
+			"pinData": {},
+			"lastNodeExecuted": "Execute Workflow",
+			"error": {
+				"level": "error",
+				"tags": { "packageName": "cli" },
+				"extra": { "workflowId": "1.2" },
+				"message": "Workflow does not exist.",
+				"stack": "Error: Workflow does not exist.\n    at getWorkflowData (/Users/miloradfilipovic/workspace/n8n/packages/cli/src/workflow-execute-additional-data.ts:124:10)\n    at Object.executeWorkflow (/Users/miloradfilipovic/workspace/n8n/packages/cli/src/workflow-execute-additional-data.ts:155:4)\n    at ExecuteContext.executeWorkflow (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts:120:18)\n    at ExecuteContext.execute (/Users/miloradfilipovic/workspace/n8n/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts:397:50)\n    at WorkflowExecute.runNode (/Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1097:8)\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:1503:27\n    at /Users/miloradfilipovic/workspace/n8n/packages/core/src/execution-engine/workflow-execute.ts:2064:11"
+			}
+		},
+		"executionData": {
+			"contextData": {},
+			"nodeExecutionStack": [
+				{
+					"node": {
+						"parameters": {
+							"operation": "call_workflow",
+							"source": "database",
+							"workflowId": {
+								"__rl": true,
+								"mode": "id",
+								"value": "=1.2",
+								"cachedResultName": "=1.2"
+							},
+							"workflowInputs": {
+								"mappingMode": "defineBelow",
+								"value": {},
+								"matchingColumns": [],
+								"schema": [],
+								"attemptToConvertTypes": false,
+								"convertFieldsToString": true
+							},
+							"mode": "once",
+							"options": {}
+						},
+						"type": "n8n-nodes-base.executeWorkflow",
+						"typeVersion": 1.2,
+						"position": [120, -100],
+						"id": "62717ac7-614d-4e3f-b2ec-1e28688068c4",
+						"name": "Execute Workflow"
+					},
+					"data": { "main": [[{ "json": { "foo": "test" }, "pairedItem": { "item": 0 } }]] },
+					"source": { "main": [{ "previousNode": "Edit Fields" }] }
+				}
+			],
+			"metadata": {},
+			"waitingExecution": {},
+			"waitingExecutionSource": {}
+		},
+		"mode": "manual",
+		"startedAt": "2024-02-08T15:45:18.848Z",
+		"stoppedAt": "2024-02-08T15:45:18.862Z",
+		"status": "success"
+	}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/rawParameter_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/rawParameter_workflow.json
new file mode 100644
index 0000000000..1270920dc5
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/rawParameter_workflow.json
@@ -0,0 +1,80 @@
+{
+	"nodes": [
+		{
+			"id": "804e5ba7-4b1d-48c2-abfa-a36717a9fa66",
+			"name": "Manual trigger",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-320, -100],
+			"parameters": {}
+		},
+		{
+			"id": "f995b1a2-8a49-4f0c-ae0d-8fb4c600cdef",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [-100, -100],
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "f4d80089-a3d7-470f-8c07-dec07e37f339",
+							"name": "foo",
+							"value": "={{ test }}",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			}
+		},
+		{
+			"id": "62717ac7-614d-4e3f-b2ec-1e28688068c4",
+			"name": "Execute Workflow",
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.2,
+			"position": [120, -100],
+			"parameters": {
+				"workflowId": {
+					"__rl": true,
+					"value": "={{ $json.foo }}",
+					"mode": "id"
+				},
+				"workflowInputs": {
+					"mappingMode": "defineBelow",
+					"value": {},
+					"matchingColumns": [],
+					"schema": [],
+					"attemptToConvertTypes": false,
+					"convertFieldsToString": true
+				},
+				"options": { "waitForSubWorkflow": "={{ true }}" }
+			}
+		}
+	],
+	"connections": {
+		"Manual trigger": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Execute Workflow",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/patches/bull@4.12.1.patch b/patches/bull@4.12.1.patch
new file mode 100644
index 0000000000..2c68a33865
--- /dev/null
+++ b/patches/bull@4.12.1.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/job.js b/lib/job.js
+index 6a3606974fd3e397c6c5b2b6e65b20670c68f753..4cdbed1d564ceeb5a80c92eb605e49cfd3c8ccdd 100644
+--- a/lib/job.js
++++ b/lib/job.js
+@@ -511,9 +511,14 @@ Job.prototype.finished = async function() {
+         }
+       };
+
+-      const onFailed = (jobId, failedReason) => {
++      const onFailed = async (jobId, failedReason) => {
+         if (String(jobId) === String(this.id)) {
+-          reject(new Error(failedReason));
++					const job = await Job.fromId(this.queue, this.id);
++					const error = new Error(failedReason);
++					if (job && job.stacktrace && job.stacktrace.length > 0) {
++						error.stack = job.stacktrace.join('\n');
++					}
++          reject(error);
+           removeListeners();
+         }
+       };
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8931279c42..ae1b8913a5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,11 +7,11 @@ settings:
 catalogs:
   default:
     '@langchain/core':
-      specifier: 0.3.19
-      version: 0.3.19
+      specifier: 0.3.30
+      version: 0.3.30
     '@sentry/node':
-      specifier: 8.42.0
-      version: 8.42.0
+      specifier: 8.52.1
+      version: 8.52.1
     '@types/basic-auth':
       specifier: ^1.1.3
       version: 1.1.3
@@ -73,27 +73,45 @@ catalogs:
       specifier: 1.0.15
       version: 1.0.15
     zod:
-      specifier: 3.23.8
-      version: 3.23.8
+      specifier: 3.24.1
+      version: 3.24.1
   frontend:
     '@sentry/vue':
       specifier: ^8.33.1
       version: 8.33.1
+    '@testing-library/jest-dom':
+      specifier: ^6.6.3
+      version: 6.6.3
+    '@testing-library/user-event':
+      specifier: ^14.6.0
+      version: 14.6.0
+    '@testing-library/vue':
+      specifier: ^8.1.0
+      version: 8.1.0
     '@vitejs/plugin-vue':
       specifier: ^5.2.1
       version: 5.2.1
     '@vitest/coverage-v8':
-      specifier: ^2.1.6
-      version: 2.1.8
+      specifier: ^3.0.2
+      version: 3.0.2
+    '@vue/tsconfig':
+      specifier: ^0.7.0
+      version: 0.7.0
     highlight.js:
       specifier: ^11.8.0
       version: 11.9.0
+    tsup:
+      specifier: ^8.3.6
+      version: 8.3.6
     vite:
       specifier: ^6.0.2
       version: 6.0.2
+    vite-plugin-dts:
+      specifier: ^4.3.0
+      version: 4.3.0
     vitest:
-      specifier: ^2.1.8
-      version: 2.1.8
+      specifier: ^3.0.2
+      version: 3.0.2
     vitest-mock-extended:
       specifier: ^2.0.2
       version: 2.0.2
@@ -130,6 +148,9 @@ patchedDependencies:
   '@types/ws@8.5.4':
     hash: nbzuqaoyqbrfwipijj5qriqqju
     path: patches/@types__ws@8.5.4.patch
+  bull@4.12.1:
+    hash: ep6h4rqtpclldfcdohxlgcb3aq
+    path: patches/bull@4.12.1.patch
   pkce-challenge@3.0.0:
     hash: dypouzb3lve7vncq25i5fuanki
     path: patches/pkce-challenge@3.0.0.patch
@@ -184,8 +205,8 @@ importers:
         specifier: ^2.1.1
         version: 2.1.1
       nock:
-        specifier: ^13.3.2
-        version: 13.3.2
+        specifier: ^14.0.0
+        version: 14.0.0
       nodemon:
         specifier: ^3.0.1
         version: 3.0.1
@@ -273,10 +294,10 @@ importers:
         version: 1.0.15
       zod:
         specifier: 'catalog:'
-        version: 3.23.8
+        version: 3.24.1
       zod-class:
         specifier: 0.0.16
-        version: 0.0.16(zod@3.23.8)
+        version: 0.0.16(zod@3.24.1)
     devDependencies:
       '@n8n/config':
         specifier: workspace:*
@@ -342,7 +363,7 @@ importers:
         version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 3.0.2(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       unplugin-icons:
         specifier: ^0.19.0
         version: 0.19.0(@vue/compiler-sfc@3.5.13)
@@ -354,7 +375,7 @@ importers:
         version: 4.3.0(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
       vitest:
         specifier: catalog:frontend
-        version: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
       vue-tsc:
         specifier: ^2.1.10
         version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
@@ -434,7 +455,7 @@ importers:
         version: 7.0.15
       zod:
         specifier: 'catalog:'
-        version: 3.23.8
+        version: 3.24.1
 
   packages/@n8n/nodes-langchain:
     dependencies:
@@ -443,7 +464,7 @@ importers:
         version: 3.666.0(@aws-sdk/client-sts@3.666.0)
       '@getzep/zep-cloud':
         specifier: 1.0.12
-        version: 1.0.12(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i))
+        version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi))
       '@getzep/zep-js':
         specifier: 0.9.0
         version: 0.9.0
@@ -460,50 +481,50 @@ importers:
         specifier: 2.8.0
         version: 2.8.0
       '@langchain/anthropic':
-        specifier: 0.3.8
-        version: 0.3.8(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.3.11
+        version: 0.3.11(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/aws':
-        specifier: 0.1.2
-        version: 0.1.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+        specifier: 0.1.3
+        version: 0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@langchain/cohere':
-        specifier: 0.3.1
-        version: 0.3.1(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.3.2
+        version: 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/community':
-        specifier: 0.3.15
-        version: 0.3.15(v4qhcw25bevfr6xzz4fnsvjiqe)
+        specifier: 0.3.24
+        version: 0.3.24(xbnzedcvjhnriori3dst4asz2q)
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+        version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@langchain/google-genai':
-        specifier: 0.1.4
-        version: 0.1.4(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
+        specifier: 0.1.6
+        version: 0.1.6(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(zod@3.24.1)
       '@langchain/google-vertexai':
-        specifier: 0.1.3
-        version: 0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
+        specifier: 0.1.8
+        version: 0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(zod@3.24.1)
       '@langchain/groq':
-        specifier: 0.1.2
-        version: 0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.1.3
+        version: 0.1.3(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/mistralai':
         specifier: 0.2.0
-        version: 0.2.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+        version: 0.2.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@langchain/ollama':
-        specifier: 0.1.2
-        version: 0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+        specifier: 0.1.4
+        version: 0.1.4(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@langchain/openai':
-        specifier: 0.3.14
-        version: 0.3.14(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.3.17
+        version: 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       '@langchain/pinecone':
         specifier: 0.1.3
-        version: 0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+        version: 0.1.3(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@langchain/qdrant':
         specifier: 0.1.1
-        version: 0.1.1(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(typescript@5.7.2)
+        version: 0.1.1(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(typescript@5.7.2)
       '@langchain/redis':
         specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+        version: 0.1.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@langchain/textsplitters':
         specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+        version: 0.1.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       '@mozilla/readability':
         specifier: 0.5.0
         version: 0.5.0
@@ -512,7 +533,7 @@ importers:
         version: link:../json-schema-to-zod
       '@n8n/typeorm':
         specifier: 0.3.20-12
-        version: 0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+        version: 0.3.20-12(@sentry/node@8.52.1)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       '@n8n/vm2':
         specifier: 3.9.25
         version: 3.9.25
@@ -556,8 +577,8 @@ importers:
         specifier: 23.0.1
         version: 23.0.1
       langchain:
-        specifier: 0.3.6
-        version: 0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i)
+        specifier: 0.3.11
+        version: 0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -574,8 +595,8 @@ importers:
         specifier: workspace:*
         version: link:../../workflow
       openai:
-        specifier: 4.73.1
-        version: 4.73.1(encoding@0.1.13)(zod@3.23.8)
+        specifier: 4.78.1
+        version: 4.78.1(encoding@0.1.13)(zod@3.24.1)
       pdf-parse:
         specifier: 1.1.1
         version: 1.1.1
@@ -596,10 +617,10 @@ importers:
         version: 3.0.3
       zod:
         specifier: 'catalog:'
-        version: 3.23.8
+        version: 3.24.1
       zod-to-json-schema:
         specifier: 3.23.3
-        version: 3.23.3(zod@3.23.8)
+        version: 3.23.3(zod@3.24.1)
     devDependencies:
       '@types/basic-auth':
         specifier: 'catalog:'
@@ -631,47 +652,47 @@ importers:
   packages/@n8n/storybook:
     devDependencies:
       '@chromatic-com/storybook':
-        specifier: ^3.2.2
-        version: 3.2.2(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^3.2.4
+        version: 3.2.4(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))
       '@storybook/addon-a11y':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       '@storybook/addon-actions':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@storybook/addon-docs':
-        specifier: ^8.4.6
-        version: 8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(@types/react@18.0.27)(storybook@8.5.0(prettier@3.3.3))
       '@storybook/addon-essentials':
-        specifier: ^8.4.6
-        version: 8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(@types/react@18.0.27)(storybook@8.5.0(prettier@3.3.3))
       '@storybook/addon-interactions':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@storybook/addon-links':
-        specifier: ^8.4.6
-        version: 8.4.6(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))
       '@storybook/addon-themes':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@storybook/blocks':
-        specifier: ^8.4.6
-        version: 8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))
       '@storybook/test':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@storybook/vue3':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))
       '@storybook/vue3-vite':
-        specifier: ^8.4.6
-        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
+        specifier: ^8.5.0
+        version: 8.5.0(storybook@8.5.0(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       chromatic:
-        specifier: ^11.20.0
-        version: 11.20.0
+        specifier: ^11.25.0
+        version: 11.25.0
       storybook:
-        specifier: ^8.4.6
-        version: 8.4.6(prettier@3.3.3)
+        specifier: ^8.5.0
+        version: 8.5.0(prettier@3.3.3)
 
   packages/@n8n/task-runner:
     dependencies:
@@ -683,7 +704,7 @@ importers:
         version: link:../di
       '@sentry/node':
         specifier: 'catalog:'
-        version: 8.42.0
+        version: 8.52.1
       acorn:
         specifier: 8.14.0
         version: 8.14.0
@@ -693,6 +714,9 @@ importers:
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
+      luxon:
+        specifier: 'catalog:'
+        version: 3.4.4
       n8n-core:
         specifier: workspace:*
         version: link:../../core
@@ -709,9 +733,6 @@ importers:
       '@types/lodash':
         specifier: 'catalog:'
         version: 4.14.195
-      luxon:
-        specifier: 'catalog:'
-        version: 3.4.4
 
   packages/@n8n_io/eslint-config:
     devDependencies:
@@ -798,13 +819,13 @@ importers:
         version: link:../@n8n/task-runner
       '@n8n/typeorm':
         specifier: 0.3.20-12
-        version: 0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
+        version: 0.3.20-12(@sentry/node@8.52.1)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))
       '@n8n_io/ai-assistant-sdk':
         specifier: 1.13.0
         version: 1.13.0
       '@n8n_io/license-sdk':
-        specifier: 2.13.1
-        version: 2.13.1
+        specifier: 2.15.1
+        version: 2.15.1
       '@oclif/core':
         specifier: 4.0.7
         version: 4.0.7
@@ -813,7 +834,7 @@ importers:
         version: 2.0.9(tslib@2.6.2)
       '@sentry/node':
         specifier: 'catalog:'
-        version: 8.42.0
+        version: 8.52.1
       aws4:
         specifier: 1.11.0
         version: 1.11.0
@@ -825,7 +846,7 @@ importers:
         version: 2.4.3
       bull:
         specifier: 4.12.1
-        version: 4.12.1
+        version: 4.12.1(patch_hash=ep6h4rqtpclldfcdohxlgcb3aq)
       cache-manager:
         specifier: 5.2.3
         version: 5.2.3
@@ -850,9 +871,6 @@ importers:
       csrf:
         specifier: 3.1.0
         version: 3.1.0
-      curlconverter:
-        specifier: 3.21.0
-        version: 3.21.0(chokidar@4.0.1)
       dotenv:
         specifier: 8.6.0
         version: 8.6.0
@@ -1035,7 +1053,7 @@ importers:
         version: 0.3.0
       zod:
         specifier: 'catalog:'
-        version: 3.23.8
+        version: 3.24.1
     devDependencies:
       '@redocly/cli':
         specifier: ^1.25.5
@@ -1129,7 +1147,7 @@ importers:
     dependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+        version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@n8n/client-oauth2':
         specifier: workspace:*
         version: link:../@n8n/client-oauth2
@@ -1141,7 +1159,7 @@ importers:
         version: link:../@n8n/di
       '@sentry/node':
         specifier: 'catalog:'
-        version: 8.42.0
+        version: 8.52.1
       aws4:
         specifier: 1.11.0
         version: 1.11.0
@@ -1216,7 +1234,7 @@ importers:
         version: 0.6.2
       zod:
         specifier: 'catalog:'
-        version: 3.23.8
+        version: 3.24.1
     devDependencies:
       '@types/aws4':
         specifier: ^1.5.1
@@ -1251,6 +1269,9 @@ importers:
       '@fortawesome/vue-fontawesome':
         specifier: ^3.0.3
         version: 3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.13(typescript@5.7.2))
+      '@n8n/composables':
+        specifier: workspace:*
+        version: link:../frontend/@n8n/composables
       '@vueuse/core':
         specifier: '*'
         version: 10.11.0(vue@3.5.13(typescript@5.7.2))
@@ -1291,15 +1312,24 @@ importers:
         specifier: 'catalog:'
         version: 1.0.15
     devDependencies:
+      '@n8n/frontend-eslint-config':
+        specifier: workspace:*
+        version: link:../frontend/tooling/eslint-config
+      '@n8n/frontend-typescript-config':
+        specifier: workspace:*
+        version: link:../frontend/tooling/typescript-config
+      '@n8n/frontend-vitest-config':
+        specifier: workspace:*
+        version: link:../frontend/tooling/vitest-config
       '@n8n/storybook':
         specifier: workspace:*
         version: link:../@n8n/storybook
       '@testing-library/jest-dom':
-        specifier: ^6.5.0
-        version: 6.5.0
+        specifier: ^6.6.3
+        version: 6.6.3
       '@testing-library/user-event':
-        specifier: ^14.5.2
-        version: 14.5.2(@testing-library/dom@10.4.0)
+        specifier: ^14.6.0
+        version: 14.6.0(@testing-library/dom@10.4.0)
       '@testing-library/vue':
         specifier: ^8.1.0
         version: 8.1.0(@vue/compiler-sfc@3.5.13)(vue@3.5.13(typescript@5.7.2))
@@ -1320,7 +1350,7 @@ importers:
         version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 3.0.2(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.19(postcss@8.4.38)
@@ -1344,10 +1374,10 @@ importers:
         version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
       vitest:
         specifier: catalog:frontend
-        version: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
       vitest-mock-extended:
         specifier: catalog:frontend
-        version: 2.0.2(typescript@5.7.2)(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.0.2(typescript@5.7.2)(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       vue-tsc:
         specifier: ^2.1.10
         version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
@@ -1429,6 +1459,9 @@ importers:
       '@n8n/codemirror-lang-sql':
         specifier: ^1.0.2
         version: 1.0.2(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
+      '@n8n/composables':
+        specifier: workspace:*
+        version: link:../frontend/@n8n/composables
       '@n8n/permissions':
         specifier: workspace:*
         version: link:../@n8n/permissions
@@ -1443,19 +1476,19 @@ importers:
         version: 1.6.0(typescript@5.7.2)
       '@vue-flow/background':
         specifier: ^1.3.2
-        version: 1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        version: 1.3.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/controls':
         specifier: ^1.1.2
-        version: 1.1.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        version: 1.1.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/core':
-        specifier: ^1.41.6
-        version: 1.41.6(vue@3.5.13(typescript@5.7.2))
+        specifier: ^1.42.1
+        version: 1.42.1(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/minimap':
-        specifier: ^1.5.0
-        version: 1.5.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        specifier: ^1.5.2
+        version: 1.5.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/node-resizer':
         specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
+        version: 1.4.0(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vueuse/components':
         specifier: ^10.11.0
         version: 10.11.0(vue@3.5.13(typescript@5.7.2))
@@ -1480,6 +1513,12 @@ importers:
       comlink:
         specifier: ^4.4.1
         version: 4.4.1
+      core-js:
+        specifier: ^3.40.0
+        version: 3.40.0
+      curlconverter:
+        specifier: ^4.12.0
+        version: 4.12.0
       dateformat:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1576,6 +1615,9 @@ importers:
       vuedraggable:
         specifier: 4.1.0
         version: 4.1.0(vue@3.5.13(typescript@5.7.2))
+      web-tree-sitter:
+        specifier: 0.24.3
+        version: 0.24.3
       xss:
         specifier: 'catalog:'
         version: 1.0.15
@@ -1586,6 +1628,15 @@ importers:
       '@iconify/json':
         specifier: ^2.2.228
         version: 2.2.230
+      '@n8n/frontend-eslint-config':
+        specifier: workspace:*
+        version: link:../frontend/tooling/eslint-config
+      '@n8n/frontend-typescript-config':
+        specifier: workspace:*
+        version: link:../frontend/tooling/typescript-config
+      '@n8n/frontend-vitest-config':
+        specifier: workspace:*
+        version: link:../frontend/tooling/vitest-config
       '@pinia/testing':
         specifier: ^0.1.6
         version: 0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
@@ -1598,6 +1649,9 @@ importers:
       '@types/humanize-duration':
         specifier: ^3.27.1
         version: 3.27.1
+      '@types/json-schema':
+        specifier: ^7.0.15
+        version: 7.0.15
       '@types/jsonpath':
         specifier: ^0.2.0
         version: 0.2.0
@@ -1618,7 +1672,7 @@ importers:
         version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 3.0.2(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       browserslist-to-esbuild:
         specifier: ^2.1.1
         version: 2.1.1(browserslist@4.24.2)
@@ -1634,19 +1688,91 @@ importers:
       vite:
         specifier: catalog:frontend
         version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-plugin-static-copy:
+        specifier: 2.2.0
+        version: 2.2.0(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
       vite-svg-loader:
         specifier: 5.1.0
         version: 5.1.0(vue@3.5.13(typescript@5.7.2))
       vitest:
         specifier: catalog:frontend
-        version: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
       vitest-mock-extended:
         specifier: catalog:frontend
-        version: 2.0.2(typescript@5.7.2)(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.0.2(typescript@5.7.2)(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       vue-tsc:
         specifier: ^2.1.10
         version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
+  packages/frontend/@n8n/composables:
+    dependencies:
+      vue:
+        specifier: catalog:frontend
+        version: 3.5.13(typescript@5.7.2)
+    devDependencies:
+      '@n8n/frontend-eslint-config':
+        specifier: workspace:*
+        version: link:../../tooling/eslint-config
+      '@n8n/frontend-typescript-config':
+        specifier: workspace:*
+        version: link:../../tooling/typescript-config
+      '@n8n/frontend-vitest-config':
+        specifier: workspace:*
+        version: link:../../tooling/vitest-config
+      '@testing-library/jest-dom':
+        specifier: catalog:frontend
+        version: 6.6.3
+      '@testing-library/user-event':
+        specifier: catalog:frontend
+        version: 14.6.0(@testing-library/dom@10.4.0)
+      '@testing-library/vue':
+        specifier: catalog:frontend
+        version: 8.1.0(@vue/compiler-sfc@3.5.13)(vue@3.5.13(typescript@5.7.2))
+      '@vitejs/plugin-vue':
+        specifier: catalog:frontend
+        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
+      '@vue/tsconfig':
+        specifier: catalog:frontend
+        version: 0.7.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))
+      tsup:
+        specifier: catalog:frontend
+        version: 8.3.6(@microsoft/api-extractor@7.48.0(@types/node@18.16.16))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.7.2)
+      typescript:
+        specifier: ^5.7.2
+        version: 5.7.2
+      vite:
+        specifier: catalog:frontend
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-plugin-dts:
+        specifier: catalog:frontend
+        version: 4.3.0(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      vitest:
+        specifier: catalog:frontend
+        version: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vue-tsc:
+        specifier: ^2.1.10
+        version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
+
+  packages/frontend/tooling/eslint-config:
+    dependencies:
+      '@n8n_io/eslint-config':
+        specifier: workspace:*
+        version: link:../../../@n8n_io/eslint-config
+      eslint-plugin-n8n-local-rules:
+        specifier: ^1.0.0
+        version: 1.0.0
+
+  packages/frontend/tooling/typescript-config: {}
+
+  packages/frontend/tooling/vitest-config:
+    devDependencies:
+      vite:
+        specifier: catalog:frontend
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vitest:
+        specifier: catalog:frontend
+        version: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+
   packages/node-dev:
     dependencies:
       '@n8n/di':
@@ -1851,6 +1977,9 @@ importers:
       rss-parser:
         specifier: 3.13.0
         version: 3.13.0
+      sanitize-html:
+        specifier: 2.12.1
+        version: 2.12.1
       semver:
         specifier: ^7.5.4
         version: 7.6.0
@@ -1871,7 +2000,7 @@ importers:
         version: 3.0.3
       ts-ics:
         specifier: 1.2.2
-        version: 1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.23.8)
+        version: 1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.24.1)
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
@@ -1936,6 +2065,9 @@ importers:
       '@types/rfc2047':
         specifier: ^2.0.1
         version: 2.0.1
+      '@types/sanitize-html':
+        specifier: ^2.11.0
+        version: 2.11.0
       '@types/showdown':
         specifier: ^1.9.4
         version: 1.9.4
@@ -2014,10 +2146,13 @@ importers:
       xml2js:
         specifier: 'catalog:'
         version: 0.6.2
+      zod:
+        specifier: 'catalog:'
+        version: 3.24.1
     devDependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+        version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@n8n/config':
         specifier: workspace:*
         version: link:../@n8n/config
@@ -2076,6 +2211,9 @@ packages:
   '@anthropic-ai/sdk@0.27.3':
     resolution: {integrity: sha512-IjLt0gd3L4jlOfilxVXTifn42FnVffMgDC04RJK1KDZpmkBWLv0XC92MVVmkxrFZNS/7l3xWgP/I3nqtX1sQHw==}
 
+  '@anthropic-ai/sdk@0.32.1':
+    resolution: {integrity: sha512-U9JwTrDvdQ9iWuABVsMLj8nJVwAyQz6QXvgLsVhryhCEPkLsbcP/MXxm+jYcAwLoV8ESbaTTjnD4kuAFa+Hyjg==}
+
   '@apidevtools/json-schema-ref-parser@11.7.0':
     resolution: {integrity: sha512-pRrmXMCwnmrkS3MLgAIW5dXRzeTv6GLjkjb4HmxNnvAKXN1Nfzp4KmGADBQvlVUcqi+a5D+hfGDLLnd5NnYxog==}
     engines: {node: '>= 16'}
@@ -2388,10 +2526,6 @@ packages:
     resolution: {integrity: sha512-BzBZJobMoDyjJsPRMLNHvqHycTGrT8R/dtcTx9qUFcqwSRfGVK9A/cZ7Nx38UQydT9usZGbaDCN75QRNjezSAA==}
     engines: {node: '>=14.0.0'}
 
-  '@babel/code-frame@7.24.6':
-    resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/code-frame@7.26.2':
     resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
@@ -2525,10 +2659,6 @@ packages:
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-string-parser@7.24.8':
-    resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-string-parser@7.25.9':
     resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
@@ -2537,10 +2667,6 @@ packages:
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/helper-validator-identifier@7.24.7':
-    resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/helper-validator-identifier@7.25.9':
     resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
     engines: {node: '>=6.9.0'}
@@ -2565,20 +2691,6 @@ packages:
     resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/highlight@7.24.6':
-    resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/parser@7.25.6':
-    resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
-  '@babel/parser@7.26.2':
-    resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
   '@babel/parser@7.26.3':
     resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==}
     engines: {node: '>=6.0.0'}
@@ -3042,14 +3154,6 @@ packages:
     resolution: {integrity: sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==}
     engines: {node: '>=6.9.0'}
 
-  '@babel/types@7.25.6':
-    resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/types@7.26.0':
-    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
-    engines: {node: '>=6.9.0'}
-
   '@babel/types@7.26.3':
     resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
     engines: {node: '>=6.9.0'}
@@ -3057,6 +3161,10 @@ packages:
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
+  '@bcoe/v8-coverage@1.0.2':
+    resolution: {integrity: sha512-6zABk/ECA/QYSCQ1NGiVwwbQerUCZ+TQbp64Q3AgmfNvurHH0j8TtXa1qbShXA6qqkpAj4V5W8pP6mLe1mcMqA==}
+    engines: {node: '>=18'}
+
   '@biomejs/biome@1.9.0':
     resolution: {integrity: sha512-NlWh2F1wbxB3O/wE+aohGL0BziTS6e+6+dyFvpdeqLsbQZY7EsiklFb9W5Xs41U4vEmY7ANgdNp+oVDij6sQdA==}
     engines: {node: '>=14.21.3'}
@@ -3110,6 +3218,18 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@browserbasehq/sdk@2.0.0':
+    resolution: {integrity: sha512-BdPlZyn0dpXlL70gNK4acpqWIRB+edo2z0/GalQdWghRq8iQjySd9fVIF3evKH1p2wCYekZJRK6tm29YfXB67g==}
+
+  '@browserbasehq/stagehand@1.9.0':
+    resolution: {integrity: sha512-0wIFnwOVnUEgVkPKW0RX7NoOt98qaRJ8+l1m9ppk1f5E03GtefDQTMiQwwT9WQn163bpZT5cOhyA1I3jZNfFeA==}
+    peerDependencies:
+      '@playwright/test': ^1.42.1
+      deepmerge: ^4.3.1
+      dotenv: ^16.4.5
+      openai: ^4.62.1
+      zod: ^3.23.8
+
   '@cfaester/enzyme-adapter-react-18@0.8.0':
     resolution: {integrity: sha512-3Z3ThTUouHwz8oIyhTYQljEMNRFtlVyc3VOOHCbxs47U6cnXs8K9ygi/c1tv49s7MBlTXeIcuN+Ttd9aPtILFQ==}
     peerDependencies:
@@ -3117,8 +3237,11 @@ packages:
       react: '>=18'
       react-dom: '>=18'
 
-  '@chromatic-com/storybook@3.2.2':
-    resolution: {integrity: sha512-xmXt/GW0hAPbzNTrxYuVo43Adrtjue4DeVrsoIIEeJdGaPNNeNf+DHMlJKOBdlHmCnFUoe9R/0mLM9zUp5bKWw==}
+  '@cfworker/json-schema@4.1.0':
+    resolution: {integrity: sha512-/vYKi/qMxwNsuIJ9WGWwM2rflY40ZenK3Kh4uR5vB9/Nz12Y7IUN/Xf4wDA7vzPfw0VNh3b/jz4+MjcVgARKJg==}
+
+  '@chromatic-com/storybook@3.2.4':
+    resolution: {integrity: sha512-5/bOOYxfwZ2BktXeqcCpOVAoR6UCoeART5t9FVy22hoo8F291zOuX4y3SDgm10B1GVU/ZTtJWPT2X9wZFlxYLg==}
     engines: {node: '>=16.0.0', yarn: '>=1.22.18'}
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
@@ -3190,14 +3313,6 @@ packages:
     resolution: {integrity: sha512-/Z3l6pXthq0JvMYdUFyX9j0MaCltlIn6mfh9jLyQwg5aPKxkyNa0PTHtU1AlFXLNk55ZuAeJRcpvq+tmLfKmaQ==}
     engines: {node: '>=10'}
 
-  '@curlconverter/yargs-parser@0.0.1':
-    resolution: {integrity: sha512-DbEVRYqrorzwqc63MQ3RODflut1tNla8ZCKo1h83lF7+fbntgubZsDfRDBv5Lxj3vkKuvAolysNM2ekwJev8wA==}
-    engines: {node: '>=10'}
-
-  '@curlconverter/yargs@0.0.2':
-    resolution: {integrity: sha512-Q1YEebpCY61kxme4wvU0/IN/uMBfG5pZOKCo9FU+w20ElPvN+eH2qEVbK1C12t3Tee3qeYLLEU6HkiUeO1gc4A==}
-    engines: {node: '>=12'}
-
   '@cypress/request@3.0.1':
     resolution: {integrity: sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==}
     engines: {node: '>= 6'}
@@ -3213,6 +3328,9 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
+  '@emnapi/runtime@1.3.1':
+    resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==}
+
   '@emotion/is-prop-valid@1.2.1':
     resolution: {integrity: sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==}
 
@@ -3394,8 +3512,8 @@ packages:
     resolution: {integrity: sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'}
 
-  '@fastify/busboy@2.0.0':
-    resolution: {integrity: sha512-JUFJad5lv7jxj926GPgymrWQxxjPYuJNiNjNMzqT+HiuP6Vl3dk5xzG+8sTX96np0ZAluvaMzPsjhHZ5rNuNQQ==}
+  '@fastify/busboy@2.1.1':
+    resolution: {integrity: sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==}
     engines: {node: '>=14'}
 
   '@floating-ui/core@1.3.1':
@@ -3538,6 +3656,111 @@ packages:
   '@iconify/utils@2.1.25':
     resolution: {integrity: sha512-Y+iGko8uv/Fz5bQLLJyNSZGOdMW0G7cnlEX1CiNcKsRXX9cq/y/vwxrIAtLCZhKHr3m0VJmsjVPsvnM4uX8YLg==}
 
+  '@img/sharp-darwin-arm64@0.33.5':
+    resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.33.5':
+    resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linux-arm64@0.33.5':
+    resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linux-arm@0.33.5':
+    resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-linux-s390x@0.33.5':
+    resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-linux-x64@0.33.5':
+    resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-wasm32@0.33.5':
+    resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-ia32@0.33.5':
+    resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.33.5':
+    resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
   '@intlify/core-base@9.2.2':
     resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==}
     engines: {node: '>= 14'}
@@ -3665,9 +3888,6 @@ packages:
   '@jridgewell/source-map@0.3.6':
     resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
 
-  '@jridgewell/sourcemap-codec@1.4.15':
-    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
-
   '@jridgewell/sourcemap-codec@1.5.0':
     resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
 
@@ -3717,26 +3937,26 @@ packages:
   '@kwsites/promise-deferred@1.1.1':
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
 
-  '@langchain/anthropic@0.3.8':
-    resolution: {integrity: sha512-7qeRDhNnCf1peAbjY825R2HNszobJeGvqi2cfPl+YsduDIYEGUzfoGRRarPI5joIGX5YshCsch6NFtap2bLfmw==}
+  '@langchain/anthropic@0.3.11':
+    resolution: {integrity: sha512-rYjDZjMwVQ+cYeJd9IoSESdkkG8fc0m3siGRYKNy6qgYMnqCz8sUPKBanXwbZAs6wvspPCGgNK9WONfaCeX97A==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/aws@0.1.2':
-    resolution: {integrity: sha512-1cQvv8XSbaZXceAbYexSm/8WLqfEJ4VF6qbf/XLwkpUKMFGqpSBA00+Bn5p8K/Ms+PyMguZrxVNqd6daqxhDBQ==}
+  '@langchain/aws@0.1.3':
+    resolution: {integrity: sha512-OjS6V/virzRvOX1D2xgTyyHkYzdepjes77dU2bBS53jt4mp0DT8vzgclZQ/16DA20YgNFtMKYiFbOfMI+RTHyg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/cohere@0.3.1':
-    resolution: {integrity: sha512-SD+EwKQAOXsqgs1KHCxhXtorQuG9VCXOTkjOlVQnpOwgqNUtn/IZX/S6bIaMflj0E8RBIze0hBMevm2kp1iyUA==}
+  '@langchain/cohere@0.3.2':
+    resolution: {integrity: sha512-AWUH6DPUnn7jmuFvNMtS0VDL+fW06edQmXFxGvWvIlXFSezqECnV4opni8zCAlWgh5NGSROLtqAZc879dt5TGg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/community@0.3.15':
-    resolution: {integrity: sha512-yG4cv33u7zYar14yqZCI7o2KjwRb+9S7upVzEmVVETimpicm9UjpkMfX4qa4A4IslM1TtC4uy2Ymu9EcINZSpQ==}
+  '@langchain/community@0.3.24':
+    resolution: {integrity: sha512-lHio63Bi5mxO6aMzLfXq5ouo6gKpSs7JWJ3Fi2Sl1fdH0AdCEqQZyLG0Fjinx/T815aPBb8eUIdjUlQIrPE2eA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@arcjet/redact': ^v1.0.0-alpha.23
@@ -3753,6 +3973,7 @@ packages:
       '@azure/search-documents': ^12.0.0
       '@azure/storage-blob': ^12.15.0
       '@browserbasehq/sdk': '*'
+      '@browserbasehq/stagehand': ^1.0.0
       '@clickhouse/client': ^0.2.5
       '@cloudflare/ai': '*'
       '@datastax/astra-db-ts': ^1.0.0
@@ -3766,6 +3987,7 @@ packages:
       '@google-cloud/storage': ^6.10.1 || ^7.7.0
       '@gradientai/nodejs-sdk': ^1.2.0
       '@huggingface/inference': ^2.6.4
+      '@huggingface/transformers': ^3.2.3
       '@ibm-cloud/watsonx-ai': '*'
       '@lancedb/lancedb': ^0.12.0
       '@langchain/core': '>=0.2.21 <0.4.0'
@@ -3795,11 +4017,10 @@ packages:
       '@upstash/ratelimit': ^1.1.3 || ^2.0.3
       '@upstash/redis': ^1.20.6
       '@upstash/vector': ^1.1.1
-      '@vercel/kv': ^0.2.3
-      '@vercel/postgres': ^0.5.0
+      '@vercel/kv': '*'
+      '@vercel/postgres': '*'
       '@writerai/writer-sdk': ^0.40.2
       '@xata.io/client': ^0.28.0
-      '@xenova/transformers': ^2.17.2
       '@zilliz/milvus2-sdk-node': '>=2.3.5'
       apify-client: ^2.7.1
       assemblyai: ^4.6.0
@@ -3820,6 +4041,7 @@ packages:
       duck-duck-scrape: ^2.2.5
       epub2: ^3.0.1
       faiss-node: ^0.5.1
+      fast-xml-parser: '*'
       firebase-admin: ^11.9.0 || ^12.0.0
       google-auth-library: '*'
       googleapis: '*'
@@ -3841,6 +4063,7 @@ packages:
       neo4j-driver: '*'
       notion-to-md: ^3.1.0
       officeparser: ^4.0.4
+      openai: '*'
       pdf-parse: 1.1.1
       pg: ^8.11.0
       pg-copy-streams: ^6.0.5
@@ -3859,9 +4082,9 @@ packages:
       voy-search: 0.6.2
       weaviate-ts-client: '*'
       web-auth-library: ^1.0.3
+      word-extractor: '*'
       ws: '>=8.17.1'
-      youtube-transcript: ^1.0.6
-      youtubei.js: ^9.1.0
+      youtubei.js: '*'
     peerDependenciesMeta:
       '@arcjet/redact':
         optional: true
@@ -3917,6 +4140,8 @@ packages:
         optional: true
       '@huggingface/inference':
         optional: true
+      '@huggingface/transformers':
+        optional: true
       '@lancedb/lancedb':
         optional: true
       '@layerup/layerup-security':
@@ -3979,8 +4204,6 @@ packages:
         optional: true
       '@xata.io/client':
         optional: true
-      '@xenova/transformers':
-        optional: true
       '@zilliz/milvus2-sdk-node':
         optional: true
       apify-client:
@@ -4021,6 +4244,8 @@ packages:
         optional: true
       faiss-node:
         optional: true
+      fast-xml-parser:
+        optional: true
       firebase-admin:
         optional: true
       google-auth-library:
@@ -4097,43 +4322,43 @@ packages:
         optional: true
       web-auth-library:
         optional: true
-      ws:
+      word-extractor:
         optional: true
-      youtube-transcript:
+      ws:
         optional: true
       youtubei.js:
         optional: true
 
-  '@langchain/core@0.3.19':
-    resolution: {integrity: sha512-pJVOAHShefu1SRO8uhzUs0Pexah/Ib66WETLMScIC2w9vXlpwQy3DzXJPJ5X7ixry9N666jYO5cHtM2Z1DnQIQ==}
+  '@langchain/core@0.3.30':
+    resolution: {integrity: sha512-HFUpjJ6FkPSSeLKzCLKxba4VN1DKnrXRmjaWHDb5KUyE9DZrqak3Sh6k2dkzXDJIcdd/uNeeQGFyQnubVEMkPw==}
     engines: {node: '>=18'}
 
-  '@langchain/google-common@0.1.3':
-    resolution: {integrity: sha512-yry0taVC5AUwn55Gc6PTQX2XHLfbh6PAOheatkB77u22bYzLNaKG+DGQR8CRVRS9oZEXuNpXyAV7X2+2wv1w6Q==}
+  '@langchain/google-common@0.1.8':
+    resolution: {integrity: sha512-8auqWw2PMPhcHQHS+nMN3tVZrUPgSLckUaFeOHDOeSBiDvBd4KCybPwyl2oCwMDGvmyIxvOOckkMdeGaJ92vpQ==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/google-gauth@0.1.3':
-    resolution: {integrity: sha512-/FfF/5KNP78gUHLMhyqI9kMlYy7v+uyRddjx0lsiTOGWTZeFhhemmYw4Vbb8ltUSgfyx7/c9M8GryxY9vW5pqA==}
+  '@langchain/google-gauth@0.1.8':
+    resolution: {integrity: sha512-2QK7d5SQMrnSv7X4j05BGfO74hiA8FJuNwSsQKZvzlGoVnNXil3x2aqD5V+zsYOPpxhkDCpNlmh2Pue2Wzy1rQ==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/google-genai@0.1.4':
-    resolution: {integrity: sha512-b8qrqnHYbNseaAikrWyxuDTww6CUIse82F5/BmF2GtWVR25yJrNUWETfTp7o7iIMxhFR0PuQag4gEZOL74F5Tw==}
+  '@langchain/google-genai@0.1.6':
+    resolution: {integrity: sha512-LF3fan9pvgFa1vw2/IYGhi5KjppE0OvPFX3QQBUshBLpXWERP+BSpSD7jcXyqm9Kf7DcFj7w5/2knKeEwih8Xg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.3.17 <0.4.0'
 
-  '@langchain/google-vertexai@0.1.3':
-    resolution: {integrity: sha512-AOvojzPiKKv1gZiH9tBYPBcZ3nOCuQAQsh4a/djYmlwjcA5bIb/teOa9eFZVTB83L2eM1U5steZF4nwQHnIIvw==}
+  '@langchain/google-vertexai@0.1.8':
+    resolution: {integrity: sha512-n06ohihopz38agOm7BTASHMmFLz+XAZlzEvqtPC4Qa1fhYhzETQg2gCzEapIJ1yVk5MhrWqwKnVOQ+tIsFE88Q==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/groq@0.1.2':
-    resolution: {integrity: sha512-bgQ9yGoNHOwG6LG2ngGvSNxF/1U1c1u3vKmFWmzecFIcBoQQOJY0jb0MrL3g1uTife0Sr3zxkWKXQg2aK/U4Sg==}
+  '@langchain/groq@0.1.3':
+    resolution: {integrity: sha512-dMzvBVaLf/0IQoHdAOAN8W/PbOcwgbvgUMCn02CqvCC90mxZ45LI0Tipzqnoaam0hiKALR5hLc3dNj1oCYV92w==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
@@ -4144,17 +4369,17 @@ packages:
     peerDependencies:
       '@langchain/core': '>=0.3.7 <0.4.0'
 
-  '@langchain/ollama@0.1.2':
-    resolution: {integrity: sha512-WCeogCFjdWf6jGwLt12cxkSpm5eVamv43b48DIlbJ4np9vChwVlZZB6FU7uEXNrJ9c0dsoa6877hJ5mYHdbJvw==}
+  '@langchain/ollama@0.1.4':
+    resolution: {integrity: sha512-olHPViUurGcmOI3IbhIGK/EJ7QxDlZru4j98V269PiEFTIVlciRULltgI/t3voHYTdvB8R+HV8pMo/Y3UVzvzA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/openai@0.3.14':
-    resolution: {integrity: sha512-lNWjUo1tbvsss45IF7UQtMu1NJ6oUKvhgPYWXnX9f/d6OmuLu7D99HQ3Y88vLcUo9XjjOy417olYHignMduMjA==}
+  '@langchain/openai@0.3.17':
+    resolution: {integrity: sha512-uw4po32OKptVjq+CYHrumgbfh4NuD7LqyE+ZgqY9I/LrLc6bHLMc+sisHmI17vgek0K/yqtarI0alPJbzrwyag==}
     engines: {node: '>=18'}
     peerDependencies:
-      '@langchain/core': '>=0.2.26 <0.4.0'
+      '@langchain/core': '>=0.3.29 <0.4.0'
 
   '@langchain/pinecone@0.1.3':
     resolution: {integrity: sha512-1DPZvkg3Ve1TJSUfmpf7GF2SvRyg8cLjKjffkuW/C3oPONti2a9W7Q+F18YgBf1Swk0bPJ7A1EtMvlsU+NOQmw==}
@@ -4275,6 +4500,10 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@mswjs/interceptors@0.37.5':
+    resolution: {integrity: sha512-AAwRb5vXFcY4L+FvZ7LZusDuZ0vEe0Zm8ohn1FM6/X7A3bj4mqmkAcGRWuvC2JwSygNwHAAmMnAI73vPHeqsHA==}
+    engines: {node: '>=18'}
+
   '@n8n/codemirror-lang-sql@1.0.2':
     resolution: {integrity: sha512-sOf/KyewSu3Ikij0CkRtzJJDhRDZcwNCEYl8UdH4U/riL0/XZGcBD7MYofCCcKszanJZiEWRZ2KU1sRp234iMg==}
 
@@ -4363,8 +4592,8 @@ packages:
     resolution: {integrity: sha512-16kftFTeX3/lBinHJaBK0OL1lB4FpPaUoHX4h25AkvgHvmjUHpWNY2ZtKos0rY89+pkzDsNxMZqSUkeKU45iRg==}
     engines: {node: '>=20.15', pnpm: '>=8.14'}
 
-  '@n8n_io/license-sdk@2.13.1':
-    resolution: {integrity: sha512-R6min21m3OlZHYMpeT+8uuB5v4FG3rC00fvRNbVKzNEqNAvfF1dPm6i1fliy5sGKCQ6sh71kjQ9JgE7lRRzJDg==}
+  '@n8n_io/license-sdk@2.15.1':
+    resolution: {integrity: sha512-z7gf0sDpJ8R6JqS05yqSbOFBCV54d8zSne6xbGrpyKoWs0EpCzCBia3YTfYbULi8m+d6JfqnRTiqFQPa1VZpkg==}
     engines: {node: '>=18.12.1'}
 
   '@n8n_io/riot-tmpl@4.0.0':
@@ -4403,22 +4632,23 @@ packages:
   '@one-ini/wasm@0.1.1':
     resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
 
-  '@opentelemetry/api-logs@0.52.1':
-    resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
-    engines: {node: '>=14'}
+  '@open-draft/deferred-promise@2.2.0':
+    resolution: {integrity: sha512-CecwLWx3rhxVQF6V4bAgPS5t+So2sTbPgAzafKkVizyi7tlwpcFpdFqq+wqF2OwNBmqFuu6tOyouTuxgpMfzmA==}
+
+  '@open-draft/logger@0.3.0':
+    resolution: {integrity: sha512-X2g45fzhxH238HKO4xbSr7+wBS8Fvw6ixhTDuvLd5mqh6bJJCFAPwU9mPDxbcrRtfxv4u5IHCEH77BmxvXmmxQ==}
+
+  '@open-draft/until@2.1.0':
+    resolution: {integrity: sha512-U69T3ItWHvLwGg5eJ0n3I62nWuE6ilHlmz7zM0npLBRvPRd7e6NYmg54vvRtP5mZG7kZqZCFVdsTWo7BPtBujg==}
 
   '@opentelemetry/api-logs@0.53.0':
     resolution: {integrity: sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==}
     engines: {node: '>=14'}
 
-  '@opentelemetry/api-logs@0.54.2':
-    resolution: {integrity: sha512-4MTVwwmLgUh5QrJnZpYo6YRO5IBLAggf2h8gWDblwRagDStY13aEvt7gGk3jewrMaPlHiF83fENhIx0HO97/cQ==}
+  '@opentelemetry/api-logs@0.56.0':
+    resolution: {integrity: sha512-Wr39+94UNNG3Ei9nv3pHd4AJ63gq5nSemMRpCd8fPwDL9rN3vK26lzxfH27mw16XzOSO+TpyQwBAMaLxaPWG0g==}
     engines: {node: '>=14'}
 
-  '@opentelemetry/api@1.2.0':
-    resolution: {integrity: sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==}
-    engines: {node: '>=8.0.0'}
-
   '@opentelemetry/api@1.9.0':
     resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
     engines: {node: '>=8.0.0'}
@@ -4429,176 +4659,164 @@ packages:
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/core@1.26.0':
-    resolution: {integrity: sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': '>=1.0.0 <1.10.0'
-
   '@opentelemetry/core@1.29.0':
     resolution: {integrity: sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': '>=1.0.0 <1.10.0'
 
-  '@opentelemetry/instrumentation-amqplib@0.43.0':
-    resolution: {integrity: sha512-ALjfQC+0dnIEcvNYsbZl/VLh7D2P1HhFF4vicRKHhHFIUV3Shpg4kXgiek5PLhmeKSIPiUB25IYH5RIneclL4A==}
+  '@opentelemetry/instrumentation-amqplib@0.45.0':
+    resolution: {integrity: sha512-SlKLsOS65NGMIBG1Lh/hLrMDU9WzTUF25apnV6ZmWZB1bBmUwan7qrwwrTu1cL5LzJWCXOdZPuTaxP7pC9qxnQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-connect@0.40.0':
-    resolution: {integrity: sha512-3aR/3YBQ160siitwwRLjwqrv2KBT16897+bo6yz8wIfel6nWOxTZBJudcbsK3p42pTC7qrbotJ9t/1wRLpv79Q==}
+  '@opentelemetry/instrumentation-connect@0.42.0':
+    resolution: {integrity: sha512-bOoYHBmbnq/jFaLHmXJ55VQ6jrH5fHDMAPjFM0d3JvR0dvIqW7anEoNC33QqYGFYUfVJ50S0d/eoyF61ALqQuA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-dataloader@0.12.0':
-    resolution: {integrity: sha512-pnPxatoFE0OXIZDQhL2okF//dmbiWFzcSc8pUg9TqofCLYZySSxDCgQc69CJBo5JnI3Gz1KP+mOjS4WAeRIH4g==}
+  '@opentelemetry/instrumentation-dataloader@0.15.0':
+    resolution: {integrity: sha512-5fP35A2jUPk4SerVcduEkpbRAIoqa2PaP5rWumn01T1uSbavXNccAr3Xvx1N6xFtZxXpLJq4FYqGFnMgDWgVng==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-express@0.44.0':
-    resolution: {integrity: sha512-GWgibp6Q0wxyFaaU8ERIgMMYgzcHmGrw3ILUtGchLtLncHNOKk0SNoWGqiylXWWT4HTn5XdV8MGawUgpZh80cA==}
+  '@opentelemetry/instrumentation-express@0.46.0':
+    resolution: {integrity: sha512-BCEClDj/HPq/1xYRAlOr6z+OUnbp2eFp18DSrgyQz4IT9pkdYk8eWHnMi9oZSqlC6J5mQzkFmaW5RrKb1GLQhg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-fastify@0.41.0':
-    resolution: {integrity: sha512-pNRjFvf0mvqfJueaeL/qEkuGJwgtE5pgjIHGYwjc2rMViNCrtY9/Sf+Nu8ww6dDd/Oyk2fwZZP7i0XZfCnETrA==}
+  '@opentelemetry/instrumentation-fastify@0.43.0':
+    resolution: {integrity: sha512-Lmdsg7tYiV+K3/NKVAQfnnLNGmakUOFdB0PhoTh2aXuSyCmyNnnDvhn2MsArAPTZ68wnD5Llh5HtmiuTkf+DyQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-fs@0.16.0':
-    resolution: {integrity: sha512-hMDRUxV38ln1R3lNz6osj3YjlO32ykbHqVrzG7gEhGXFQfu7LJUx8t9tEwE4r2h3CD4D0Rw4YGDU4yF4mP3ilg==}
+  '@opentelemetry/instrumentation-fs@0.18.0':
+    resolution: {integrity: sha512-kC40y6CEMONm8/MWwoF5GHWIC7gOdF+g3sgsjfwJaUkgD6bdWV+FgG0XApqSbTQndICKzw3RonVk8i7s6mHqhA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-generic-pool@0.39.0':
-    resolution: {integrity: sha512-y4v8Y+tSfRB3NNBvHjbjrn7rX/7sdARG7FuK6zR8PGb28CTa0kHpEGCJqvL9L8xkTNvTXo+lM36ajFGUaK1aNw==}
+  '@opentelemetry/instrumentation-generic-pool@0.42.0':
+    resolution: {integrity: sha512-J4QxqiQ1imtB9ogzsOnHra0g3dmmLAx4JCeoK3o0rFes1OirljNHnO8Hsj4s1jAir8WmWvnEEQO1y8yk6j2tog==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-graphql@0.44.0':
-    resolution: {integrity: sha512-FYXTe3Bv96aNpYktqm86BFUTpjglKD0kWI5T5bxYkLUPEPvFn38vWGMJTGrDMVou/i55E4jlWvcm6hFIqLsMbg==}
+  '@opentelemetry/instrumentation-graphql@0.46.0':
+    resolution: {integrity: sha512-tplk0YWINSECcK89PGM7IVtOYenXyoOuhOQlN0X0YrcDUfMS4tZMKkVc0vyhNWYYrexnUHwNry2YNBNugSpjlQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-hapi@0.41.0':
-    resolution: {integrity: sha512-jKDrxPNXDByPlYcMdZjNPYCvw0SQJjN+B1A+QH+sx+sAHsKSAf9hwFiJSrI6C4XdOls43V/f/fkp9ITkHhKFbQ==}
+  '@opentelemetry/instrumentation-hapi@0.44.0':
+    resolution: {integrity: sha512-4HdNIMNXWK1O6nsaQOrACo83QWEVoyNODTdVDbUqtqXiv2peDfD0RAPhSQlSGWLPw3S4d9UoOmrV7s2HYj6T2A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-http@0.53.0':
-    resolution: {integrity: sha512-H74ErMeDuZfj7KgYCTOFGWF5W9AfaPnqLQQxeFq85+D29wwV2yqHbz2IKLYpkOh7EI6QwDEl7rZCIxjJLyc/CQ==}
+  '@opentelemetry/instrumentation-http@0.56.0':
+    resolution: {integrity: sha512-/bWHBUAq8VoATnH9iLk5w8CE9+gj+RgYSUphe7hry472n6fYl7+4PvuScoQMdmSUTprKq/gyr2kOWL6zrC7FkQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-ioredis@0.43.0':
-    resolution: {integrity: sha512-i3Dke/LdhZbiUAEImmRG3i7Dimm/BD7t8pDDzwepSvIQ6s2X6FPia7561gw+64w+nx0+G9X14D7rEfaMEmmjig==}
+  '@opentelemetry/instrumentation-ioredis@0.46.0':
+    resolution: {integrity: sha512-sOdsq8oGi29V58p1AkefHvuB3l2ymP1IbxRIX3y4lZesQWKL8fLhBmy8xYjINSQ5gHzWul2yoz7pe7boxhZcqQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-kafkajs@0.4.0':
-    resolution: {integrity: sha512-I9VwDG314g7SDL4t8kD/7+1ytaDBRbZQjhVaQaVIDR8K+mlsoBhLsWH79yHxhHQKvwCSZwqXF+TiTOhoQVUt7A==}
+  '@opentelemetry/instrumentation-kafkajs@0.6.0':
+    resolution: {integrity: sha512-MGQrzqEUAl0tacKJUFpuNHJesyTi51oUzSVizn7FdvJplkRIdS11FukyZBZJEscofSEdk7Ycmg+kNMLi5QHUFg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-knex@0.41.0':
-    resolution: {integrity: sha512-OhI1SlLv5qnsnm2dOVrian/x3431P75GngSpnR7c4fcVFv7prXGYu29Z6ILRWJf/NJt6fkbySmwdfUUnFnHCTg==}
+  '@opentelemetry/instrumentation-knex@0.43.0':
+    resolution: {integrity: sha512-mOp0TRQNFFSBj5am0WF67fRO7UZMUmsF3/7HSDja9g3H4pnj+4YNvWWyZn4+q0rGrPtywminAXe0rxtgaGYIqg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-koa@0.43.0':
-    resolution: {integrity: sha512-lDAhSnmoTIN6ELKmLJBplXzT/Jqs5jGZehuG22EdSMaTwgjMpxMDI1YtlKEhiWPWkrz5LUsd0aOO0ZRc9vn3AQ==}
+  '@opentelemetry/instrumentation-koa@0.46.0':
+    resolution: {integrity: sha512-RcWXMQdJQANnPUaXbHY5G0Fg6gmleZ/ZtZeSsekWPaZmQq12FGk0L1UwodIgs31OlYfviAZ4yTeytoSUkgo5vQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-lru-memoizer@0.40.0':
-    resolution: {integrity: sha512-21xRwZsEdMPnROu/QsaOIODmzw59IYpGFmuC4aFWvMj6stA8+Ei1tX67nkarJttlNjoM94um0N4X26AD7ff54A==}
+  '@opentelemetry/instrumentation-lru-memoizer@0.43.0':
+    resolution: {integrity: sha512-fZc+1eJUV+tFxaB3zkbupiA8SL3vhDUq89HbDNg1asweYrEb9OlHIB+Ot14ZiHUc1qCmmWmZHbPTwa56mVVwzg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mongodb@0.48.0':
-    resolution: {integrity: sha512-9YWvaGvrrcrydMsYGLu0w+RgmosLMKe3kv/UNlsPy8RLnCkN2z+bhhbjjjuxtUmvEuKZMCoXFluABVuBr1yhjw==}
+  '@opentelemetry/instrumentation-mongodb@0.50.0':
+    resolution: {integrity: sha512-DtwJMjYFXFT5auAvv8aGrBj1h3ciA/dXQom11rxL7B1+Oy3FopSpanvwYxJ+z0qmBrQ1/iMuWELitYqU4LnlkQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mongoose@0.42.0':
-    resolution: {integrity: sha512-AnWv+RaR86uG3qNEMwt3plKX1ueRM7AspfszJYVkvkehiicC3bHQA6vWdb6Zvy5HAE14RyFbu9+2hUUjR2NSyg==}
+  '@opentelemetry/instrumentation-mongoose@0.45.0':
+    resolution: {integrity: sha512-zHgNh+A01C5baI2mb5dAGyMC7DWmUpOfwpV8axtC0Hd5Uzqv+oqKgKbVDIVhOaDkPxjgVJwYF9YQZl2pw2qxIA==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mysql2@0.41.0':
-    resolution: {integrity: sha512-REQB0x+IzVTpoNgVmy5b+UnH1/mDByrneimP6sbDHkp1j8QOl1HyWOrBH/6YWR0nrbU3l825Em5PlybjT3232g==}
+  '@opentelemetry/instrumentation-mysql2@0.44.0':
+    resolution: {integrity: sha512-e9QY4AGsjGFwmfHd6kBa4yPaQZjAq2FuxMb0BbKlXCAjG+jwqw+sr9xWdJGR60jMsTq52hx3mAlE3dUJ9BipxQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-mysql@0.41.0':
-    resolution: {integrity: sha512-jnvrV6BsQWyHS2qb2fkfbfSb1R/lmYwqEZITwufuRl37apTopswu9izc0b1CYRp/34tUG/4k/V39PND6eyiNvw==}
+  '@opentelemetry/instrumentation-mysql@0.44.0':
+    resolution: {integrity: sha512-al7jbXvT/uT1KV8gdNDzaWd5/WXf+mrjrsF0/NtbnqLa0UUFGgQnoK3cyborgny7I+KxWhL8h7YPTf6Zq4nKsg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-nestjs-core@0.40.0':
-    resolution: {integrity: sha512-WF1hCUed07vKmf5BzEkL0wSPinqJgH7kGzOjjMAiTGacofNXjb/y4KQ8loj2sNsh5C/NN7s1zxQuCgbWbVTGKg==}
+  '@opentelemetry/instrumentation-nestjs-core@0.43.0':
+    resolution: {integrity: sha512-NEo4RU7HTjiaXk3curqXUvCb9alRiFWxQY//+hvDXwWLlADX2vB6QEmVCeEZrKO+6I/tBrI4vNdAnbCY9ldZVg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-pg@0.44.0':
-    resolution: {integrity: sha512-oTWVyzKqXud1BYEGX1loo2o4k4vaU1elr3vPO8NZolrBtFvQ34nx4HgUaexUDuEog00qQt+MLR5gws/p+JXMLQ==}
+  '@opentelemetry/instrumentation-pg@0.49.0':
+    resolution: {integrity: sha512-3alvNNjPXVdAPdY1G7nGRVINbDxRK02+KAugDiEpzw0jFQfU8IzFkSWA4jyU4/GbMxKvHD+XIOEfSjpieSodKw==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-redis-4@0.42.0':
-    resolution: {integrity: sha512-NaD+t2JNcOzX/Qa7kMy68JbmoVIV37fT/fJYzLKu2Wwd+0NCxt+K2OOsOakA8GVg8lSpFdbx4V/suzZZ2Pvdjg==}
+  '@opentelemetry/instrumentation-redis-4@0.45.0':
+    resolution: {integrity: sha512-Sjgym1xn3mdxPRH5CNZtoz+bFd3E3NlGIu7FoYr4YrQouCc9PbnmoBcmSkEdDy5LYgzNildPgsjx9l0EKNjKTQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-tedious@0.15.0':
-    resolution: {integrity: sha512-Kb7yo8Zsq2TUwBbmwYgTAMPK0VbhoS8ikJ6Bup9KrDtCx2JC01nCb+M0VJWXt7tl0+5jARUbKWh5jRSoImxdCw==}
+  '@opentelemetry/instrumentation-tedious@0.17.0':
+    resolution: {integrity: sha512-yRBz2409an03uVd1Q2jWMt3SqwZqRFyKoWYYX3hBAtPDazJ4w5L+1VOij71TKwgZxZZNdDBXImTQjii+VeuzLg==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation-undici@0.6.0':
-    resolution: {integrity: sha512-ABJBhm5OdhGmbh0S/fOTE4N69IZ00CsHC5ijMYfzbw3E5NwLgpQk5xsljaECrJ8wz1SfXbO03FiSuu5AyRAkvQ==}
+  '@opentelemetry/instrumentation-undici@0.9.0':
+    resolution: {integrity: sha512-lxc3cpUZ28CqbrWcUHxGW/ObDpMOYbuxF/ZOzeFZq54P9uJ2Cpa8gcrC9F716mtuiMaekwk8D6n34vg/JtkkxQ==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.7.0
 
-  '@opentelemetry/instrumentation@0.52.1':
-    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@opentelemetry/api': ^1.3.0
-
   '@opentelemetry/instrumentation@0.53.0':
     resolution: {integrity: sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
 
-  '@opentelemetry/instrumentation@0.54.2':
-    resolution: {integrity: sha512-go6zpOVoZVztT9r1aPd79Fr3OWiD4N24bCPJsIKkBses8oyFo12F/Ew3UBTdIu6hsW4HC4MVEJygG6TEyJI/lg==}
+  '@opentelemetry/instrumentation@0.56.0':
+    resolution: {integrity: sha512-2KkGBKE+FPXU1F0zKww+stnlUxUTlBvLCiWdP63Z9sqXYeNI/ziNzsxAp4LAdUcTQmXjw1IWgvm5CAb/BHy99w==}
     engines: {node: '>=14'}
     peerDependencies:
       '@opentelemetry/api': ^1.3.0
@@ -4661,8 +4879,13 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
-  '@prisma/instrumentation@5.19.1':
-    resolution: {integrity: sha512-VLnzMQq7CWroL5AeaW0Py2huiNKeoMfCH3SUxstdzPrlWQi6UQ9UrfcbUkNHlVFqOMacqy8X/8YtE0kuKDpD9w==}
+  '@playwright/test@1.49.1':
+    resolution: {integrity: sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@prisma/instrumentation@5.22.0':
+    resolution: {integrity: sha512-LxccF392NN37ISGxIurUljZSh1YWnphO34V5a0+T7FVQG2u9bhAXRTJpgmQ3483woVhkraQZFF7cbRrpbw/F4Q==}
 
   '@protobufjs/aspromise@1.1.2':
     resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
@@ -4903,23 +5126,23 @@ packages:
     resolution: {integrity: sha512-3SS41suXLFzxL3OQvTMZ6q92ZapELVq2l2SoWlZopcamWhog2Ru0dp2vkunq97kFHb2TzKRTlFH4+4gbT8SJug==}
     engines: {node: '>=14.18'}
 
-  '@sentry/core@8.42.0':
-    resolution: {integrity: sha512-ac6O3pgoIbU6rpwz6LlwW0wp3/GAHuSI0C5IsTgIY6baN8rOBnlAtG6KrHDDkGmUQ2srxkDJu9n1O6Td3cBCqw==}
+  '@sentry/core@8.52.1':
+    resolution: {integrity: sha512-FG0P9I03xk4jBI4O7NBkw8uqLGH9/RWOSFoRH3eYvUTyBLhkk9IaCFbAAGBNZhojky8T7gqYwnuRbFNlrAiuSA==}
     engines: {node: '>=14.18'}
 
-  '@sentry/node@8.42.0':
-    resolution: {integrity: sha512-MsNrmAIwDaxf1jTX1FsgZ+3mUq6G6IuU6FAqyp7TDnvUTsbWUtr0OM6EvVUz0zCImybIh9dcTQ+6KTmUyA7URw==}
+  '@sentry/node@8.52.1':
+    resolution: {integrity: sha512-we9fIfn5Q0c6U4VPrXhNtJ7uz5HkTlnOQV7hP/GG09tmKa6hrL20tkhCosObl3XZ/qlIbD/GQMv4WmhOgNzgkQ==}
     engines: {node: '>=14.18'}
 
-  '@sentry/opentelemetry@8.42.0':
-    resolution: {integrity: sha512-QPb9kMFgl35TIwIz0u+BFTbPG461CofMiloidJ44GFZ9cB33T5cB0oIN7ut/5tsH/AvqUmucydsV/Nj3HNQx9g==}
+  '@sentry/opentelemetry@8.52.1':
+    resolution: {integrity: sha512-xaGm/KlfFi3yxK6PP+IRLnvfnd8Hp3yvJIdp3Mvc2aHW1Dh7zz+VTNNmWFZQmAbWrNqIoqZG2s1tZOeJwMHPpg==}
     engines: {node: '>=14.18'}
     peerDependencies:
       '@opentelemetry/api': ^1.9.0
-      '@opentelemetry/core': ^1.25.1
-      '@opentelemetry/instrumentation': ^0.54.0
-      '@opentelemetry/sdk-trace-base': ^1.26.0
-      '@opentelemetry/semantic-conventions': ^1.27.0
+      '@opentelemetry/core': ^1.29.0
+      '@opentelemetry/instrumentation': ^0.56.0
+      '@opentelemetry/sdk-trace-base': ^1.29.0
+      '@opentelemetry/semantic-conventions': ^1.28.0
 
   '@sentry/types@8.33.1':
     resolution: {integrity: sha512-GjoAMvwtpIemoF/IiwZ7A60g4nQv3qwzR21GvJqDVUoKD0e8pv9OLX+HyXoUat4wEDGSuDUcUyUKD2G+od73QA==}
@@ -5249,118 +5472,118 @@ packages:
   '@sqltools/formatter@1.2.5':
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
 
-  '@storybook/addon-a11y@8.4.6':
-    resolution: {integrity: sha512-Z6x/yfStplSROgmBTtiJ8LJgTqPgzW3Q7KXi+l+KoZ0pht6Nz9cYfcyygLCaftBk1ZaL7SDDIrjCP0H1NwfYiQ==}
+  '@storybook/addon-a11y@8.5.0':
+    resolution: {integrity: sha512-dTKlnhOaDsAXxkmHz7m6/qb98IENoaXTCG3fXo2iwJ1xT27fZF+i8fz8oQprLAN5r7xlnz66ARJvEIKJ+Lxjgw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-actions@8.4.6':
-    resolution: {integrity: sha512-vbplwjMj7UXbdzoFhQkqFHLQAPJX8OVGTM9Q+yjuWDHViaKKUlgRWp0jclT7aIDNJQU2a6wJbTimHgJeF16Vhg==}
+  '@storybook/addon-actions@8.5.0':
+    resolution: {integrity: sha512-6CW9+17rk5eNx6I8EKqCxRKtsJFTR/lHL+xiJ6/iBWApIm8sg63vhXvUTJ58UixmIkT5oLh0+ESNPh+x10D8fw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-backgrounds@8.4.6':
-    resolution: {integrity: sha512-RSjJ3iElxlQXebZrz1s5LeoLpAXr9LAGifX7w0abMzN5sg6QSwNeUHko2eT3V57M3k1Fa/5Eelso/QBQifFEog==}
+  '@storybook/addon-backgrounds@8.5.0':
+    resolution: {integrity: sha512-lzyFLs7niNsqlhH5kdUrp7htLiMIcjY50VLWe0PaeJ6T6GZ7X9qhQzROAUV6cGqzyd8A6y/LzIUntDPMVEm/6g==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-controls@8.4.6':
-    resolution: {integrity: sha512-70pEGWh0C2g8s0DYsISElOzsMbQS6p/K9iU5EqfotDF+hvEqstjsV/bTbR5f3OK4vR/7Gxamk7j8RVd14Nql6A==}
+  '@storybook/addon-controls@8.5.0':
+    resolution: {integrity: sha512-1fivx77A/ahObrPl0L66o9i9MUNfqXxsrpekne5gjMNXw9XJFIRNUe/ddL4CMmwu7SgVbj2QV+q5E5mlnZNTJw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-docs@8.4.6':
-    resolution: {integrity: sha512-olxz61W7PW/EsXrKhLrYbI3rn9GMBhY3KIOF/6tumbRkh0Siu/qe4EAImaV9NNwiC1R7+De/1OIVMY6o0EIZVw==}
+  '@storybook/addon-docs@8.5.0':
+    resolution: {integrity: sha512-REwLSr1VgOVNJZwP3y3mldhOjBHlM5fqTvq/tC8NaYpAzx9O4rZdoUSZxW3tYtoNoYrHpB8kzRTeZl8WSdKllw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-essentials@8.4.6':
-    resolution: {integrity: sha512-TbFqyvWFUKw8LBpVcZuGQydzVB/3kSuHxDHi+Wj3Qas3cxBl7+w4/HjwomT2D2Tni1dZ1uPDOsAtNLmwp1POsg==}
+  '@storybook/addon-essentials@8.5.0':
+    resolution: {integrity: sha512-RrHRdaw2j3ugZiYQ6OHt3Ff08ID4hwAvipqULEsbEnEw3VlXOaW/MT5e2M7kW3MHskQ3iJ6XAD1Y1rNm432Pzw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-highlight@8.4.6':
-    resolution: {integrity: sha512-m8wedbqDMbwkP99dNHkHAiAUkx5E7FEEEyLPX1zfkhZWOGtTkavXHH235SGp50zD75LQ6eC/BvgegrzxSQa9Wg==}
+  '@storybook/addon-highlight@8.5.0':
+    resolution: {integrity: sha512-/JxYzMK5aJSYs0K/0eAEFyER2dMoxqwM891MdnkNwLFdyrM58lzHee00F9oEX6zeQoRUNQPRepq0ui2PvbTMGw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-interactions@8.4.6':
-    resolution: {integrity: sha512-sR2oUSYIGUoAdrHT+fM1zgykhad98bsJ11c79r7HfBMXEPWc1yRcjIMmz8Xz06FMROMfebqduYDf60V++/I0Jw==}
+  '@storybook/addon-interactions@8.5.0':
+    resolution: {integrity: sha512-vX1a8qS7o/W3kEzfL/CqOj/Rr6UlGLT/n0KXMpfIhx63tzxe1a1qGpFLL0h0zqAVPHZIOu9humWMKri5Iny6oA==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-links@8.4.6':
-    resolution: {integrity: sha512-1KoG9ytEWWwdF/dheu1O0dayQTMsHw++Qk8afqw7bwW1Cxz5LuAJH5ZscFWMiE5f4Xq1NgaJdeAUaIavyoOcdg==}
+  '@storybook/addon-links@8.5.0':
+    resolution: {integrity: sha512-Y11GIByAYqn0TibI/xsy0vCe+ZxJS9PVAAoHngLxkf9J4WodAXcJABr8ZPlWDNdaEhSS/FF7UQUmNag0UC2/pw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.4.6
+      storybook: ^8.5.0
     peerDependenciesMeta:
       react:
         optional: true
 
-  '@storybook/addon-measure@8.4.6':
-    resolution: {integrity: sha512-N2IRpr39g5KpexCAS1vIHJT+phc9Yilwm3PULds2rQ66VMTbkxobXJDdt0NS05g5n9/eDniroNQwdCeLg4tkpw==}
+  '@storybook/addon-measure@8.5.0':
+    resolution: {integrity: sha512-e8pJy2sICyj0Ff0W1PFc6HPE6PqcjnnHtfuDaO3M9uSKJLYkpTWJ8i1VSP178f8seq44r5/PdQCHqs5q5l3zgw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-outline@8.4.6':
-    resolution: {integrity: sha512-EhcWx8OpK85HxQulLWzpWUHEwQpDYuAiKzsFj9ivAbfeljkIWNTG04mierfaH1xX016uL9RtLJL/zwBS5ChnFg==}
+  '@storybook/addon-outline@8.5.0':
+    resolution: {integrity: sha512-r12sk1b38Ph6NroWAOTfjbJ/V+gDobm7tKQQlbSDf6fgX7cqyPHmKjfNDCOCQpXouZm/Jm+41zd758PW+Yt4ng==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-themes@8.4.6':
-    resolution: {integrity: sha512-0Eyh7jxxQ8hc7KIO2bJF8BKY1CRJ9zPo2DKoRiUKDoSGSP8qdlj4V/ks892GcUffdhTjoFAJCRzG7Ff+TnVKrA==}
+  '@storybook/addon-themes@8.5.0':
+    resolution: {integrity: sha512-pBNut4sLfcOeLBvWdNAJ3cxv/BfMSTmJcUtSzE4G+1pVNsBbGF+T2f/GM0IjaM0K8Ft03VDzeEAB64nluDS4RA==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-toolbars@8.4.6':
-    resolution: {integrity: sha512-+Xao/uGa8FnYsyUiREUkYXWNysm3Aba8tL/Bwd+HufHtdiKJGa9lrXaC7VLCqBUaEjwqM3aaPwqEWIROsthmPQ==}
+  '@storybook/addon-toolbars@8.5.0':
+    resolution: {integrity: sha512-q3yYYO2WX8K2DYNM++FzixGDjzYaeREincgsl2WXYXrcuGb5hkOoOgRiAQL8Nz9NQ1Eo+B/yZxrhG/5VoVhUUQ==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/addon-viewport@8.4.6':
-    resolution: {integrity: sha512-BuQll5YzOCpMS7p5Rsw9wcmi8hTnEKyg6+qAbkZNfiZ2JhXCa1GFUqX725fF1whpYVQULtkQxU8r+vahoRn7Yg==}
+  '@storybook/addon-viewport@8.5.0':
+    resolution: {integrity: sha512-MlhVELImk9YzjEgGR2ciLC8d5tUSGcO7my4kWIClN0VyTRcvG4ZfwrsEC+jN3/l52nrgjLmKrDX5UAGZm6w5mQ==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/blocks@8.4.6':
-    resolution: {integrity: sha512-Gzbx8hM7ZQIHlQELcFIMbY1v+r1Po4mlinq0QVPtKS4lBcW4eZIsesbxOaL+uFNrxb583TLFzXo0DbRPzS46sg==}
+  '@storybook/blocks@8.5.0':
+    resolution: {integrity: sha512-2sTOgjH/JFOgWnpqkKjpKVvKAgUaC9ZBjH1gnCoA5dne/SDafYaCAYfv6yZn7g2Xm1sTxWCAmMIUkYSALeWr+w==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.4.6
+      storybook: ^8.5.0
     peerDependenciesMeta:
       react:
         optional: true
       react-dom:
         optional: true
 
-  '@storybook/builder-vite@8.4.6':
-    resolution: {integrity: sha512-PyJsaEPyuRFFEplpNUi+nbuJd7d1DC2dAZjpsaHTXyqg5iPIbkIgsbCJLUDeIXnUDqM/utjmMpN0sQKJuhIc6w==}
+  '@storybook/builder-vite@8.5.0':
+    resolution: {integrity: sha512-GVJFjAxX/mL3bmXX6N619ShuYprkh6Ix08JU6QGNf/tTkG92BxjgCqQdfovBrviDhFyO2bhkdlEp6ujMo5CbZA==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
       vite: ^4.0.0 || ^5.0.0 || ^6.0.0
 
-  '@storybook/components@8.4.6':
-    resolution: {integrity: sha512-9tKSJJCyFT5RZMRGyozTBJkr9C9Yfk1nuOE9XbDEE1Z+3/IypKR9+iwc5mfNBStDNY+rxtYWNLKBb5GPR2yhzA==}
+  '@storybook/components@8.5.0':
+    resolution: {integrity: sha512-DhaHtwfEcfWYj3ih/5RBSDHe3Idxyf+oHw2/DmaLKJX6MluhdK3ZqigjRcTmA9Gj/SbR4CkHEEtDzAvBlW0BYw==}
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/core@8.4.6':
-    resolution: {integrity: sha512-WeojVtHy0/t50tzw/15S+DLzKsj8BN9yWdo3vJMvm+nflLFvfq1XvD9WGOWeaFp8E/o3AP+4HprXG0r42KEJtA==}
+  '@storybook/core@8.5.0':
+    resolution: {integrity: sha512-apborO6ynns7SeydBSqE9o0zT6JSU+VY4gLFPJROGcconvSW4bS5xtJCsgjlulceyWVxepFHGXl4jEZw+SktXA==}
     peerDependencies:
       prettier: ^2 || ^3
     peerDependenciesMeta:
       prettier:
         optional: true
 
-  '@storybook/csf-plugin@8.4.6':
-    resolution: {integrity: sha512-JDIT0czC4yMgKGNf39KTZr3zm5MusAZdn6LBrTfvWb7CrTCR4iVHa4lp2yb7EJk41vHsBec0QUYDDuiFH/vV0g==}
+  '@storybook/csf-plugin@8.5.0':
+    resolution: {integrity: sha512-cs6ogviNyLG1h9J8Sb47U3DqIrQmn2EHm4ta3fpCeV3ABbrMgbzYyxtmybz4g/AwlDgjAZAt6PPcXkfCJ6p2CQ==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/csf@0.1.11':
-    resolution: {integrity: sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==}
+  '@storybook/csf@0.1.12':
+    resolution: {integrity: sha512-9/exVhabisyIVL0VxTCxo01Tdm8wefIXKXfltAPTSr8cbLn5JAxGQ6QV3mjdecLGEOucfoVhAKtJfVHxEK1iqw==}
 
   '@storybook/global@5.0.0':
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
@@ -5372,50 +5595,50 @@ packages:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/instrumenter@8.4.6':
-    resolution: {integrity: sha512-snXjlgbp065A6KoK9zkjBYEIMCSlN5JefPKzt1FC0rbcbtahhD+iPpqISKhDSczwgOku/JVhVUDp/vU7AIf4mg==}
+  '@storybook/instrumenter@8.5.0':
+    resolution: {integrity: sha512-eZ/UY6w4U2vay+wX7QVwKiRoyMzZscuv6v4k4r8BlmHPFWbhiZDO9S2GsG16UkyKnrQrYk432he70n7hn1Xvmg==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/manager-api@8.4.6':
-    resolution: {integrity: sha512-TsXlQ5m5rTl2KNT9icPFyy822AqXrx1QplZBt/L7cFn7SpqQKDeSta21FH7MG0piAvzOweXebVSqKngJ6cCWWQ==}
+  '@storybook/manager-api@8.5.0':
+    resolution: {integrity: sha512-Ildriueo3eif4M+gMlMxu/mrBIbAnz8+oesmQJKdzZfe/U9eQTI9OUqJsxx/IVBmdzQ3ySsgNmzj5VweRkse4A==}
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/preview-api@8.4.6':
-    resolution: {integrity: sha512-LbD+lR1FGvWaJBXteVx5xdgs1x1D7tyidBg2CsW2ex+cP0iJ176JgjPfutZxlWOfQnhfRYNnJ3WKoCIfxFOTKA==}
+  '@storybook/preview-api@8.5.0':
+    resolution: {integrity: sha512-g0XbD54zMUkl6bpuA7qEBCE9rW1QV6KKmwkO4bkxMOJcMke3x9l00JTaYn7Un8wItjXiS3BIG15B6mnfBG7fng==}
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/react-dom-shim@8.4.6':
-    resolution: {integrity: sha512-f7RM8GO++fqMxbjNdEzeGS1P821jXuwRnAraejk5hyjB5SqetauFxMwoFYEYfJXPaLX2qIubnIJ78hdJ/IBaEA==}
+  '@storybook/react-dom-shim@8.5.0':
+    resolution: {integrity: sha512-7P8xg4FiuFpM6kQOzZynno+0zyLVs8NgsmRK58t3JRZXbda1tzlxTXzvqx4hUevvbPJGjmrB0F3xTFH+8Otnvw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/test@8.4.6':
-    resolution: {integrity: sha512-MeU1g65YgU66M2NtmEIL9gVeHk+en0k9Hp0wfxEO7NT/WLfaOD5RXLRDJVhbAlrH/6tLeWKIPNh/D26y27vO/g==}
+  '@storybook/test@8.5.0':
+    resolution: {integrity: sha512-M/DdPlI6gwL7NGkK5o7GYjdEBp95AsFEUtW29zQfnVIAngYugzi3nIuM/XkQHunidVdAZCYjw2s2Yhhsx/m9sw==}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
 
-  '@storybook/theming@8.4.6':
-    resolution: {integrity: sha512-q7vDPN/mgj7cXIVQ9R1/V75hrzNgKkm2G0LjMo57//9/djQ+7LxvBsR1iScbFIRSEqppvMiBFzkts+2uXidySA==}
+  '@storybook/theming@8.5.0':
+    resolution: {integrity: sha512-591LbOj/HMmHYUfLgrMerxhF1A9mY61HWKxcRpB6xxalc1Xw1kRtQ49DcwuTXnUu9ktBB3nuOzPNPQPFSh/7PQ==}
     peerDependencies:
       storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/vue3-vite@8.4.6':
-    resolution: {integrity: sha512-XmCM1+BeLSAdfgfMX1Yr8GfJlU7mW/AwCR30e2R8FG2wUoBxT24PVTj0nMhQsa4RC9GGQ7RNHCbuRNNwHIdQdQ==}
+  '@storybook/vue3-vite@8.5.0':
+    resolution: {integrity: sha512-gcIX9UBUMI/HQsCpQC2V9XZc32RO1H4sE4/FkSFxZVOLeQHcAFLQDuUXBpIrIOLl9ouoBE3jzVyYApejvyhO1w==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
       vite: ^4.0.0 || ^5.0.0 || ^6.0.0
 
-  '@storybook/vue3@8.4.6':
-    resolution: {integrity: sha512-mIGTaIBejxquh8UndGpAYRUFzdt3LfP3olaqZzOAOF9bNhxU6E8napZ52aXRFyHiT77Cs2+dhYLwPWdY+9+10g==}
+  '@storybook/vue3@8.5.0':
+    resolution: {integrity: sha512-bml2I00QhkSI23dCqBPhLWSCNDCFQJ23cJ/NPAVeJ6FZXrWBa3EC7wFAnXzvzPUxvTyB036jFjvsWraOWEANTA==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      storybook: ^8.4.6
+      storybook: ^8.5.0
       vue: ^3.0.0
 
   '@supabase/auth-js@2.65.0':
@@ -5465,12 +5688,22 @@ packages:
     resolution: {integrity: sha512-xGGHpBXYSHUUr6XsKBfs85TWlYKpTc37cSBBVrXcib2MkHLboWlkClhWF37JKlDb9KEq3dHs+f2xR7XJEWGBxA==}
     engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
 
+  '@testing-library/jest-dom@6.6.3':
+    resolution: {integrity: sha512-IteBhl4XqYNkM54f4ejhLRJiZNqcSCoXUOG2CPK7qbD322KjQozM4kHQOfkG2oln9b9HTYqs+Sae8vBATubxxA==}
+    engines: {node: '>=14', npm: '>=6', yarn: '>=1'}
+
   '@testing-library/user-event@14.5.2':
     resolution: {integrity: sha512-YAh82Wh4TIrxYLmfGcixwD18oIjyC1pFQC2Y01F2lzV2HTMiYrI0nze0FD0ocB//CKS/7jIUgae+adPqxK5yCQ==}
     engines: {node: '>=12', npm: '>=6'}
     peerDependencies:
       '@testing-library/dom': '>=7.21.4'
 
+  '@testing-library/user-event@14.6.0':
+    resolution: {integrity: sha512-+jsfK7kVJbqnCYtLTln8Ja/NmVrZRwBJHmHR9IxIVccMWSOZ6Oy0FkDJNeyVu4QSpMNmRfy10Xb76ObRDlWWBQ==}
+    engines: {node: '>=12', npm: '>=6'}
+    peerDependencies:
+      '@testing-library/dom': '>=7.21.4'
+
   '@testing-library/vue@8.1.0':
     resolution: {integrity: sha512-ls4RiHO1ta4mxqqajWRh8158uFObVrrtAPoxk7cIp4HrnQUj/ScKzqz53HxYpG3X6Zb7H2v+0eTGLSoy8HQ2nA==}
     engines: {node: '>=14'}
@@ -6053,11 +6286,11 @@ packages:
       vite: ^5.0.0 || ^6.0.0
       vue: ^3.2.25
 
-  '@vitest/coverage-v8@2.1.8':
-    resolution: {integrity: sha512-2Y7BPlKH18mAZYAW1tYByudlCYrQyl5RGvnnDYJKW5tCiO5qg3KSAy3XAxcxKz900a0ZXxWtKrMuZLe3lKBpJw==}
+  '@vitest/coverage-v8@3.0.2':
+    resolution: {integrity: sha512-U+hZYb0FtgNDb6B3E9piAHzXXIuxuBw2cd6Lvepc9sYYY4KjgiwCBmo3Sird9ZRu3ggLpLBTfw1ZRr77ipiSfw==}
     peerDependencies:
-      '@vitest/browser': 2.1.8
-      vitest: 2.1.8
+      '@vitest/browser': 3.0.2
+      vitest: 3.0.2
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
@@ -6065,14 +6298,14 @@ packages:
   '@vitest/expect@2.0.5':
     resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==}
 
-  '@vitest/expect@2.1.8':
-    resolution: {integrity: sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==}
+  '@vitest/expect@3.0.2':
+    resolution: {integrity: sha512-dKSHLBcoZI+3pmP5hiZ7I5grNru2HRtEW8Z5Zp4IXog8QYcxhlox7JUPyIIFWfN53+3HW3KPLIl6nSzUGgKSuQ==}
 
-  '@vitest/mocker@2.1.8':
-    resolution: {integrity: sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==}
+  '@vitest/mocker@3.0.2':
+    resolution: {integrity: sha512-Hr09FoBf0jlwwSyzIF4Xw31OntpO3XtZjkccpcBf8FeVW3tpiyKlkeUzxS/txzHqpUCNIX157NaTySxedyZLvA==}
     peerDependencies:
       msw: ^2.4.9
-      vite: ^5.0.0
+      vite: ^5.0.0 || ^6.0.0
     peerDependenciesMeta:
       msw:
         optional: true
@@ -6085,17 +6318,20 @@ packages:
   '@vitest/pretty-format@2.1.8':
     resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==}
 
-  '@vitest/runner@2.1.8':
-    resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==}
+  '@vitest/pretty-format@3.0.2':
+    resolution: {integrity: sha512-yBohcBw/T/p0/JRgYD+IYcjCmuHzjC3WLAKsVE4/LwiubzZkE8N49/xIQ/KGQwDRA8PaviF8IRO8JMWMngdVVQ==}
 
-  '@vitest/snapshot@2.1.8':
-    resolution: {integrity: sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==}
+  '@vitest/runner@3.0.2':
+    resolution: {integrity: sha512-GHEsWoncrGxWuW8s405fVoDfSLk6RF2LCXp6XhevbtDjdDme1WV/eNmUueDfpY1IX3MJaCRelVCEXsT9cArfEg==}
+
+  '@vitest/snapshot@3.0.2':
+    resolution: {integrity: sha512-h9s67yD4+g+JoYG0zPCo/cLTabpDqzqNdzMawmNPzDStTiwxwkyYM1v5lWE8gmGv3SVJ2DcxA2NpQJZJv9ym3g==}
 
   '@vitest/spy@2.0.5':
     resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==}
 
-  '@vitest/spy@2.1.8':
-    resolution: {integrity: sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==}
+  '@vitest/spy@3.0.2':
+    resolution: {integrity: sha512-8mI2iUn+PJFMT44e3ISA1R+K6ALVs47W6eriDTfXe6lFqlflID05MB4+rIFhmDSLBj8iBsZkzBYlgSkinxLzSQ==}
 
   '@vitest/utils@2.0.5':
     resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==}
@@ -6103,6 +6339,9 @@ packages:
   '@vitest/utils@2.1.8':
     resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==}
 
+  '@vitest/utils@3.0.2':
+    resolution: {integrity: sha512-Qu01ZYZlgHvDP02JnMBRpX43nRaZtNpIzw3C1clDXmn8eakgX6iQVGzTQ/NjkIr64WD8ioqOjkaYRVvHQI5qiw==}
+
   '@volar/language-core@2.4.10':
     resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
 
@@ -6124,13 +6363,13 @@ packages:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue-flow/core@1.41.6':
-    resolution: {integrity: sha512-8zxcGRqiudra0obDMLTg9L89WxdlV0QrDOdyPYOKWDcD/UK5aT0MIL3Br9TF9AJmHW2z8QZq4cmmgroREL0jgQ==}
+  '@vue-flow/core@1.42.1':
+    resolution: {integrity: sha512-QzzTxMAXfOeETKc+N3XMp5XpiPxKBHK5kq98avgTsE6MXyeU2E8EkANwwgSB/hvJ/k36RjU0Y7BOwCHiqiI1tw==}
     peerDependencies:
       vue: ^3.3.0
 
-  '@vue-flow/minimap@1.5.0':
-    resolution: {integrity: sha512-JhxXDF+8uTc7sgkZHDIvFpHqSl4wsK9xp8Kz5OHwNcXlgGcwqj4yad6jcc1B6bGxm+huESpNmoPotQbpMn6rVw==}
+  '@vue-flow/minimap@1.5.2':
+    resolution: {integrity: sha512-XNSpWwwXfCWqJilc2eCW+3ry3r9vhF8HmUw5wrAsUTHiss4R9k5uZLABo7c3T3VdcVRJ8pTfUJ9vjpzb8H+FKg==}
     peerDependencies:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
@@ -6209,6 +6448,17 @@ packages:
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
 
+  '@vue/tsconfig@0.7.0':
+    resolution: {integrity: sha512-ku2uNz5MaZ9IerPPUyOHzyjhXoX2kVJaVf7hL315DC17vS6IiZRmmCPfggNbU16QTvM80+uYYy3eYJB59WCtvg==}
+    peerDependencies:
+      typescript: ^5.7.2
+      vue: ^3.4.0
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+      vue:
+        optional: true
+
   '@vueuse/components@10.11.0':
     resolution: {integrity: sha512-ZvLZI23d5ZAtva5fGyYh/jQtZO8l+zJ5tAXyYNqHJZkq1o5yWyqZhENvSv5mfDmN5IuAOp4tq02mRmX/ipFGcg==}
 
@@ -6243,9 +6493,6 @@ packages:
     engines: {node: '>=10.0.0'}
     deprecated: this version has critical issues, please update to the latest version
 
-  a-sync-waterfall@1.0.1:
-    resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==}
-
   abab@2.0.6:
     resolution: {integrity: sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==}
     deprecated: Use your platform's native atob() and btoa() methods instead
@@ -6377,10 +6624,6 @@ packages:
     resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
     engines: {node: '>=12'}
 
-  ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-
   ansi-styles@4.3.0:
     resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
     engines: {node: '>=8'}
@@ -6440,9 +6683,6 @@ packages:
   aria-query@5.3.0:
     resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==}
 
-  array-buffer-byte-length@1.0.0:
-    resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==}
-
   array-buffer-byte-length@1.0.1:
     resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
     engines: {node: '>= 0.4'}
@@ -6483,10 +6723,6 @@ packages:
     resolution: {integrity: sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==}
     engines: {node: '>= 0.4'}
 
-  arraybuffer.prototype.slice@1.0.1:
-    resolution: {integrity: sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==}
-    engines: {node: '>= 0.4'}
-
   arraybuffer.prototype.slice@1.0.3:
     resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
     engines: {node: '>= 0.4'}
@@ -6799,6 +7035,12 @@ packages:
     resolution: {integrity: sha512-ft4hTmex7WGSHt56mydw9uRKskkvgiNwqTYiV9b6q3ubhplglQmjo9OZrHlcUVNwBqSBhnzlsJQ9N/Wd7nhENA==}
     engines: {node: '>=12'}
 
+  bundle-require@5.1.0:
+    resolution: {integrity: sha512-3WrrOuZiyaaZPWiEt4G3+IffISVC9HYlWueJEBWED4ZH4aIAC2PnkdnuRrR94M+w6yGWn4AglWtJtBI8YqvgoA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      esbuild: ^0.24.0
+
   busboy@1.6.0:
     resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
     engines: {node: '>=10.16.0'}
@@ -6874,10 +7116,6 @@ packages:
     resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==}
     engines: {node: '>=12'}
 
-  chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-
   chalk@3.0.0:
     resolution: {integrity: sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==}
     engines: {node: '>=8'}
@@ -6886,6 +7124,10 @@ packages:
     resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
     engines: {node: '>=10'}
 
+  chalk@5.4.1:
+    resolution: {integrity: sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
   change-case@4.1.2:
     resolution: {integrity: sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==}
 
@@ -6949,8 +7191,8 @@ packages:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
 
-  chromatic@11.20.0:
-    resolution: {integrity: sha512-Btdli1qoAI01UKmk3Iqe6vKhAhePRXqNI/2uKKy2R16q7SN/5kLTqhd1JI20LFOZSnH3xSJaUXeJ2xZOJB//3A==}
+  chromatic@11.25.0:
+    resolution: {integrity: sha512-P2BVe0rRLS9WM+eSG3u1SRg0Mi2vopsdPs2FiXwUiPqZ6hs9fe66d3Pnt7CfQ22v2jThuPEXYjYEeuL75a16Bw==}
     hasBin: true
     peerDependencies:
       '@chromatic-com/cypress': ^0.*.* || ^1.0.0
@@ -7068,6 +7310,10 @@ packages:
   color@3.2.1:
     resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
 
+  color@4.2.3:
+    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
+    engines: {node: '>=12.5.0'}
+
   colorette@1.4.0:
     resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
 
@@ -7103,10 +7349,6 @@ packages:
     resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
     engines: {node: '>= 6'}
 
-  commander@5.1.0:
-    resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
-    engines: {node: '>= 6'}
-
   commander@6.2.1:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
     engines: {node: '>= 6'}
@@ -7171,6 +7413,10 @@ packages:
   confusing-browser-globals@1.0.11:
     resolution: {integrity: sha512-JsPKdmh8ZkmnHxDk55FZ1TqVLvEQTvoByJZRN9jzI0UjxK/QgAmsphz7PGtqgPieQZ/CQcHWXCR7ATDNhGe+YA==}
 
+  consola@3.4.0:
+    resolution: {integrity: sha512-EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+
   console-control-strings@1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
 
@@ -7205,10 +7451,6 @@ packages:
   cookie-signature@1.0.6:
     resolution: {integrity: sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==}
 
-  cookie@0.4.2:
-    resolution: {integrity: sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==}
-    engines: {node: '>= 0.6'}
-
   cookie@0.7.1:
     resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==}
     engines: {node: '>= 0.6'}
@@ -7226,12 +7468,12 @@ packages:
   core-js-compat@3.39.0:
     resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==}
 
-  core-js@3.35.0:
-    resolution: {integrity: sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==}
-
   core-js@3.39.0:
     resolution: {integrity: sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==}
 
+  core-js@3.40.0:
+    resolution: {integrity: sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==}
+
   core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
@@ -7346,8 +7588,8 @@ packages:
   csv-parse@5.5.0:
     resolution: {integrity: sha512-RxruSK3M4XgzcD7Trm2wEN+SJ26ChIb903+IWxNOcB5q4jT2Cs+hFr6QP39J05EohshRFEvyzEBoZ/466S2sbw==}
 
-  curlconverter@3.21.0:
-    resolution: {integrity: sha512-DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A==}
+  curlconverter@4.12.0:
+    resolution: {integrity: sha512-NcwPKJgu9DkCH4gQsnjnXuUtPrhLhoNwvIYTTS5rRrsCC/X2flUswtgmeCyV9ePGszXzFReXk5y/CdBxrsAQ8Q==}
     hasBin: true
 
   currency-codes@2.1.0:
@@ -7502,6 +7744,15 @@ packages:
       supports-color:
         optional: true
 
+  debug@4.4.0:
+    resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
   decamelize@1.2.0:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
@@ -7512,10 +7763,6 @@ packages:
   decko@1.2.0:
     resolution: {integrity: sha512-m8FnyHXV1QX+S1cl+KPFDIl6NMkxtKsy6+U/aYyjrOqWMuwAwYWu7ePqrsUHtDR5Y8Yk2pi/KIDSgF+vT4cPOQ==}
 
-  decode-uri-component@0.2.2:
-    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
-    engines: {node: '>=0.10'}
-
   decompress-response@6.0.0:
     resolution: {integrity: sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==}
     engines: {node: '>=10'}
@@ -7597,6 +7844,10 @@ packages:
     resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
     engines: {node: '>=8'}
 
+  detect-libc@2.0.3:
+    resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
+    engines: {node: '>=8'}
+
   detect-newline@3.1.0:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
@@ -7834,10 +8085,6 @@ packages:
   error-ex@1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
 
-  es-abstract@1.22.1:
-    resolution: {integrity: sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==}
-    engines: {node: '>= 0.4'}
-
   es-abstract@1.22.5:
     resolution: {integrity: sha512-oW69R+4q2wG+Hc3KZePPZxOiisRIqfKBVo/HLx94QcJeWGU/8sZhCvc829rd1kS366vlJbzBfXf9yWwf0+Ko7w==}
     engines: {node: '>= 0.4'}
@@ -7864,17 +8111,13 @@ packages:
   es-get-iterator@1.1.3:
     resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
 
-  es-module-lexer@1.5.4:
-    resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
+  es-module-lexer@1.6.0:
+    resolution: {integrity: sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==}
 
   es-object-atoms@1.0.0:
     resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
     engines: {node: '>= 0.4'}
 
-  es-set-tostringtag@2.0.1:
-    resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
-    engines: {node: '>= 0.4'}
-
   es-set-tostringtag@2.0.3:
     resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
     engines: {node: '>= 0.4'}
@@ -8272,6 +8515,14 @@ packages:
   fd-slicer@1.1.0:
     resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==}
 
+  fdir@6.4.3:
+    resolution: {integrity: sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
   fecha@4.2.3:
     resolution: {integrity: sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==}
 
@@ -8315,10 +8566,6 @@ packages:
     resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
     engines: {node: '>=8'}
 
-  filter-obj@1.1.0:
-    resolution: {integrity: sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==}
-    engines: {node: '>=0.10.0'}
-
   finalhandler@1.3.1:
     resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==}
     engines: {node: '>= 0.8'}
@@ -8407,6 +8654,9 @@ packages:
   formidable@3.5.1:
     resolution: {integrity: sha512-WJWKelbRHN41m5dumb0/k8TeAx7Id/y3a+Z7QfhxP/htI9Js5zYaEDtG8uMgG0vM0lOlqnmjE99/kfpOYi/0Og==}
 
+  forwarded-parse@2.1.2:
+    resolution: {integrity: sha512-alTFZZQDKMporBH77856pXgzhEzaUVmLCDk+egLgIgHst3Tpndzz8MnKe+GzRJRfvVdn69HhpW7cmXzvtLvJAw==}
+
   forwarded@0.2.0:
     resolution: {integrity: sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==}
     engines: {node: '>= 0.6'}
@@ -8424,6 +8674,10 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
+  fs-extra@11.3.0:
+    resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==}
+    engines: {node: '>=14.14'}
+
   fs-extra@7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
@@ -8439,6 +8693,11 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -8447,10 +8706,6 @@ packages:
   function-bind@1.1.2:
     resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
 
-  function.prototype.name@1.1.5:
-    resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==}
-    engines: {node: '>= 0.4'}
-
   function.prototype.name@1.1.6:
     resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
     engines: {node: '>= 0.4'}
@@ -8521,10 +8776,6 @@ packages:
     resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
     engines: {node: '>=10'}
 
-  get-symbol-description@1.0.0:
-    resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==}
-    engines: {node: '>= 0.4'}
-
   get-symbol-description@1.0.2:
     resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
     engines: {node: '>= 0.4'}
@@ -8688,10 +8939,6 @@ packages:
   hash-sum@2.0.0:
     resolution: {integrity: sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg==}
 
-  hasown@2.0.0:
-    resolution: {integrity: sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==}
-    engines: {node: '>= 0.4'}
-
   hasown@2.0.2:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
@@ -8913,10 +9160,6 @@ packages:
     resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==}
     engines: {node: '>=8.0.0'}
 
-  internal-slot@1.0.5:
-    resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==}
-    engines: {node: '>= 0.4'}
-
   internal-slot@1.0.7:
     resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
     engines: {node: '>= 0.4'}
@@ -8948,9 +9191,6 @@ packages:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
 
-  is-array-buffer@3.0.2:
-    resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==}
-
   is-array-buffer@3.0.4:
     resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
     engines: {node: '>= 0.4'}
@@ -9039,14 +9279,13 @@ packages:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
     engines: {node: '>= 0.4'}
 
-  is-negative-zero@2.0.2:
-    resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==}
-    engines: {node: '>= 0.4'}
-
   is-negative-zero@2.0.3:
     resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
     engines: {node: '>= 0.4'}
 
+  is-node-process@1.2.0:
+    resolution: {integrity: sha512-Vg4o6/fqPxIjtxgUH5QLJhwZ7gW5diGCVlXpuUfELC62CuxM1iHcRe51f2W1FDy04Ai4KJkagKjx3XaqyfRKXw==}
+
   is-number-object@1.0.7:
     resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
     engines: {node: '>= 0.4'}
@@ -9083,9 +9322,6 @@ packages:
   is-set@2.0.2:
     resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
 
-  is-shared-array-buffer@1.0.2:
-    resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
-
   is-shared-array-buffer@1.0.3:
     resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
     engines: {node: '>= 0.4'}
@@ -9372,6 +9608,10 @@ packages:
   join-component@1.1.0:
     resolution: {integrity: sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==}
 
+  joycon@3.1.1:
+    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
+    engines: {node: '>=10'}
+
   js-base64@3.7.2:
     resolution: {integrity: sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ==}
 
@@ -9492,9 +9732,6 @@ packages:
     engines: {node: '>=6'}
     hasBin: true
 
-  jsonc-parser@3.2.0:
-    resolution: {integrity: sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==}
-
   jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
 
@@ -9562,16 +9799,18 @@ packages:
   kuler@2.0.0:
     resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==}
 
-  langchain@0.3.6:
-    resolution: {integrity: sha512-erZOIKXzwCOrQHqY9AyjkQmaX62zUap1Sigw1KrwMUOnVoLKkVNRmAyxFlNZDZ9jLs/58MaQcaT9ReJtbj3x6w==}
+  langchain@0.3.11:
+    resolution: {integrity: sha512-PgAG4ZLeuSRkKsyf98cmWGdwKv3I1hOFC8a4fr7e+bm7E+F6Fx6xUkgbuC78ff0N/Cjs5BBryZIFMrqoKPqsvg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/anthropic': '*'
       '@langchain/aws': '*'
+      '@langchain/cerebras': '*'
       '@langchain/cohere': '*'
       '@langchain/core': '>=0.2.21 <0.4.0'
       '@langchain/google-genai': '*'
       '@langchain/google-vertexai': '*'
+      '@langchain/google-vertexai-web': '*'
       '@langchain/groq': '*'
       '@langchain/mistralai': '*'
       '@langchain/ollama': '*'
@@ -9585,12 +9824,16 @@ packages:
         optional: true
       '@langchain/aws':
         optional: true
+      '@langchain/cerebras':
+        optional: true
       '@langchain/cohere':
         optional: true
       '@langchain/google-genai':
         optional: true
       '@langchain/google-vertexai':
         optional: true
+      '@langchain/google-vertexai-web':
+        optional: true
       '@langchain/groq':
         optional: true
       '@langchain/mistralai':
@@ -9608,8 +9851,8 @@ packages:
       typeorm:
         optional: true
 
-  langsmith@0.2.3:
-    resolution: {integrity: sha512-SPMYPVqR9kwXZVmJ2PXC61HeBnXIFHrjfjDxQ14H0+n5p4gqjLzgSHIQyxBlFeWQUQzArJxe65Ap+s+Xo1cZog==}
+  langsmith@0.2.15:
+    resolution: {integrity: sha512-homtJU41iitqIZVuuLW7iarCzD4f39KcfP9RTBWav9jifhrsDa1Ez89Ejr+4qi72iuBu8Y5xykchsGVgiEZ93w==}
     peerDependencies:
       openai: '*'
     peerDependenciesMeta:
@@ -9737,8 +9980,9 @@ packages:
       enquirer:
         optional: true
 
-  loader@2.1.1:
-    resolution: {integrity: sha512-Z6nHbyKiECMexVUmpIAVXp+f+8okRtfiMAQ9j0eTtImCghxSqQwrbeSiAyCYKBnfvRlgXLdQt0tPuaZmcBQzpw==}
+  load-tsconfig@0.2.5:
+    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
 
   local-pkg@0.5.0:
     resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
@@ -9782,6 +10026,7 @@ packages:
 
   lodash.get@4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
+    deprecated: This package is deprecated. Use the optional chaining (?.) operator instead.
 
   lodash.includes@4.3.0:
     resolution: {integrity: sha512-W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==}
@@ -9820,6 +10065,9 @@ packages:
   lodash.orderby@4.6.0:
     resolution: {integrity: sha512-T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg==}
 
+  lodash.sortby@4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+
   lodash.throttle@4.1.1:
     resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
 
@@ -9854,6 +10102,9 @@ packages:
   lossless-json@1.0.5:
     resolution: {integrity: sha512-RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA==}
 
+  lossless-json@4.0.2:
+    resolution: {integrity: sha512-+z0EaLi2UcWi8MZRxA5iTb6m4Ys4E80uftGY+yG5KNFJb5EceQXOhdW/pWJZ8m97s26u7yZZAYMcKWNztSZssA==}
+
   loupe@3.1.2:
     resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==}
 
@@ -9910,6 +10161,9 @@ packages:
   magic-string@0.30.14:
     resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==}
 
+  magic-string@0.30.17:
+    resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==}
+
   magicast@0.3.5:
     resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
 
@@ -10255,9 +10509,6 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
-  mlly@1.4.2:
-    resolution: {integrity: sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==}
-
   mlly@1.7.1:
     resolution: {integrity: sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==}
 
@@ -10427,9 +10678,9 @@ packages:
   no-case@3.0.4:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
 
-  nock@13.3.2:
-    resolution: {integrity: sha512-CwbljitiWJhF1gL83NbanhoKs1l23TDlRioNraPTZrzZIEooPemrHRj5m0FZCPkB1ecdYCSWWGcHysJgX/ngnQ==}
-    engines: {node: '>= 10.13'}
+  nock@14.0.0:
+    resolution: {integrity: sha512-3Z2ZoZoYTR/y2I+NI16+6IzfZFKBX7MrADtoBAm7v/QKqxQUhKw+Dh+847PPS1j/FDutjfIXfrh3CJF74yITWg==}
+    engines: {node: '>= 18'}
 
   node-abi@3.54.0:
     resolution: {integrity: sha512-p7eGEiQil0YUV3ItH4/tBb781L5impVmmx2E9FRKF7d18XXzp4PGT2tdYMFY6wQqgxD0IwNZOiSJ0/K0fSi/OA==}
@@ -10442,6 +10693,10 @@ packages:
     resolution: {integrity: sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==}
     engines: {node: ^16 || ^18 || >= 20}
 
+  node-addon-api@8.3.0:
+    resolution: {integrity: sha512-8VOpLHFrOQlAH+qA0ZzuGRlALRA6/LVh8QJldbrC4DY0hXoMP0l4Acq8TzFC018HztWiRqyCEj2aTWY2UvnJUg==}
+    engines: {node: ^18 || ^20 || >= 21}
+
   node-cleanup@2.1.2:
     resolution: {integrity: sha512-qN8v/s2PAJwGUtr1/hYTpNKlD6Y9rc4p8KSmJXyGdYGZsDGKXrGThikLFP9OCHFeLeEpQzPwiAtdIvBLqm//Hw==}
 
@@ -10482,6 +10737,10 @@ packages:
     resolution: {integrity: sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w==}
     hasBin: true
 
+  node-gyp-build@4.8.4:
+    resolution: {integrity: sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==}
+    hasBin: true
+
   node-gyp@8.4.1:
     resolution: {integrity: sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==}
     engines: {node: '>= 10.12.0'}
@@ -10580,16 +10839,6 @@ packages:
   number-allocator@1.0.14:
     resolution: {integrity: sha512-OrL44UTVAvkKdOdRQZIJpLkAdjXGTRda052sN4sO77bKEzYYqWKMBjQvrJFzqygI99gL6Z4u2xctPW1tB8ErvA==}
 
-  nunjucks@3.2.4:
-    resolution: {integrity: sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==}
-    engines: {node: '>= 6.9.0'}
-    hasBin: true
-    peerDependencies:
-      chokidar: ^4.0.1
-    peerDependenciesMeta:
-      chokidar:
-        optional: true
-
   nwsapi@2.2.7:
     resolution: {integrity: sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==}
 
@@ -10701,8 +10950,8 @@ packages:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
 
-  openai@4.73.1:
-    resolution: {integrity: sha512-nWImDJBcUsqrhy7yJScXB4+iqjzbUEgzfA3un/6UnHFdwWhjX24oztj69Ped/njABfOdLcO/F7CeWTI5dt8Xmg==}
+  openai@4.78.1:
+    resolution: {integrity: sha512-drt0lHZBd2lMyORckOXFPQTmnGLWSLt8VK0W9BhOKWpMFBEoHMoz5gxMPmVq5icp+sOrsbMnsmZTVHUlKvD1Ow==}
     hasBin: true
     peerDependencies:
       zod: ^3.23.8
@@ -10740,6 +10989,9 @@ packages:
   otplib@12.0.1:
     resolution: {integrity: sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==}
 
+  outvariant@1.4.3:
+    resolution: {integrity: sha512-+Sl2UErvtsoajRDKCE5/dBz4DIvHXQQnAxtQTF04OJxY0+DyZXSo5P5Bb7XYWOh81syohlYL24hbDwxedPUJCA==}
+
   p-cancelable@2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
@@ -10882,6 +11134,9 @@ packages:
   pathe@1.1.2:
     resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
 
+  pathe@2.0.2:
+    resolution: {integrity: sha512-15Ztpk+nov8DR524R4BF7uEuzESgzUEAV4Ah7CUMNGXdE5ELuvxElxGXndBl32vMSsWa1jpNf22Z+Er3sKwq+w==}
+
   pathval@2.0.0:
     resolution: {integrity: sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==}
     engines: {node: '>= 14.16'}
@@ -10977,6 +11232,10 @@ packages:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  picomatch@4.0.2:
+    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+    engines: {node: '>=12'}
+
   pidtree@0.6.0:
     resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
     engines: {node: '>=0.10'}
@@ -11009,12 +11268,19 @@ packages:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
 
-  pkg-types@1.0.3:
-    resolution: {integrity: sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==}
-
   pkg-types@1.1.3:
     resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==}
 
+  playwright-core@1.49.1:
+    resolution: {integrity: sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.49.1:
+    resolution: {integrity: sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   plimit-lit@1.4.1:
     resolution: {integrity: sha512-bK14ePAod0XWhXwjT6XvYfjcQ9PbCUkZXnDCAKRMZTJCaDIV9VFya1S/I+3WSbpdR8uBhCDh8TS4lQ/JQvhNFA==}
 
@@ -11054,6 +11320,24 @@ packages:
       ts-node:
         optional: true
 
+  postcss-load-config@6.0.1:
+    resolution: {integrity: sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==}
+    engines: {node: '>= 18'}
+    peerDependencies:
+      jiti: '>=1.21.0'
+      postcss: '>=8.0.9'
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+      postcss:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
   postcss-nested@6.0.1:
     resolution: {integrity: sha512-mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==}
     engines: {node: '>=12.0'}
@@ -11316,10 +11600,6 @@ packages:
     resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
     engines: {node: '>=0.6'}
 
-  query-string@7.1.3:
-    resolution: {integrity: sha512-hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==}
-    engines: {node: '>=6'}
-
   querystringify@2.2.0:
     resolution: {integrity: sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==}
 
@@ -11512,10 +11792,6 @@ packages:
     resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
 
-  regexp.prototype.flags@1.5.0:
-    resolution: {integrity: sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==}
-    engines: {node: '>= 0.4'}
-
   regexp.prototype.flags@1.5.2:
     resolution: {integrity: sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==}
     engines: {node: '>= 0.4'}
@@ -11591,10 +11867,6 @@ packages:
     resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
 
-  resolve@1.22.3:
-    resolution: {integrity: sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==}
-    hasBin: true
-
   resolve@1.22.8:
     resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==}
     hasBin: true
@@ -11700,10 +11972,6 @@ packages:
   rxjs@7.8.1:
     resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
 
-  safe-array-concat@1.0.0:
-    resolution: {integrity: sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==}
-    engines: {node: '>=0.4'}
-
   safe-array-concat@1.1.2:
     resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
     engines: {node: '>=0.4'}
@@ -11714,9 +11982,6 @@ packages:
   safe-buffer@5.2.1:
     resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
 
-  safe-regex-test@1.0.0:
-    resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==}
-
   safe-regex-test@1.0.3:
     resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
     engines: {node: '>= 0.4'}
@@ -11809,6 +12074,10 @@ packages:
   shallowequal@1.1.0:
     resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
 
+  sharp@0.33.5:
+    resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -11955,6 +12224,10 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
+  source-map@0.8.0-beta.0:
+    resolution: {integrity: sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA==}
+    engines: {node: '>= 8'}
+
   sparse-bitfield@3.0.3:
     resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==}
 
@@ -11977,10 +12250,6 @@ packages:
     resolution: {integrity: sha512-VNiXjFp6R4ldPbVRYbpxlD35yRHceecVXlct1J4/X80KuuPnW2AXMq3sGwhnJOhKkUsOxAT6nRGfGE5pocVw5w==}
     engines: {node: '>=10.0.0'}
 
-  split-on-first@1.1.0:
-    resolution: {integrity: sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==}
-    engines: {node: '>=6'}
-
   split2@4.2.0:
     resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
     engines: {node: '>= 10.x'}
@@ -12060,8 +12329,8 @@ packages:
     resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
     engines: {node: '>=4', npm: '>=6'}
 
-  storybook@8.4.6:
-    resolution: {integrity: sha512-J6juZSZT2u3PUW0QZYZZYxBq6zU5O0OrkSgkMXGMg/QrS9to9IHmt4FjEMEyACRbXo8POcB/fSXa3VpGe7bv3g==}
+  storybook@8.5.0:
+    resolution: {integrity: sha512-cEx42OlCetManF+cONVJVYP7SYsnI2K922DfWKmZhebP0it0n6TUof4y5/XzJ8YUruwPgyclGLdX8TvdRuNSfw==}
     hasBin: true
     peerDependencies:
       prettier: ^2 || ^3
@@ -12091,9 +12360,8 @@ packages:
   strict-event-emitter-types@2.0.0:
     resolution: {integrity: sha512-Nk/brWYpD85WlOgzw5h173aci0Teyv8YdIAEtV+N88nDB0dLlazZyJMIsN6eo1/AR61l+p6CJTG1JIyFaoNEEA==}
 
-  strict-uri-encode@2.0.0:
-    resolution: {integrity: sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==}
-    engines: {node: '>=4'}
+  strict-event-emitter@0.5.1:
+    resolution: {integrity: sha512-vMgjE/GGEPEFnhFub6pa4FmJBRBVOLpIII2hvCZ8Kzb7K0hlHo7mQv6xYrBvCL2LtAIBwFUK8wvuJgTVSQ5MFQ==}
 
   string-argv@0.3.1:
     resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
@@ -12111,13 +12379,6 @@ packages:
     resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
     engines: {node: '>=12'}
 
-  string.prototype.startswith@1.0.0:
-    resolution: {integrity: sha512-VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg==}
-
-  string.prototype.trim@1.2.7:
-    resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==}
-    engines: {node: '>= 0.4'}
-
   string.prototype.trim@1.2.8:
     resolution: {integrity: sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==}
     engines: {node: '>= 0.4'}
@@ -12126,18 +12387,12 @@ packages:
     resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
     engines: {node: '>= 0.4'}
 
-  string.prototype.trimend@1.0.6:
-    resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==}
-
   string.prototype.trimend@1.0.7:
     resolution: {integrity: sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==}
 
   string.prototype.trimend@1.0.8:
     resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
 
-  string.prototype.trimstart@1.0.6:
-    resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==}
-
   string.prototype.trimstart@1.0.7:
     resolution: {integrity: sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==}
 
@@ -12349,17 +12604,25 @@ packages:
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
-  tinyexec@0.3.1:
-    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
+  tinyexec@0.3.2:
+    resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==}
 
-  tinypool@1.0.1:
-    resolution: {integrity: sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==}
+  tinyglobby@0.2.10:
+    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
+    engines: {node: '>=12.0.0'}
+
+  tinypool@1.0.2:
+    resolution: {integrity: sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==}
     engines: {node: ^18.0.0 || >=20.0.0}
 
   tinyrainbow@1.2.0:
     resolution: {integrity: sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==}
     engines: {node: '>=14.0.0'}
 
+  tinyrainbow@2.0.0:
+    resolution: {integrity: sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==}
+    engines: {node: '>=14.0.0'}
+
   tinyspy@3.0.2:
     resolution: {integrity: sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==}
     engines: {node: '>=14.0.0'}
@@ -12389,10 +12652,6 @@ packages:
   tmpl@1.0.5:
     resolution: {integrity: sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==}
 
-  to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
-
   to-regex-range@5.0.1:
     resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
     engines: {node: '>=8.0'}
@@ -12425,6 +12684,9 @@ packages:
   tr46@0.0.3:
     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
 
+  tr46@1.0.1:
+    resolution: {integrity: sha512-dTpowEjclQ7Kgx5SdBkqRzVhERQXov8/l9Ft9dVM9fmg0W0KQSVaXX9T4i6twCPNtYiZM53lpSSUAwJbFPOHxA==}
+
   tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
@@ -12446,6 +12708,17 @@ packages:
     resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==}
     hasBin: true
 
+  tree-sitter-bash@0.23.3:
+    resolution: {integrity: sha512-36cg/GQ2YmIbeiBeqeuh4fBJ6i4kgVouDaqTxqih5ysPag+zHufyIaxMOFeM8CeplwAK/Luj1o5XHqgdAfoCZg==}
+    peerDependencies:
+      tree-sitter: ^0.21.1
+    peerDependenciesMeta:
+      tree-sitter:
+        optional: true
+
+  tree-sitter@0.21.1:
+    resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
+
   triple-beam@1.3.0:
     resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
 
@@ -12550,6 +12823,25 @@ packages:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
     engines: {node: '>=0.6.x'}
 
+  tsup@8.3.6:
+    resolution: {integrity: sha512-XkVtlDV/58S9Ye0JxUUTcrQk4S+EqlOHKzg6Roa62rdjL1nGWNUstG0xgI4vanHdfIpjP448J8vlN0oK6XOJ5g==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      '@microsoft/api-extractor': ^7.36.0
+      '@swc/core': ^1
+      postcss: ^8.4.12
+      typescript: ^5.7.2
+    peerDependenciesMeta:
+      '@microsoft/api-extractor':
+        optional: true
+      '@swc/core':
+        optional: true
+      postcss:
+        optional: true
+      typescript:
+        optional: true
+
   tunnel-agent@0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
 
@@ -12647,33 +12939,18 @@ packages:
     resolution: {integrity: sha512-SOnx8xygcAh8lvDU2exnK2bomASfNjzB3Qz71s2tw9QnX8fkAo7aC+D0H7FV0HjRKj94CKV2Hi71kVkkO6nOxg==}
     engines: {node: '>=0.10.5'}
 
-  typed-array-buffer@1.0.0:
-    resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==}
-    engines: {node: '>= 0.4'}
-
   typed-array-buffer@1.0.2:
     resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
     engines: {node: '>= 0.4'}
 
-  typed-array-byte-length@1.0.0:
-    resolution: {integrity: sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==}
-    engines: {node: '>= 0.4'}
-
   typed-array-byte-length@1.0.1:
     resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
     engines: {node: '>= 0.4'}
 
-  typed-array-byte-offset@1.0.0:
-    resolution: {integrity: sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==}
-    engines: {node: '>= 0.4'}
-
   typed-array-byte-offset@1.0.2:
     resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
     engines: {node: '>= 0.4'}
 
-  typed-array-length@1.0.4:
-    resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==}
-
   typed-array-length@1.0.5:
     resolution: {integrity: sha512-yMi0PlwuznKHxKmcpoOdeLwxBoVPkqZxd7q2FgMkmD3bNwvF5VW0+UlUQ1k1vmktTu4Yu13Q0RIxEP8+B+wloA==}
     engines: {node: '>= 0.4'}
@@ -12699,9 +12976,6 @@ packages:
   uc.micro@2.1.0:
     resolution: {integrity: sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==}
 
-  ufo@1.3.2:
-    resolution: {integrity: sha512-o+ORpgGwaYQXgqGDwd+hkS4PuZ3QnmqMMxRuajK/a38L6fTpcE5GPIfrf+L/KemFzfUpeUQc1rRS1iDBozvnFA==}
-
   ufo@1.5.4:
     resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
 
@@ -12726,12 +13000,12 @@ packages:
   underscore@1.13.6:
     resolution: {integrity: sha512-+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==}
 
-  undici@5.28.4:
-    resolution: {integrity: sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==}
+  undici@5.28.5:
+    resolution: {integrity: sha512-zICwjrDrcrUE0pyyJc1I2QzBkLM8FINsgOrt6WjA+BgajVq9Nxu2PbFFXUrAggLfDXlZGZBVZYw7WNV5KiBiBA==}
     engines: {node: '>=14.0'}
 
-  undici@6.19.7:
-    resolution: {integrity: sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==}
+  undici@6.21.1:
+    resolution: {integrity: sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==}
     engines: {node: '>=18.17'}
 
   unicode-canonical-property-names-ecmascript@2.0.1:
@@ -12921,9 +13195,9 @@ packages:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
     engines: {'0': node >=0.6.0}
 
-  vite-node@2.1.8:
-    resolution: {integrity: sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==}
-    engines: {node: ^18.0.0 || >=20.0.0}
+  vite-node@3.0.2:
+    resolution: {integrity: sha512-hsEQerBAHvVAbv40m3TFQe/lTEbOp7yDpyqMJqr2Tnd+W58+DEYOt+fluQgekOePcsNBmR77lpVAnIU2Xu4SvQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
 
   vite-plugin-dts@4.3.0:
@@ -12936,42 +13210,17 @@ packages:
       vite:
         optional: true
 
+  vite-plugin-static-copy@2.2.0:
+    resolution: {integrity: sha512-ytMrKdR9iWEYHbUxs6x53m+MRl4SJsOSoMu1U1+Pfg0DjPeMlsRVx3RR5jvoonineDquIue83Oq69JvNsFSU5w==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      vite: ^5.0.0 || ^6.0.0
+
   vite-svg-loader@5.1.0:
     resolution: {integrity: sha512-M/wqwtOEjgb956/+m5ZrYT/Iq6Hax0OakWbokj8+9PXOnB7b/4AxESHieEtnNEy7ZpjsjYW1/5nK8fATQMmRxw==}
     peerDependencies:
       vue: '>=3.2.13'
 
-  vite@5.4.11:
-    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': ^18.16.16
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      sass-embedded: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      sass-embedded:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-
   vite@6.0.2:
     resolution: {integrity: sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -13012,21 +13261,26 @@ packages:
       yaml:
         optional: true
 
+  vitest-axe@0.1.0:
+    resolution: {integrity: sha512-jvtXxeQPg8R/2ANTY8QicA5pvvdRP4F0FsVUAHANJ46YCDASie/cuhlSzu0DGcLmZvGBSBNsNuK3HqfaeknyvA==}
+    peerDependencies:
+      vitest: '>=0.16.0'
+
   vitest-mock-extended@2.0.2:
     resolution: {integrity: sha512-n3MBqVITKyclZ0n0y66hkT4UiiEYFQn9tteAnIxT0MPz1Z8nFcPUG3Cf0cZOyoPOj/cq6Ab1XFw2lM/qM5EDWQ==}
     peerDependencies:
       typescript: ^5.7.2
       vitest: '>=2.0.0'
 
-  vitest@2.1.8:
-    resolution: {integrity: sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==}
-    engines: {node: ^18.0.0 || >=20.0.0}
+  vitest@3.0.2:
+    resolution: {integrity: sha512-5bzaHakQ0hmVVKLhfh/jXf6oETDBtgPo8tQCHYB+wftNgFJ+Hah67IsWc8ivx4vFL025Ow8UiuTf4W57z4izvQ==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@types/node': ^18.16.16
-      '@vitest/browser': 2.1.8
-      '@vitest/ui': 2.1.8
+      '@vitest/browser': 3.0.2
+      '@vitest/ui': 3.0.2
       happy-dom: '*'
       jsdom: '*'
     peerDependenciesMeta:
@@ -13198,9 +13452,15 @@ packages:
     resolution: {integrity: sha512-QW95TCTaHmsYfHDybGMwO5IJIM93I/6vTRk+daHTWFPhwh+C8Cg7j7XyKrwrj8Ib6vYXe0ocYNrmzY4xAAN6ug==}
     engines: {node: '>= 14'}
 
+  web-tree-sitter@0.24.3:
+    resolution: {integrity: sha512-uR9YNewr1S2EzPKE+y39nAwaTyobBaZRG/IsfkB/OT4v0lXtNj5WjtHKgn2h7eOYUWIZh5rK9Px7tI6S9CRKdA==}
+
   webidl-conversions@3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
+  webidl-conversions@4.0.2:
+    resolution: {integrity: sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==}
+
   webidl-conversions@7.0.0:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
@@ -13246,6 +13506,9 @@ packages:
   whatwg-url@5.0.0:
     resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
 
+  whatwg-url@7.1.0:
+    resolution: {integrity: sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==}
+
   which-boxed-primitive@1.0.2:
     resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
 
@@ -13478,8 +13741,13 @@ packages:
     peerDependencies:
       zod: ^3.23.3
 
-  zod@3.23.8:
-    resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
+  zod-to-json-schema@3.24.1:
+    resolution: {integrity: sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==}
+    peerDependencies:
+      zod: ^3.24.1
+
+  zod@3.24.1:
+    resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==}
 
   zx@8.1.4:
     resolution: {integrity: sha512-QFDYYpnzdpRiJ3dL2102Cw26FpXpWshW4QLTGxiYfIcwdAqg084jRCkK/kuP/NOSkxOjydRwNFG81qzA5r1a6w==}
@@ -13493,7 +13761,7 @@ snapshots:
   '@acuminous/bitsyntax@0.1.2':
     dependencies:
       buffer-more-ints: 1.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       safe-buffer: 5.1.2
     transitivePeerDependencies:
       - supports-color
@@ -13531,6 +13799,19 @@ snapshots:
       - encoding
       - supports-color
 
+  '@anthropic-ai/sdk@0.32.1(encoding@0.1.13)':
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      abort-controller: 3.0.0
+      agentkeepalive: 4.2.1
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   '@apidevtools/json-schema-ref-parser@11.7.0':
     dependencies:
       '@jsdevtools/ono': 7.1.3
@@ -14433,7 +14714,7 @@ snapshots:
 
   '@azure/core-tracing@1.0.0-preview.13':
     dependencies:
-      '@opentelemetry/api': 1.2.0
+      '@opentelemetry/api': 1.9.0
       tslib: 2.6.2
 
   '@azure/core-tracing@1.0.1':
@@ -14544,11 +14825,6 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
-  '@babel/code-frame@7.24.6':
-    dependencies:
-      '@babel/highlight': 7.24.6
-      picocolors: 1.1.1
-
   '@babel/code-frame@7.26.2':
     dependencies:
       '@babel/helper-validator-identifier': 7.25.9
@@ -14562,7 +14838,7 @@ snapshots:
   '@babel/core@7.24.0':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@babel/generator': 7.23.6
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
@@ -14572,7 +14848,7 @@ snapshots:
       '@babel/traverse': 7.24.0
       '@babel/types': 7.26.3
       convert-source-map: 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 7.6.0
@@ -14587,12 +14863,12 @@ snapshots:
       '@babel/helper-compilation-targets': 7.25.9
       '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
       '@babel/helpers': 7.26.0
-      '@babel/parser': 7.26.2
+      '@babel/parser': 7.26.3
       '@babel/template': 7.25.9
       '@babel/traverse': 7.26.3
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
       convert-source-map: 2.0.0
-      debug: 4.3.7
+      debug: 4.4.0
       gensync: 1.0.0-beta.2
       json5: 2.2.3
       semver: 7.6.0
@@ -14623,7 +14899,7 @@ snapshots:
 
   '@babel/helper-annotate-as-pure@7.25.9':
     dependencies:
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
 
   '@babel/helper-compilation-targets@7.23.6':
     dependencies:
@@ -14666,7 +14942,7 @@ snapshots:
       '@babel/core': 7.26.0
       '@babel/helper-compilation-targets': 7.25.9
       '@babel/helper-plugin-utils': 7.25.9
-      debug: 4.3.7
+      debug: 4.4.0
       lodash.debounce: 4.0.8
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -14697,7 +14973,7 @@ snapshots:
   '@babel/helper-module-imports@7.25.9':
     dependencies:
       '@babel/traverse': 7.26.3
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
@@ -14752,7 +15028,7 @@ snapshots:
   '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
     dependencies:
       '@babel/traverse': 7.26.3
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
@@ -14760,14 +15036,10 @@ snapshots:
     dependencies:
       '@babel/types': 7.26.3
 
-  '@babel/helper-string-parser@7.24.8': {}
-
   '@babel/helper-string-parser@7.25.9': {}
 
   '@babel/helper-validator-identifier@7.22.20': {}
 
-  '@babel/helper-validator-identifier@7.24.7': {}
-
   '@babel/helper-validator-identifier@7.25.9': {}
 
   '@babel/helper-validator-option@7.23.5': {}
@@ -14795,21 +15067,6 @@ snapshots:
       '@babel/template': 7.25.9
       '@babel/types': 7.26.3
 
-  '@babel/highlight@7.24.6':
-    dependencies:
-      '@babel/helper-validator-identifier': 7.24.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-      picocolors: 1.1.1
-
-  '@babel/parser@7.25.6':
-    dependencies:
-      '@babel/types': 7.25.6
-
-  '@babel/parser@7.26.2':
-    dependencies:
-      '@babel/types': 7.26.3
-
   '@babel/parser@7.26.3':
     dependencies:
       '@babel/types': 7.26.3
@@ -15337,7 +15594,7 @@ snapshots:
     dependencies:
       '@babel/core': 7.26.0
       '@babel/helper-plugin-utils': 7.25.9
-      '@babel/types': 7.26.0
+      '@babel/types': 7.26.3
       esutils: 2.0.3
 
   '@babel/runtime@7.24.7':
@@ -15346,7 +15603,7 @@ snapshots:
 
   '@babel/template@7.24.0':
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@babel/parser': 7.26.3
       '@babel/types': 7.26.3
 
@@ -15358,7 +15615,7 @@ snapshots:
 
   '@babel/traverse@7.24.0':
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@babel/generator': 7.23.6
       '@babel/helper-environment-visitor': 7.22.20
       '@babel/helper-function-name': 7.23.0
@@ -15366,7 +15623,7 @@ snapshots:
       '@babel/helper-split-export-declaration': 7.22.6
       '@babel/parser': 7.26.3
       '@babel/types': 7.26.3
-      debug: 4.3.7
+      debug: 4.4.0
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
@@ -15378,22 +15635,11 @@ snapshots:
       '@babel/parser': 7.26.3
       '@babel/template': 7.25.9
       '@babel/types': 7.26.3
-      debug: 4.3.7
+      debug: 4.4.0
       globals: 11.12.0
     transitivePeerDependencies:
       - supports-color
 
-  '@babel/types@7.25.6':
-    dependencies:
-      '@babel/helper-string-parser': 7.24.8
-      '@babel/helper-validator-identifier': 7.24.7
-      to-fast-properties: 2.0.0
-
-  '@babel/types@7.26.0':
-    dependencies:
-      '@babel/helper-string-parser': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
-
   '@babel/types@7.26.3':
     dependencies:
       '@babel/helper-string-parser': 7.25.9
@@ -15401,6 +15647,8 @@ snapshots:
 
   '@bcoe/v8-coverage@0.2.3': {}
 
+  '@bcoe/v8-coverage@1.0.2': {}
+
   '@biomejs/biome@1.9.0':
     optionalDependencies:
       '@biomejs/cli-darwin-arm64': 1.9.0
@@ -15436,6 +15684,37 @@ snapshots:
   '@biomejs/cli-win32-x64@1.9.0':
     optional: true
 
+  '@browserbasehq/sdk@2.0.0(encoding@0.1.13)':
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      abort-controller: 3.0.0
+      agentkeepalive: 4.2.1
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@browserbasehq/stagehand@1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1)':
+    dependencies:
+      '@anthropic-ai/sdk': 0.27.3(encoding@0.1.13)
+      '@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
+      '@playwright/test': 1.49.1
+      deepmerge: 4.3.1
+      dotenv: 16.4.5
+      openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
+      sharp: 0.33.5
+      ws: 8.17.1
+      zod: 3.24.1
+      zod-to-json-schema: 3.24.1(zod@3.24.1)
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - supports-color
+      - utf-8-validate
+
   '@cfaester/enzyme-adapter-react-18@0.8.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       enzyme: 3.11.0
@@ -15447,13 +15726,15 @@ snapshots:
       react-is: 18.2.0
       react-shallow-renderer: 16.15.0(react@18.2.0)
 
-  '@chromatic-com/storybook@3.2.2(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
+  '@cfworker/json-schema@4.1.0': {}
+
+  '@chromatic-com/storybook@3.2.4(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      chromatic: 11.20.0
+      chromatic: 11.25.0
       filesize: 10.1.0
       jsonfile: 6.1.0
       react-confetti: 6.1.0(react@18.2.0)
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       strip-ansi: 7.1.0
     transitivePeerDependencies:
       - '@chromatic-com/cypress'
@@ -15576,18 +15857,6 @@ snapshots:
 
   '@ctrl/tinycolor@3.6.0': {}
 
-  '@curlconverter/yargs-parser@0.0.1': {}
-
-  '@curlconverter/yargs@0.0.2':
-    dependencies:
-      '@curlconverter/yargs-parser': 0.0.1
-      cliui: 7.0.4
-      escalade: 3.1.1
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-
   '@cypress/request@3.0.1':
     dependencies:
       aws-sign2: 0.7.0
@@ -15626,6 +15895,11 @@ snapshots:
     dependencies:
       vue: 3.5.13(typescript@5.7.2)
 
+  '@emnapi/runtime@1.3.1':
+    dependencies:
+      tslib: 2.6.2
+    optional: true
+
   '@emotion/is-prop-valid@1.2.1':
     dependencies:
       '@emotion/memoize': 0.8.1
@@ -15716,7 +15990,7 @@ snapshots:
   '@eslint/eslintrc@2.1.4':
     dependencies:
       ajv: 6.12.6
-      debug: 4.3.7
+      debug: 4.4.0
       espree: 9.6.1
       globals: 13.20.0
       ignore: 5.2.4
@@ -15737,7 +16011,7 @@ snapshots:
 
   '@faker-js/faker@8.0.2': {}
 
-  '@fastify/busboy@2.0.0': {}
+  '@fastify/busboy@2.1.1': {}
 
   '@floating-ui/core@1.3.1': {}
 
@@ -15771,16 +16045,16 @@ snapshots:
   '@gar/promisify@1.1.3':
     optional: true
 
-  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i))':
+  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi))':
     dependencies:
       form-data: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
       qs: 6.11.2
       url-join: 4.0.1
-      zod: 3.23.8
+      zod: 3.24.1
     optionalDependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      langchain: 0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      langchain: 0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi)
     transitivePeerDependencies:
       - encoding
 
@@ -15870,7 +16144,7 @@ snapshots:
   '@humanwhocodes/config-array@0.11.14':
     dependencies:
       '@humanwhocodes/object-schema': 2.0.2
-      debug: 4.3.7
+      debug: 4.4.0
       minimatch: 3.1.2
     transitivePeerDependencies:
       - supports-color
@@ -15915,6 +16189,81 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@img/sharp-darwin-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-darwin-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    optional: true
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-linux-arm@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.0.5
+    optional: true
+
+  '@img/sharp-linux-s390x@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.0.4
+    optional: true
+
+  '@img/sharp-linux-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-wasm32@0.33.5':
+    dependencies:
+      '@emnapi/runtime': 1.3.1
+    optional: true
+
+  '@img/sharp-win32-ia32@0.33.5':
+    optional: true
+
+  '@img/sharp-win32-x64@0.33.5':
+    optional: true
+
   '@intlify/core-base@9.2.2':
     dependencies:
       '@intlify/devtools-if': 9.2.2
@@ -16146,8 +16495,6 @@ snapshots:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@jridgewell/sourcemap-codec@1.4.15': {}
-
   '@jridgewell/sourcemap-codec@1.5.0': {}
 
   '@jridgewell/trace-mapping@0.3.25':
@@ -16201,64 +16548,66 @@ snapshots:
 
   '@kwsites/file-exists@1.1.1':
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   '@kwsites/promise-deferred@1.1.1': {}
 
-  '@langchain/anthropic@0.3.8(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/anthropic@0.3.11(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)':
     dependencies:
-      '@anthropic-ai/sdk': 0.27.3(encoding@0.1.13)
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@anthropic-ai/sdk': 0.32.1(encoding@0.1.13)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       fast-xml-parser: 4.4.1
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@langchain/aws@0.1.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/aws@0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))':
     dependencies:
       '@aws-sdk/client-bedrock-agent-runtime': 3.666.0
       '@aws-sdk/client-bedrock-runtime': 3.666.0
       '@aws-sdk/client-kendra': 3.666.0
       '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@langchain/cohere@0.3.1(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/cohere@0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       cohere-ai: 7.14.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - '@aws-sdk/client-sso-oidc'
       - aws-crt
       - encoding
 
-  '@langchain/community@0.3.15(v4qhcw25bevfr6xzz4fnsvjiqe)':
+  '@langchain/community@0.3.24(xbnzedcvjhnriori3dst4asz2q)':
     dependencies:
+      '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1)
       '@ibm-cloud/watsonx-ai': 1.1.2
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/openai': 0.3.14(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       binary-extensions: 2.2.0
       expr-eval: 2.0.2
       flat: 5.0.2
       ibm-cloud-sdk-core: 5.1.0
       js-yaml: 4.1.0
-      langchain: 0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i)
-      langsmith: 0.2.3(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      langchain: 0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi)
+      langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
       uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     optionalDependencies:
       '@aws-crypto/sha256-js': 5.2.0
       '@aws-sdk/client-bedrock-agent-runtime': 3.666.0
@@ -16267,7 +16616,8 @@ snapshots:
       '@aws-sdk/client-s3': 3.666.0
       '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
-      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i))
+      '@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
+      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi))
       '@getzep/zep-js': 0.9.0
       '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13)
       '@google-cloud/storage': 7.12.1(encoding@0.1.13)
@@ -16286,6 +16636,7 @@ snapshots:
       crypto-js: 4.2.0
       d3-dsv: 2.0.0
       epub2: 3.0.2(ts-toolbelt@9.6.0)
+      fast-xml-parser: 4.4.1
       google-auth-library: 9.10.0(encoding@0.1.13)
       html-to-text: 9.0.5
       ignore: 5.2.4
@@ -16297,134 +16648,137 @@ snapshots:
       mysql2: 3.11.0
       pdf-parse: 1.1.1
       pg: 8.12.0
+      playwright: 1.49.1
       redis: 4.6.12
       ws: 8.17.1
     transitivePeerDependencies:
       - '@langchain/anthropic'
       - '@langchain/aws'
+      - '@langchain/cerebras'
       - '@langchain/cohere'
       - '@langchain/google-genai'
       - '@langchain/google-vertexai'
+      - '@langchain/google-vertexai-web'
       - '@langchain/groq'
       - '@langchain/mistralai'
       - '@langchain/ollama'
       - axios
       - encoding
       - handlebars
-      - openai
       - peggy
       - supports-color
 
-  '@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))':
+  '@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))':
     dependencies:
+      '@cfworker/json-schema': 4.1.0
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.2.3(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       mustache: 4.2.0
       p-queue: 6.6.2
       p-retry: 4.6.2
       uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - openai
 
-  '@langchain/google-common@0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
+  '@langchain/google-common@0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(zod@3.24.1)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       uuid: 10.0.0
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - zod
 
-  '@langchain/google-gauth@0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)':
+  '@langchain/google-gauth@0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(zod@3.24.1)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/google-common': 0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      '@langchain/google-common': 0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(zod@3.24.1)
       google-auth-library: 8.9.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
       - zod
 
-  '@langchain/google-genai@0.1.4(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
+  '@langchain/google-genai@0.1.6(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(zod@3.24.1)':
     dependencies:
       '@google/generative-ai': 0.21.0
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - zod
 
-  '@langchain/google-vertexai@0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)':
+  '@langchain/google-vertexai@0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(zod@3.24.1)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/google-gauth': 0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      '@langchain/google-gauth': 0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(zod@3.24.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
       - zod
 
-  '@langchain/groq@0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/groq@0.1.3(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/openai': 0.3.14(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
       groq-sdk: 0.5.0(encoding@0.1.13)
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@langchain/mistralai@0.2.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/mistralai@0.2.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      '@mistralai/mistralai': 1.3.4(zod@3.23.8)
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      '@mistralai/mistralai': 1.3.4(zod@3.24.1)
       uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
 
-  '@langchain/ollama@0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/ollama@0.1.4(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       ollama: 0.5.9
       uuid: 10.0.0
 
-  '@langchain/openai@0.3.14(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/openai@0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       js-tiktoken: 1.0.12
-      openai: 4.73.1(encoding@0.1.13)(zod@3.23.8)
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@langchain/pinecone@0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/pinecone@0.1.3(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@pinecone-database/pinecone': 4.0.0
       flat: 5.0.2
       uuid: 10.0.0
 
-  '@langchain/qdrant@0.1.1(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(typescript@5.7.2)':
+  '@langchain/qdrant@0.1.1(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(typescript@5.7.2)':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       '@qdrant/js-client-rest': 1.11.0(typescript@5.7.2)
       uuid: 10.0.0
     transitivePeerDependencies:
       - typescript
 
-  '@langchain/redis@0.1.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/redis@0.1.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       redis: 4.6.14
 
-  '@langchain/textsplitters@0.1.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/textsplitters@0.1.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))':
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       js-tiktoken: 1.0.12
 
   '@lezer/common@1.1.0': {}
@@ -16513,9 +16867,9 @@ snapshots:
 
   '@miragejs/pretender-node-polyfill@0.1.2': {}
 
-  '@mistralai/mistralai@1.3.4(zod@3.23.8)':
+  '@mistralai/mistralai@1.3.4(zod@3.24.1)':
     dependencies:
-      zod: 3.23.8
+      zod: 3.24.1
 
   '@mongodb-js/saslprep@1.1.9':
     dependencies:
@@ -16541,6 +16895,15 @@ snapshots:
   '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2':
     optional: true
 
+  '@mswjs/interceptors@0.37.5':
+    dependencies:
+      '@open-draft/deferred-promise': 2.2.0
+      '@open-draft/logger': 0.3.0
+      '@open-draft/until': 2.1.0
+      is-node-process: 1.2.0
+      outvariant: 1.4.3
+      strict-event-emitter: 0.5.1
+
   '@n8n/codemirror-lang-sql@1.0.2(@codemirror/view@6.26.3)(@lezer/common@1.1.0)':
     dependencies:
       '@codemirror/autocomplete': 6.16.0(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)(@lezer/common@1.1.0)
@@ -16572,7 +16935,7 @@ snapshots:
       esprima-next: 5.8.4
       recast: 0.22.0
 
-  '@n8n/typeorm@0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
+  '@n8n/typeorm@0.3.20-12(@sentry/node@8.52.1)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.12)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -16592,7 +16955,7 @@ snapshots:
       uuid: 9.0.1
       yargs: 17.7.2
     optionalDependencies:
-      '@sentry/node': 8.42.0
+      '@sentry/node': 8.52.1
       ioredis: 5.3.2
       mssql: 10.0.2
       mysql2: 3.11.0
@@ -16603,7 +16966,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@n8n/typeorm@0.3.20-12(@sentry/node@8.42.0)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
+  '@n8n/typeorm@0.3.20-12(@sentry/node@8.52.1)(ioredis@5.3.2)(mssql@10.0.2)(mysql2@3.11.0)(pg@8.12.0)(redis@4.6.14)(sqlite3@5.1.7)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.7.2))':
     dependencies:
       '@n8n/p-retry': 6.2.0-2
       '@sqltools/formatter': 1.2.5
@@ -16623,7 +16986,7 @@ snapshots:
       uuid: 9.0.1
       yargs: 17.7.2
     optionalDependencies:
-      '@sentry/node': 8.42.0
+      '@sentry/node': 8.52.1
       ioredis: 5.3.2
       mssql: 10.0.2
       mysql2: 3.11.0
@@ -16641,12 +17004,12 @@ snapshots:
 
   '@n8n_io/ai-assistant-sdk@1.13.0': {}
 
-  '@n8n_io/license-sdk@2.13.1':
+  '@n8n_io/license-sdk@2.15.1':
     dependencies:
       crypto-js: 4.2.0
       node-machine-id: 1.1.12
       node-rsa: 1.1.1
-      undici: 6.19.7
+      undici: 6.21.1
 
   '@n8n_io/riot-tmpl@4.0.0':
     dependencies:
@@ -16707,251 +17070,239 @@ snapshots:
 
   '@one-ini/wasm@0.1.1': {}
 
-  '@opentelemetry/api-logs@0.52.1':
+  '@open-draft/deferred-promise@2.2.0': {}
+
+  '@open-draft/logger@0.3.0':
     dependencies:
-      '@opentelemetry/api': 1.9.0
+      is-node-process: 1.2.0
+      outvariant: 1.4.3
+
+  '@open-draft/until@2.1.0': {}
 
   '@opentelemetry/api-logs@0.53.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
-  '@opentelemetry/api-logs@0.54.2':
+  '@opentelemetry/api-logs@0.56.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
-  '@opentelemetry/api@1.2.0': {}
-
   '@opentelemetry/api@1.9.0': {}
 
   '@opentelemetry/context-async-hooks@1.29.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
 
-  '@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0)':
-    dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/semantic-conventions': 1.27.0
-
   '@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/semantic-conventions': 1.28.0
 
-  '@opentelemetry/instrumentation-amqplib@0.43.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-amqplib@0.45.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-connect@0.40.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-connect@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
       '@types/connect': 3.4.36
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-dataloader@0.12.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-dataloader@0.15.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-express@0.44.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-express@0.46.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-fastify@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-fastify@0.43.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-fs@0.16.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-fs@0.18.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-generic-pool@0.39.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-generic-pool@0.42.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-graphql@0.44.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-graphql@0.46.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-hapi@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-hapi@0.44.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-http@0.53.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-http@0.56.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.27.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      forwarded-parse: 2.1.2
       semver: 7.6.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-ioredis@0.43.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-ioredis@0.46.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.36.2
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-kafkajs@0.4.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-kafkajs@0.6.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-knex@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-knex@0.43.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-koa@0.43.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-koa@0.46.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-lru-memoizer@0.40.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-lru-memoizer@0.43.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongodb@0.48.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mongodb@0.50.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mongoose@0.42.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mongoose@0.45.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql2@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mysql2@0.44.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
       '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-mysql@0.41.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-mysql@0.44.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
       '@types/mysql': 2.15.26
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-nestjs-core@0.40.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-nestjs-core@0.43.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-pg@0.44.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-pg@0.49.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/semantic-conventions': 1.28.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
       '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
       '@types/pg': 8.6.1
       '@types/pg-pool': 2.0.6
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-redis-4@0.42.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-redis-4@0.45.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/redis-common': 0.36.2
       '@opentelemetry/semantic-conventions': 1.28.0
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-tedious@0.15.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-tedious@0.17.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
       '@types/tedious': 4.0.14
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation-undici@0.6.0(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation-undici@0.9.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  '@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0)':
-    dependencies:
-      '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.52.1
-      '@types/shimmer': 1.2.0
-      import-in-the-middle: 1.11.3
-      require-in-the-middle: 7.4.0
-      semver: 7.6.0
-      shimmer: 1.2.1
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -16967,10 +17318,10 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0)':
+  '@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/api-logs': 0.54.2
+      '@opentelemetry/api-logs': 0.56.0
       '@types/shimmer': 1.2.0
       import-in-the-middle: 1.11.3
       require-in-the-middle: 7.4.0
@@ -17041,10 +17392,14 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
-  '@prisma/instrumentation@5.19.1':
+  '@playwright/test@1.49.1':
+    dependencies:
+      playwright: 1.49.1
+
+  '@prisma/instrumentation@5.22.0':
     dependencies:
       '@opentelemetry/api': 1.9.0
-      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
     transitivePeerDependencies:
       - supports-color
@@ -17077,7 +17432,7 @@ snapshots:
       '@qdrant/openapi-typescript-fetch': 1.2.6
       '@sevinf/maybe': 0.5.0
       typescript: 5.7.2
-      undici: 5.28.4
+      undici: 5.28.5
 
   '@qdrant/openapi-typescript-fetch@1.2.6': {}
 
@@ -17146,7 +17501,7 @@ snapshots:
       abort-controller: 3.0.0
       chokidar: 4.0.1
       colorette: 1.4.0
-      core-js: 3.35.0
+      core-js: 3.39.0
       form-data: 4.0.0
       get-port-please: 3.1.2
       glob: 7.2.3
@@ -17156,7 +17511,7 @@ snapshots:
       pluralize: 8.0.0
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      redoc: 2.1.5(core-js@3.35.0)(encoding@0.1.13)(enzyme@3.11.0)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0))
+      redoc: 2.1.5(core-js@3.39.0)(encoding@0.1.13)(enzyme@3.11.0)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0))
       semver: 7.6.0
       simple-websocket: 9.1.0
       styled-components: 6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -17350,56 +17705,56 @@ snapshots:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry/core@8.42.0': {}
+  '@sentry/core@8.52.1': {}
 
-  '@sentry/node@8.42.0':
+  '@sentry/node@8.52.1':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/context-async-hooks': 1.29.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-amqplib': 0.43.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-connect': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-dataloader': 0.12.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-express': 0.44.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-fastify': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-fs': 0.16.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-generic-pool': 0.39.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-graphql': 0.44.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-hapi': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-ioredis': 0.43.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-kafkajs': 0.4.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-knex': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-koa': 0.43.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-lru-memoizer': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongodb': 0.48.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mongoose': 0.42.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-mysql2': 0.41.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-nestjs-core': 0.40.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-pg': 0.44.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-redis-4': 0.42.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-tedious': 0.15.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation-undici': 0.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-amqplib': 0.45.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-dataloader': 0.15.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.46.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fastify': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fs': 0.18.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-generic-pool': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.46.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.56.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.46.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-kafkajs': 0.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-knex': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.46.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.50.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.45.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-nestjs-core': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.49.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.45.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-tedious': 0.17.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici': 0.9.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/resources': 1.29.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
-      '@prisma/instrumentation': 5.19.1
-      '@sentry/core': 8.42.0
-      '@sentry/opentelemetry': 8.42.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)
+      '@prisma/instrumentation': 5.22.0
+      '@sentry/core': 8.52.1
+      '@sentry/opentelemetry': 8.52.1(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)
       import-in-the-middle: 1.11.3
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/opentelemetry@8.42.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)':
+  '@sentry/opentelemetry@8.52.1(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.56.0(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)':
     dependencies:
       '@opentelemetry/api': 1.9.0
       '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
-      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.56.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
       '@opentelemetry/semantic-conventions': 1.28.0
-      '@sentry/core': 8.42.0
+      '@sentry/core': 8.52.1
 
   '@sentry/types@8.33.1': {}
 
@@ -17896,138 +18251,142 @@ snapshots:
 
   '@sqltools/formatter@1.2.5': {}
 
-  '@storybook/addon-a11y@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-a11y@8.5.0(storybook@8.5.0(prettier@3.3.3))(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
-      '@storybook/addon-highlight': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-highlight': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/test': 8.5.0(storybook@8.5.0(prettier@3.3.3))
       axe-core: 4.7.2
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
+      vitest-axe: 0.1.0(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+    transitivePeerDependencies:
+      - vitest
 
-  '@storybook/addon-actions@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-actions@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.8
       dequal: 2.0.3
       polished: 4.2.2
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       uuid: 9.0.1
 
-  '@storybook/addon-backgrounds@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-backgrounds@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-controls@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-controls@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       dequal: 2.0.3
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-docs@8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-docs@8.5.0(@types/react@18.0.27)(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@mdx-js/react': 3.0.1(@types/react@18.0.27)(react@18.2.0)
-      '@storybook/blocks': 8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/csf-plugin': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/react-dom-shim': 8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/blocks': 8.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/csf-plugin': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/react-dom-shim': 8.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
 
-  '@storybook/addon-essentials@8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-essentials@8.5.0(@types/react@18.0.27)(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      '@storybook/addon-actions': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-backgrounds': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-controls': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-docs': 8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-highlight': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-measure': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-outline': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-toolbars': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/addon-viewport': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      storybook: 8.4.6(prettier@3.3.3)
+      '@storybook/addon-actions': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-backgrounds': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-controls': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-docs': 8.5.0(@types/react@18.0.27)(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-highlight': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-measure': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-outline': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-toolbars': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/addon-viewport': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - '@types/react'
 
-  '@storybook/addon-highlight@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-highlight@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/addon-interactions@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-interactions@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/test': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/instrumenter': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/test': 8.5.0(storybook@8.5.0(prettier@3.3.3))
       polished: 4.2.2
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-links@8.4.6(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-links@8.5.0(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      '@storybook/csf': 0.1.11
+      '@storybook/csf': 0.1.12
       '@storybook/global': 5.0.0
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
     optionalDependencies:
       react: 18.2.0
 
-  '@storybook/addon-measure@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-measure@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       tiny-invariant: 1.3.3
 
-  '@storybook/addon-outline@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-outline@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-themes@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-themes@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-toolbars@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-toolbars@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/addon-viewport@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/addon-viewport@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       memoizerific: 1.11.3
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/blocks@8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/blocks@8.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      '@storybook/csf': 0.1.11
+      '@storybook/csf': 0.1.12
       '@storybook/icons': 1.2.12(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
     optionalDependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/builder-vite@8.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))':
+  '@storybook/builder-vite@8.5.0(storybook@8.5.0(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
-      '@storybook/csf-plugin': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/csf-plugin': 8.5.0(storybook@8.5.0(prettier@3.3.3))
       browser-assert: 1.2.1
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
       vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
 
-  '@storybook/components@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/components@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/core@8.4.6(prettier@3.3.3)':
+  '@storybook/core@8.5.0(prettier@3.3.3)':
     dependencies:
-      '@storybook/csf': 0.1.11
+      '@storybook/csf': 0.1.12
       better-opn: 3.0.2
       browser-assert: 1.2.1
       esbuild: 0.24.0
@@ -18045,12 +18404,12 @@ snapshots:
       - supports-color
       - utf-8-validate
 
-  '@storybook/csf-plugin@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/csf-plugin@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       unplugin: 1.11.0
 
-  '@storybook/csf@0.1.11':
+  '@storybook/csf@0.1.12':
     dependencies:
       type-fest: 2.19.0
 
@@ -18061,49 +18420,49 @@ snapshots:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/instrumenter@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/instrumenter@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       '@vitest/utils': 2.1.8
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/manager-api@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/manager-api@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/preview-api@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/preview-api@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/react-dom-shim@8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/react-dom-shim@8.5.0(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/test@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/test@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      '@storybook/csf': 0.1.11
+      '@storybook/csf': 0.1.12
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/instrumenter': 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@testing-library/dom': 10.4.0
       '@testing-library/jest-dom': 6.5.0
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.4.0)
       '@vitest/expect': 2.0.5
       '@vitest/spy': 2.0.5
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/theming@8.4.6(storybook@8.4.6(prettier@3.3.3))':
+  '@storybook/theming@8.5.0(storybook@8.5.0(prettier@3.3.3))':
     dependencies:
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
 
-  '@storybook/vue3-vite@8.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))':
+  '@storybook/vue3-vite@8.5.0(storybook@8.5.0(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@storybook/builder-vite': 8.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
-      '@storybook/vue3': 8.4.6(storybook@8.4.6(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))
+      '@storybook/builder-vite': 8.5.0(storybook@8.5.0(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      '@storybook/vue3': 8.5.0(storybook@8.5.0(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))
       find-package-json: 1.2.0
       magic-string: 0.30.14
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       typescript: 5.7.2
       vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
       vue-component-meta: 2.1.10(typescript@5.7.2)
@@ -18111,15 +18470,15 @@ snapshots:
     transitivePeerDependencies:
       - vue
 
-  '@storybook/vue3@8.4.6(storybook@8.4.6(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))':
+  '@storybook/vue3@8.5.0(storybook@8.5.0(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@storybook/components': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/components': 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/preview-api': 8.4.6(storybook@8.4.6(prettier@3.3.3))
-      '@storybook/theming': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/manager-api': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/preview-api': 8.5.0(storybook@8.5.0(prettier@3.3.3))
+      '@storybook/theming': 8.5.0(storybook@8.5.0(prettier@3.3.3))
       '@vue/compiler-core': 3.5.13
-      storybook: 8.4.6(prettier@3.3.3)
+      storybook: 8.5.0(prettier@3.3.3)
       ts-dedent: 2.2.0
       type-fest: 2.19.0
       vue: 3.5.13(typescript@5.7.2)
@@ -18183,7 +18542,7 @@ snapshots:
 
   '@testing-library/dom@10.4.0':
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@babel/runtime': 7.24.7
       '@types/aria-query': 5.0.1
       aria-query: 5.3.0
@@ -18194,7 +18553,7 @@ snapshots:
 
   '@testing-library/dom@9.3.4':
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@babel/runtime': 7.24.7
       '@types/aria-query': 5.0.1
       aria-query: 5.1.3
@@ -18213,10 +18572,24 @@ snapshots:
       lodash: 4.17.21
       redent: 3.0.0
 
+  '@testing-library/jest-dom@6.6.3':
+    dependencies:
+      '@adobe/css-tools': 4.4.0
+      aria-query: 5.3.0
+      chalk: 3.0.0
+      css.escape: 1.5.1
+      dom-accessibility-api: 0.6.3
+      lodash: 4.17.21
+      redent: 3.0.0
+
   '@testing-library/user-event@14.5.2(@testing-library/dom@10.4.0)':
     dependencies:
       '@testing-library/dom': 10.4.0
 
+  '@testing-library/user-event@14.6.0(@testing-library/dom@10.4.0)':
+    dependencies:
+      '@testing-library/dom': 10.4.0
+
   '@testing-library/vue@8.1.0(@vue/compiler-sfc@3.5.13)(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@babel/runtime': 7.24.7
@@ -18787,7 +19160,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/typescript-estree': 7.2.0(typescript@5.7.2)
       '@typescript-eslint/utils': 7.2.0(eslint@8.57.0)(typescript@5.7.2)
-      debug: 4.3.7
+      debug: 4.4.0
       eslint: 8.57.0
       ts-api-utils: 1.0.1(typescript@5.7.2)
     optionalDependencies:
@@ -18803,7 +19176,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 6.21.0
       '@typescript-eslint/visitor-keys': 6.21.0
-      debug: 4.3.7
+      debug: 4.4.0
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -18818,7 +19191,7 @@ snapshots:
     dependencies:
       '@typescript-eslint/types': 7.2.0
       '@typescript-eslint/visitor-keys': 7.2.0
-      debug: 4.3.7
+      debug: 4.4.0
       globby: 11.1.0
       is-glob: 4.0.3
       minimatch: 9.0.3
@@ -18882,7 +19255,7 @@ snapshots:
       '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
       browserslist: 4.24.2
       browserslist-to-esbuild: 2.1.1(browserslist@4.24.2)
-      core-js: 3.39.0
+      core-js: 3.40.0
       magic-string: 0.30.14
       regenerator-runtime: 0.14.1
       systemjs: 6.15.1
@@ -18896,21 +19269,21 @@ snapshots:
       vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vitest/coverage-v8@2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
+  '@vitest/coverage-v8@3.0.2(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@bcoe/v8-coverage': 0.2.3
-      debug: 4.3.7
+      '@bcoe/v8-coverage': 1.0.2
+      debug: 4.4.0
       istanbul-lib-coverage: 3.2.2
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
       istanbul-reports: 3.1.7
-      magic-string: 0.30.14
+      magic-string: 0.30.17
       magicast: 0.3.5
       std-env: 3.8.0
       test-exclude: 7.0.1
-      tinyrainbow: 1.2.0
-      vitest: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      tinyrainbow: 2.0.0
+      vitest: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -18921,20 +19294,20 @@ snapshots:
       chai: 5.1.2
       tinyrainbow: 1.2.0
 
-  '@vitest/expect@2.1.8':
+  '@vitest/expect@3.0.2':
     dependencies:
-      '@vitest/spy': 2.1.8
-      '@vitest/utils': 2.1.8
+      '@vitest/spy': 3.0.2
+      '@vitest/utils': 3.0.2
       chai: 5.1.2
-      tinyrainbow: 1.2.0
+      tinyrainbow: 2.0.0
 
-  '@vitest/mocker@2.1.8(vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
+  '@vitest/mocker@3.0.2(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
-      '@vitest/spy': 2.1.8
+      '@vitest/spy': 3.0.2
       estree-walker: 3.0.3
-      magic-string: 0.30.14
+      magic-string: 0.30.17
     optionalDependencies:
-      vite: 5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
 
   '@vitest/pretty-format@2.0.5':
     dependencies:
@@ -18944,22 +19317,26 @@ snapshots:
     dependencies:
       tinyrainbow: 1.2.0
 
-  '@vitest/runner@2.1.8':
+  '@vitest/pretty-format@3.0.2':
     dependencies:
-      '@vitest/utils': 2.1.8
-      pathe: 1.1.2
+      tinyrainbow: 2.0.0
 
-  '@vitest/snapshot@2.1.8':
+  '@vitest/runner@3.0.2':
     dependencies:
-      '@vitest/pretty-format': 2.1.8
-      magic-string: 0.30.14
-      pathe: 1.1.2
+      '@vitest/utils': 3.0.2
+      pathe: 2.0.2
+
+  '@vitest/snapshot@3.0.2':
+    dependencies:
+      '@vitest/pretty-format': 3.0.2
+      magic-string: 0.30.17
+      pathe: 2.0.2
 
   '@vitest/spy@2.0.5':
     dependencies:
       tinyspy: 3.0.2
 
-  '@vitest/spy@2.1.8':
+  '@vitest/spy@3.0.2':
     dependencies:
       tinyspy: 3.0.2
 
@@ -18976,6 +19353,12 @@ snapshots:
       loupe: 3.1.2
       tinyrainbow: 1.2.0
 
+  '@vitest/utils@3.0.2':
+    dependencies:
+      '@vitest/pretty-format': 3.0.2
+      loupe: 3.1.2
+      tinyrainbow: 2.0.0
+
   '@volar/language-core@2.4.10':
     dependencies:
       '@volar/source-map': 2.4.10
@@ -18988,17 +19371,17 @@ snapshots:
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@vue-flow/background@1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/background@1.3.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.7.2))
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/controls@1.1.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.7.2))
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@vueuse/core': 10.11.0(vue@3.5.13(typescript@5.7.2))
       d3-drag: 3.0.0
@@ -19008,23 +19391,23 @@ snapshots:
     transitivePeerDependencies:
       - '@vue/composition-api'
 
-  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/minimap@1.5.2(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.7.2))
       d3-selection: 3.0.0
       d3-zoom: 3.0.0
       vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
+  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.42.1(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
+      '@vue-flow/core': 1.42.1(vue@3.5.13(typescript@5.7.2))
       d3-drag: 3.0.0
       d3-selection: 3.0.0
       vue: 3.5.13(typescript@5.7.2)
 
   '@vue/compiler-core@3.5.13':
     dependencies:
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@vue/shared': 3.5.13
       entities: 4.5.0
       estree-walker: 2.0.2
@@ -19043,7 +19426,7 @@ snapshots:
       '@vue/compiler-ssr': 3.5.13
       '@vue/shared': 3.5.13
       estree-walker: 2.0.2
-      magic-string: 0.30.14
+      magic-string: 0.30.17
       postcss: 8.4.49
       source-map-js: 1.2.1
 
@@ -19128,6 +19511,11 @@ snapshots:
       js-beautify: 1.14.9
       vue-component-type-helpers: 2.2.0
 
+  '@vue/tsconfig@0.7.0(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2))':
+    optionalDependencies:
+      typescript: 5.7.2
+      vue: 3.5.13(typescript@5.7.2)
+
   '@vueuse/components@10.11.0(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@vueuse/core': 10.11.0(vue@3.5.13(typescript@5.7.2))
@@ -19183,8 +19571,6 @@ snapshots:
 
   '@xmldom/xmldom@0.8.6': {}
 
-  a-sync-waterfall@1.0.1: {}
-
   abab@2.0.6: {}
 
   abbrev@1.1.1: {}
@@ -19225,19 +19611,19 @@ snapshots:
 
   agent-base@6.0.2:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   agent-base@7.1.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   agentkeepalive@4.2.1:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       depd: 1.1.2
       humanize-ms: 1.2.1
     transitivePeerDependencies:
@@ -19320,10 +19706,6 @@ snapshots:
 
   ansi-regex@6.0.1: {}
 
-  ansi-styles@3.2.1:
-    dependencies:
-      color-convert: 1.9.3
-
   ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
@@ -19375,11 +19757,6 @@ snapshots:
     dependencies:
       dequal: 2.0.3
 
-  array-buffer-byte-length@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      is-array-buffer: 3.0.2
-
   array-buffer-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
@@ -19437,15 +19814,6 @@ snapshots:
       es-abstract: 1.22.5
       es-shim-unscopables: 1.0.0
 
-  arraybuffer.prototype.slice@1.0.1:
-    dependencies:
-      array-buffer-byte-length: 1.0.0
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      get-intrinsic: 1.2.4
-      is-array-buffer: 3.0.2
-      is-shared-array-buffer: 1.0.2
-
   arraybuffer.prototype.slice@1.0.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -19560,6 +19928,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  axios@1.7.4(debug@4.4.0):
+    dependencies:
+      follow-redirects: 1.15.6(debug@4.4.0)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   axios@1.7.7:
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.6)
@@ -19826,7 +20202,7 @@ snapshots:
       - supports-color
     optional: true
 
-  bull@4.12.1:
+  bull@4.12.1(patch_hash=ep6h4rqtpclldfcdohxlgcb3aq):
     dependencies:
       cron-parser: 4.9.0
       get-port: 5.1.1
@@ -19838,6 +20214,11 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  bundle-require@5.1.0(esbuild@0.24.0):
+    dependencies:
+      esbuild: 0.24.0
+      load-tsconfig: 0.2.5
+
   busboy@1.6.0:
     dependencies:
       streamsearch: 1.1.0
@@ -19929,12 +20310,6 @@ snapshots:
       loupe: 3.1.2
       pathval: 2.0.0
 
-  chalk@2.4.2:
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-
   chalk@3.0.0:
     dependencies:
       ansi-styles: 4.3.0
@@ -19945,6 +20320,8 @@ snapshots:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
 
+  chalk@5.4.1: {}
+
   change-case@4.1.2:
     dependencies:
       camel-case: 4.1.2
@@ -20010,7 +20387,7 @@ snapshots:
       parse5: 7.1.2
       parse5-htmlparser2-tree-adapter: 7.0.0
       parse5-parser-stream: 7.1.2
-      undici: 6.19.7
+      undici: 6.21.1
       whatwg-mimetype: 4.0.0
 
   cheerio@1.0.0-rc.12:
@@ -20040,7 +20417,7 @@ snapshots:
 
   chownr@2.0.0: {}
 
-  chromatic@11.20.0: {}
+  chromatic@11.25.0: {}
 
   ci-info@3.8.0: {}
 
@@ -20169,6 +20546,11 @@ snapshots:
       color-convert: 1.9.3
       color-string: 1.9.1
 
+  color@4.2.3:
+    dependencies:
+      color-convert: 2.0.1
+      color-string: 1.9.1
+
   colorette@1.4.0: {}
 
   colorette@2.0.19: {}
@@ -20194,8 +20576,6 @@ snapshots:
 
   commander@4.1.1: {}
 
-  commander@5.1.0: {}
-
   commander@6.2.1: {}
 
   commander@7.2.0: {}
@@ -20267,6 +20647,8 @@ snapshots:
 
   confusing-browser-globals@1.0.11: {}
 
+  consola@3.4.0: {}
+
   console-control-strings@1.1.0:
     optional: true
 
@@ -20303,8 +20685,6 @@ snapshots:
 
   cookie-signature@1.0.6: {}
 
-  cookie@0.4.2: {}
-
   cookie@0.7.1: {}
 
   cookie@0.7.2: {}
@@ -20319,10 +20699,10 @@ snapshots:
     dependencies:
       browserslist: 4.24.2
 
-  core-js@3.35.0: {}
-
   core-js@3.39.0: {}
 
+  core-js@3.40.0: {}
+
   core-util-is@1.0.2: {}
 
   core-util-is@1.0.3: {}
@@ -20448,17 +20828,14 @@ snapshots:
 
   csv-parse@5.5.0: {}
 
-  curlconverter@3.21.0(chokidar@4.0.1):
+  curlconverter@4.12.0:
     dependencies:
-      '@curlconverter/yargs': 0.0.2
-      cookie: 0.4.2
       jsesc: 3.0.2
-      nunjucks: 3.2.4(chokidar@4.0.1)
-      query-string: 7.1.3
-      string.prototype.startswith: 1.0.0
+      lossless-json: 4.0.2
+      tree-sitter: 0.21.1
+      tree-sitter-bash: 0.23.3(tree-sitter@0.21.1)
+      web-tree-sitter: 0.24.3
       yamljs: 0.3.0
-    transitivePeerDependencies:
-      - chokidar
 
   currency-codes@2.1.0:
     dependencies:
@@ -20641,14 +21018,16 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  debug@4.4.0:
+    dependencies:
+      ms: 2.1.3
+
   decamelize@1.2.0: {}
 
   decimal.js@10.4.3: {}
 
   decko@1.2.0: {}
 
-  decode-uri-component@0.2.2: {}
-
   decompress-response@6.0.0:
     dependencies:
       mimic-response: 3.1.0
@@ -20723,6 +21102,8 @@ snapshots:
 
   detect-libc@2.0.1: {}
 
+  detect-libc@2.0.3: {}
+
   detect-newline@3.1.0: {}
 
   detect-node@2.1.0: {}
@@ -20995,48 +21376,6 @@ snapshots:
     dependencies:
       is-arrayish: 0.2.1
 
-  es-abstract@1.22.1:
-    dependencies:
-      array-buffer-byte-length: 1.0.0
-      arraybuffer.prototype.slice: 1.0.1
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      es-set-tostringtag: 2.0.1
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.5
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.0
-      globalthis: 1.0.3
-      gopd: 1.0.1
-      has: 1.0.3
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      internal-slot: 1.0.5
-      is-array-buffer: 3.0.2
-      is-callable: 1.2.7
-      is-negative-zero: 2.0.2
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.2
-      is-string: 1.0.7
-      is-typed-array: 1.1.13
-      is-weakref: 1.0.2
-      object-inspect: 1.13.1
-      object-keys: 1.1.1
-      object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.0
-      safe-array-concat: 1.0.0
-      safe-regex-test: 1.0.0
-      string.prototype.trim: 1.2.7
-      string.prototype.trimend: 1.0.6
-      string.prototype.trimstart: 1.0.6
-      typed-array-buffer: 1.0.0
-      typed-array-byte-length: 1.0.0
-      typed-array-byte-offset: 1.0.0
-      typed-array-length: 1.0.4
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.15
-
   es-abstract@1.22.5:
     dependencies:
       array-buffer-byte-length: 1.0.1
@@ -21161,18 +21500,12 @@ snapshots:
       isarray: 2.0.5
       stop-iteration-iterator: 1.0.0
 
-  es-module-lexer@1.5.4: {}
+  es-module-lexer@1.6.0: {}
 
   es-object-atoms@1.0.0:
     dependencies:
       es-errors: 1.3.0
 
-  es-set-tostringtag@2.0.1:
-    dependencies:
-      get-intrinsic: 1.2.4
-      has: 1.0.3
-      has-tostringtag: 1.0.2
-
   es-set-tostringtag@2.0.3:
     dependencies:
       get-intrinsic: 1.2.4
@@ -21193,7 +21526,7 @@ snapshots:
 
   esbuild-register@3.5.0(esbuild@0.24.0):
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       esbuild: 0.24.0
     transitivePeerDependencies:
       - supports-color
@@ -21728,6 +22061,10 @@ snapshots:
     dependencies:
       pend: 1.2.0
 
+  fdir@6.4.3(picomatch@4.0.2):
+    optionalDependencies:
+      picomatch: 4.0.2
+
   fecha@4.2.3: {}
 
   fengari-interop@0.1.3(fengari@0.1.4):
@@ -21770,8 +22107,6 @@ snapshots:
     dependencies:
       to-regex-range: 5.0.1
 
-  filter-obj@1.1.0: {}
-
   finalhandler@1.3.1:
     dependencies:
       debug: 2.6.9
@@ -21817,6 +22152,10 @@ snapshots:
     optionalDependencies:
       debug: 4.3.7
 
+  follow-redirects@1.15.6(debug@4.4.0):
+    optionalDependencies:
+      debug: 4.4.0
+
   for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
@@ -21871,6 +22210,8 @@ snapshots:
       hexoid: 1.0.0
       once: 1.4.0
 
+  forwarded-parse@2.1.2: {}
+
   forwarded@0.2.0: {}
 
   fraction.js@4.3.7: {}
@@ -21881,6 +22222,12 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
+  fs-extra@11.3.0:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 6.1.0
+      universalify: 2.0.0
+
   fs-extra@7.0.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -21900,18 +22247,14 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
+  fsevents@2.3.2:
+    optional: true
+
   fsevents@2.3.3:
     optional: true
 
   function-bind@1.1.2: {}
 
-  function.prototype.name@1.1.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.5
-      functions-have-names: 1.2.3
-
   function.prototype.name@1.1.6:
     dependencies:
       call-bind: 1.0.7
@@ -22005,11 +22348,6 @@ snapshots:
 
   get-stream@6.0.1: {}
 
-  get-symbol-description@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
   get-symbol-description@1.0.2:
     dependencies:
       call-bind: 1.0.7
@@ -22240,10 +22578,6 @@ snapshots:
 
   hash-sum@2.0.0: {}
 
-  hasown@2.0.0:
-    dependencies:
-      function-bind: 1.1.2
-
   hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
@@ -22349,7 +22683,7 @@ snapshots:
     dependencies:
       '@tootallnate/once': 1.1.2
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
     optional: true
@@ -22358,14 +22692,14 @@ snapshots:
     dependencies:
       '@tootallnate/once': 2.0.0
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   http-proxy-agent@7.0.0:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -22380,21 +22714,21 @@ snapshots:
   https-proxy-agent@5.0.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
   https-proxy-agent@7.0.5:
     dependencies:
       agent-base: 7.1.0
-      debug: 4.3.7
+      debug: 4.4.0
     transitivePeerDependencies:
       - supports-color
 
@@ -22413,9 +22747,9 @@ snapshots:
       '@types/debug': 4.1.12
       '@types/node': 18.16.16
       '@types/tough-cookie': 4.0.2
-      axios: 1.7.4
+      axios: 1.7.4(debug@4.4.0)
       camelcase: 6.3.0
-      debug: 4.3.7
+      debug: 4.4.0
       dotenv: 16.4.5
       extend: 3.0.2
       file-type: 16.5.4
@@ -22524,12 +22858,6 @@ snapshots:
       strip-ansi: 6.0.1
       through: 2.3.8
 
-  internal-slot@1.0.5:
-    dependencies:
-      get-intrinsic: 1.2.4
-      has: 1.0.3
-      side-channel: 1.0.6
-
   internal-slot@1.0.7:
     dependencies:
       es-errors: 1.3.0
@@ -22575,12 +22903,6 @@ snapshots:
       call-bind: 1.0.7
       has-tostringtag: 1.0.2
 
-  is-array-buffer@3.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      is-typed-array: 1.1.13
-
   is-array-buffer@3.0.4:
     dependencies:
       call-bind: 1.0.7
@@ -22613,7 +22935,7 @@ snapshots:
 
   is-core-module@2.13.1:
     dependencies:
-      hasown: 2.0.0
+      hasown: 2.0.2
 
   is-data-view@1.0.1:
     dependencies:
@@ -22661,10 +22983,10 @@ snapshots:
       call-bind: 1.0.7
       define-properties: 1.2.1
 
-  is-negative-zero@2.0.2: {}
-
   is-negative-zero@2.0.3: {}
 
+  is-node-process@1.2.0: {}
+
   is-number-object@1.0.7:
     dependencies:
       has-tostringtag: 1.0.2
@@ -22690,10 +23012,6 @@ snapshots:
 
   is-set@2.0.2: {}
 
-  is-shared-array-buffer@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-
   is-shared-array-buffer@1.0.3:
     dependencies:
       call-bind: 1.0.7
@@ -22769,7 +23087,7 @@ snapshots:
 
   istanbul-lib-source-maps@4.0.1:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       istanbul-lib-coverage: 3.2.2
       source-map: 0.6.1
     transitivePeerDependencies:
@@ -22778,7 +23096,7 @@ snapshots:
   istanbul-lib-source-maps@5.0.6:
     dependencies:
       '@jridgewell/trace-mapping': 0.3.25
-      debug: 4.3.7
+      debug: 4.4.0
       istanbul-lib-coverage: 3.2.2
     transitivePeerDependencies:
       - supports-color
@@ -22980,7 +23298,7 @@ snapshots:
 
   jest-message-util@29.5.0:
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@jest/types': 29.6.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
@@ -22992,7 +23310,7 @@ snapshots:
 
   jest-message-util@29.6.2:
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       '@jest/types': 29.6.1
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
@@ -23098,7 +23416,7 @@ snapshots:
       '@babel/generator': 7.22.9
       '@babel/plugin-syntax-jsx': 7.18.6(@babel/core@7.24.0)
       '@babel/plugin-syntax-typescript': 7.20.0(@babel/core@7.24.0)
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
       '@jest/expect-utils': 29.6.2
       '@jest/transform': 29.6.2
       '@jest/types': 29.6.1
@@ -23190,6 +23508,8 @@ snapshots:
 
   join-component@1.1.0: {}
 
+  joycon@3.1.1: {}
+
   js-base64@3.7.2: {}
 
   js-beautify@1.14.9:
@@ -23330,8 +23650,6 @@ snapshots:
 
   json5@2.2.3: {}
 
-  jsonc-parser@3.2.0: {}
-
   jsonfile@4.0.0:
     optionalDependencies:
       graceful-fs: 4.2.11
@@ -23428,30 +23746,30 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.3.6(4axcxpjbcq5bce7ff6ajxrpp4i):
+  langchain@0.3.11(uhxpxbd3xjubkjdqqkxxpkezmi):
     dependencies:
-      '@langchain/core': 0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/openai': 0.3.14(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/textsplitters': 0.1.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+      '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
+      '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
+      '@langchain/textsplitters': 0.1.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
-      langsmith: 0.2.3(openai@4.73.1(encoding@0.1.13)(zod@3.23.8))
+      langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))
       openapi-types: 12.1.3
       p-retry: 4.6.2
       uuid: 10.0.0
       yaml: 2.3.4
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
+      zod: 3.24.1
+      zod-to-json-schema: 3.23.3(zod@3.24.1)
     optionalDependencies:
-      '@langchain/anthropic': 0.3.8(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/aws': 0.1.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
-      '@langchain/cohere': 0.3.1(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/google-genai': 0.1.4(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
-      '@langchain/google-vertexai': 0.1.3(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
-      '@langchain/groq': 0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/mistralai': 0.2.0(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
-      '@langchain/ollama': 0.1.2(@langchain/core@0.3.19(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)))
+      '@langchain/anthropic': 0.3.11(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
+      '@langchain/aws': 0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
+      '@langchain/cohere': 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
+      '@langchain/google-genai': 0.1.6(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(zod@3.24.1)
+      '@langchain/google-vertexai': 0.1.8(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(zod@3.24.1)
+      '@langchain/groq': 0.1.3(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)
+      '@langchain/mistralai': 0.2.0(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
+      '@langchain/ollama': 0.1.4(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))
       axios: 1.7.4
       cheerio: 1.0.0
       handlebars: 4.7.8
@@ -23460,7 +23778,7 @@ snapshots:
       - openai
       - supports-color
 
-  langsmith@0.2.3(openai@4.73.1(encoding@0.1.13)(zod@3.23.8)):
+  langsmith@0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)):
     dependencies:
       '@types/uuid': 10.0.0
       commander: 10.0.1
@@ -23469,7 +23787,7 @@ snapshots:
       semver: 7.6.0
       uuid: 10.0.0
     optionalDependencies:
-      openai: 4.73.1(encoding@0.1.13)(zod@3.23.8)
+      openai: 4.78.1(encoding@0.1.13)(zod@3.24.1)
 
   lazy-ass@1.6.0: {}
 
@@ -23593,12 +23911,12 @@ snapshots:
     optionalDependencies:
       enquirer: 2.3.6
 
-  loader@2.1.1: {}
+  load-tsconfig@0.2.5: {}
 
   local-pkg@0.5.0:
     dependencies:
-      mlly: 1.4.2
-      pkg-types: 1.0.3
+      mlly: 1.7.1
+      pkg-types: 1.1.3
 
   locate-path@5.0.0:
     dependencies:
@@ -23654,6 +23972,8 @@ snapshots:
 
   lodash.orderby@4.6.0: {}
 
+  lodash.sortby@4.7.0: {}
+
   lodash.throttle@4.1.1: {}
 
   lodash@4.17.21: {}
@@ -23695,6 +24015,8 @@ snapshots:
 
   lossless-json@1.0.5: {}
 
+  lossless-json@4.0.2: {}
+
   loupe@3.1.2: {}
 
   lower-case@1.1.4: {}
@@ -23734,12 +24056,16 @@ snapshots:
 
   magic-string@0.30.10:
     dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/sourcemap-codec': 1.5.0
 
   magic-string@0.30.14:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
+  magic-string@0.30.17:
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.5.0
+
   magicast@0.3.5:
     dependencies:
       '@babel/parser': 7.26.3
@@ -24291,13 +24617,6 @@ snapshots:
 
   mkdirp@2.1.3: {}
 
-  mlly@1.4.2:
-    dependencies:
-      acorn: 8.14.0
-      pathe: 1.1.2
-      pkg-types: 1.0.3
-      ufo: 1.3.2
-
   mlly@1.7.1:
     dependencies:
       acorn: 8.14.0
@@ -24351,7 +24670,7 @@ snapshots:
   mqtt-packet@9.0.0:
     dependencies:
       bl: 6.0.12
-      debug: 4.3.7
+      debug: 4.4.0
       process-nextick-args: 2.0.1
     transitivePeerDependencies:
       - supports-color
@@ -24485,14 +24804,11 @@ snapshots:
       lower-case: 2.0.2
       tslib: 2.6.2
 
-  nock@13.3.2:
+  nock@14.0.0:
     dependencies:
-      debug: 4.3.4
+      '@mswjs/interceptors': 0.37.5
       json-stringify-safe: 5.0.1
-      lodash: 4.17.21
       propagate: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
 
   node-abi@3.54.0:
     dependencies:
@@ -24502,6 +24818,8 @@ snapshots:
 
   node-addon-api@7.1.0: {}
 
+  node-addon-api@8.3.0: {}
+
   node-cleanup@2.1.2: {}
 
   node-domexception@1.0.0: {}
@@ -24529,6 +24847,8 @@ snapshots:
   node-gyp-build-optional-packages@5.0.7:
     optional: true
 
+  node-gyp-build@4.8.4: {}
+
   node-gyp@8.4.1:
     dependencies:
       env-paths: 2.2.1
@@ -24654,19 +24974,11 @@ snapshots:
 
   number-allocator@1.0.14:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       js-sdsl: 4.3.0
     transitivePeerDependencies:
       - supports-color
 
-  nunjucks@3.2.4(chokidar@4.0.1):
-    dependencies:
-      a-sync-waterfall: 1.0.1
-      asap: 2.0.6
-      commander: 5.1.0
-    optionalDependencies:
-      chokidar: 4.0.1
-
   nwsapi@2.2.7: {}
 
   oas-kit-common@1.0.8:
@@ -24805,7 +25117,7 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openai@4.73.1(encoding@0.1.13)(zod@3.23.8):
+  openai@4.78.1(encoding@0.1.13)(zod@3.24.1):
     dependencies:
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.4
@@ -24815,7 +25127,7 @@ snapshots:
       formdata-node: 4.4.1
       node-fetch: 2.7.0(encoding@0.1.13)
     optionalDependencies:
-      zod: 3.23.8
+      zod: 3.24.1
     transitivePeerDependencies:
       - encoding
       - supports-color
@@ -24861,6 +25173,8 @@ snapshots:
       '@otplib/preset-default': 12.0.1
       '@otplib/preset-v11': 12.0.1
 
+  outvariant@1.4.3: {}
+
   p-cancelable@2.1.1: {}
 
   p-finally@1.0.0: {}
@@ -24924,7 +25238,7 @@ snapshots:
 
   parse-json@5.2.0:
     dependencies:
-      '@babel/code-frame': 7.24.6
+      '@babel/code-frame': 7.26.2
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -24992,6 +25306,8 @@ snapshots:
 
   pathe@1.1.2: {}
 
+  pathe@2.0.2: {}
+
   pathval@2.0.0: {}
 
   pause-stream@0.0.11:
@@ -25084,6 +25400,8 @@ snapshots:
 
   picomatch@2.3.1: {}
 
+  picomatch@4.0.2: {}
+
   pidtree@0.6.0: {}
 
   pify@2.3.0: {}
@@ -25106,18 +25424,20 @@ snapshots:
     dependencies:
       find-up: 4.1.0
 
-  pkg-types@1.0.3:
-    dependencies:
-      jsonc-parser: 3.2.0
-      mlly: 1.4.2
-      pathe: 1.1.2
-
   pkg-types@1.1.3:
     dependencies:
       confbox: 0.1.7
       mlly: 1.7.1
       pathe: 1.1.2
 
+  playwright-core@1.49.1: {}
+
+  playwright@1.49.1:
+    dependencies:
+      playwright-core: 1.49.1
+    optionalDependencies:
+      fsevents: 2.3.2
+
   plimit-lit@1.4.1:
     dependencies:
       queue-lit: 1.5.0
@@ -25150,6 +25470,13 @@ snapshots:
       postcss: 8.4.38
       ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
 
+  postcss-load-config@6.0.1(jiti@1.21.0)(postcss@8.4.49):
+    dependencies:
+      lilconfig: 3.1.2
+    optionalDependencies:
+      jiti: 1.21.0
+      postcss: 8.4.49
+
   postcss-nested@6.0.1(postcss@8.4.38):
     dependencies:
       postcss: 8.4.38
@@ -25450,13 +25777,6 @@ snapshots:
     dependencies:
       side-channel: 1.0.6
 
-  query-string@7.1.3:
-    dependencies:
-      decode-uri-component: 0.2.2
-      filter-obj: 1.1.0
-      split-on-first: 1.1.0
-      strict-uri-encode: 2.0.0
-
   querystringify@2.2.0: {}
 
   queue-lit@1.5.0: {}
@@ -25634,7 +25954,7 @@ snapshots:
 
   rechoir@0.6.2:
     dependencies:
-      resolve: 1.22.3
+      resolve: 1.22.8
 
   redent@3.0.0:
     dependencies:
@@ -25665,12 +25985,12 @@ snapshots:
       '@redis/search': 1.1.6(@redis/client@1.5.16)
       '@redis/time-series': 1.0.5(@redis/client@1.5.16)
 
-  redoc@2.1.5(core-js@3.35.0)(encoding@0.1.13)(enzyme@3.11.0)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)):
+  redoc@2.1.5(core-js@3.39.0)(encoding@0.1.13)(enzyme@3.11.0)(mobx@6.12.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(styled-components@6.1.8(react-dom@18.2.0(react@18.2.0))(react@18.2.0)):
     dependencies:
       '@cfaester/enzyme-adapter-react-18': 0.8.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
       '@redocly/openapi-core': 1.25.5(encoding@0.1.13)
       classnames: 2.5.1
-      core-js: 3.35.0
+      core-js: 3.39.0
       decko: 1.2.0
       dompurify: 3.1.7
       eventemitter3: 5.0.1
@@ -25718,12 +26038,6 @@ snapshots:
 
   regexp-tree@0.1.27: {}
 
-  regexp.prototype.flags@1.5.0:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      functions-have-names: 1.2.3
-
   regexp.prototype.flags@1.5.2:
     dependencies:
       call-bind: 1.0.7
@@ -25785,7 +26099,7 @@ snapshots:
 
   require-in-the-middle@7.4.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       module-details-from-path: 1.0.3
       resolve: 1.22.8
     transitivePeerDependencies:
@@ -25803,12 +26117,6 @@ snapshots:
 
   resolve.exports@2.0.0: {}
 
-  resolve@1.22.3:
-    dependencies:
-      is-core-module: 2.13.1
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-
   resolve@1.22.8:
     dependencies:
       is-core-module: 2.13.1
@@ -25927,13 +26235,6 @@ snapshots:
     dependencies:
       tslib: 2.6.2
 
-  safe-array-concat@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      isarray: 2.0.5
-
   safe-array-concat@1.1.2:
     dependencies:
       call-bind: 1.0.7
@@ -25945,12 +26246,6 @@ snapshots:
 
   safe-buffer@5.2.1: {}
 
-  safe-regex-test@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      is-regex: 1.1.4
-
   safe-regex-test@1.0.3:
     dependencies:
       call-bind: 1.0.7
@@ -26084,6 +26379,32 @@ snapshots:
 
   shallowequal@1.1.0: {}
 
+  sharp@0.33.5:
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.3
+      semver: 7.6.0
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.33.5
+      '@img/sharp-darwin-x64': 0.33.5
+      '@img/sharp-libvips-darwin-arm64': 1.0.4
+      '@img/sharp-libvips-darwin-x64': 1.0.4
+      '@img/sharp-libvips-linux-arm': 1.0.5
+      '@img/sharp-libvips-linux-arm64': 1.0.4
+      '@img/sharp-libvips-linux-s390x': 1.0.4
+      '@img/sharp-libvips-linux-x64': 1.0.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+      '@img/sharp-linux-arm': 0.33.5
+      '@img/sharp-linux-arm64': 0.33.5
+      '@img/sharp-linux-s390x': 0.33.5
+      '@img/sharp-linux-x64': 0.33.5
+      '@img/sharp-linuxmusl-arm64': 0.33.5
+      '@img/sharp-linuxmusl-x64': 0.33.5
+      '@img/sharp-wasm32': 0.33.5
+      '@img/sharp-win32-ia32': 0.33.5
+      '@img/sharp-win32-x64': 0.33.5
+
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
@@ -26179,7 +26500,7 @@ snapshots:
 
   simple-websocket@9.1.0:
     dependencies:
-      debug: 4.3.7
+      debug: 4.4.0
       queue-microtask: 1.2.3
       randombytes: 2.1.0
       readable-stream: 3.6.0
@@ -26259,7 +26580,7 @@ snapshots:
   socks-proxy-agent@6.2.1:
     dependencies:
       agent-base: 6.0.2
-      debug: 4.3.7
+      debug: 4.4.0
       socks: 2.8.3
     transitivePeerDependencies:
       - supports-color
@@ -26289,6 +26610,10 @@ snapshots:
 
   source-map@0.6.1: {}
 
+  source-map@0.8.0-beta.0:
+    dependencies:
+      whatwg-url: 7.1.0
+
   sparse-bitfield@3.0.3:
     dependencies:
       memory-pager: 1.5.0
@@ -26311,8 +26636,6 @@ snapshots:
 
   spex@3.3.0: {}
 
-  split-on-first@1.1.0: {}
-
   split2@4.2.0: {}
 
   split@0.3.3:
@@ -26410,9 +26733,9 @@ snapshots:
 
   stoppable@1.1.0: {}
 
-  storybook@8.4.6(prettier@3.3.3):
+  storybook@8.5.0(prettier@3.3.3):
     dependencies:
-      '@storybook/core': 8.4.6(prettier@3.3.3)
+      '@storybook/core': 8.5.0(prettier@3.3.3)
     optionalDependencies:
       prettier: 3.3.3
     transitivePeerDependencies:
@@ -26441,7 +26764,7 @@ snapshots:
 
   strict-event-emitter-types@2.0.0: {}
 
-  strict-uri-encode@2.0.0: {}
+  strict-event-emitter@0.5.1: {}
 
   string-argv@0.3.1: {}
 
@@ -26462,17 +26785,6 @@ snapshots:
       emoji-regex: 9.2.2
       strip-ansi: 7.1.0
 
-  string.prototype.startswith@1.0.0:
-    dependencies:
-      define-properties: 1.2.0
-      es-abstract: 1.22.1
-
-  string.prototype.trim@1.2.7:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.5
-
   string.prototype.trim@1.2.8:
     dependencies:
       call-bind: 1.0.7
@@ -26486,12 +26798,6 @@ snapshots:
       es-abstract: 1.23.3
       es-object-atoms: 1.0.0
 
-  string.prototype.trimend@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.5
-
   string.prototype.trimend@1.0.7:
     dependencies:
       call-bind: 1.0.7
@@ -26504,12 +26810,6 @@ snapshots:
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
 
-  string.prototype.trimstart@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.22.5
-
   string.prototype.trimstart@1.0.7:
     dependencies:
       call-bind: 1.0.7
@@ -26595,7 +26895,7 @@ snapshots:
     dependencies:
       component-emitter: 1.3.0
       cookiejar: 2.1.4
-      debug: 4.3.7
+      debug: 4.4.0
       fast-safe-stringify: 2.1.1
       form-data: 4.0.0
       formidable: 3.5.1
@@ -26799,12 +27099,19 @@ snapshots:
 
   tinybench@2.9.0: {}
 
-  tinyexec@0.3.1: {}
+  tinyexec@0.3.2: {}
 
-  tinypool@1.0.1: {}
+  tinyglobby@0.2.10:
+    dependencies:
+      fdir: 6.4.3(picomatch@4.0.2)
+      picomatch: 4.0.2
+
+  tinypool@1.0.2: {}
 
   tinyrainbow@1.2.0: {}
 
+  tinyrainbow@2.0.0: {}
+
   tinyspy@3.0.2: {}
 
   title-case@3.0.3:
@@ -26829,8 +27136,6 @@ snapshots:
 
   tmpl@1.0.5: {}
 
-  to-fast-properties@2.0.0: {}
-
   to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
@@ -26861,6 +27166,10 @@ snapshots:
 
   tr46@0.0.3: {}
 
+  tr46@1.0.1:
+    dependencies:
+      punycode: 2.3.1
+
   tr46@3.0.0:
     dependencies:
       punycode: 2.3.1
@@ -26879,6 +27188,18 @@ snapshots:
 
   tree-kill@1.2.2: {}
 
+  tree-sitter-bash@0.23.3(tree-sitter@0.21.1):
+    dependencies:
+      node-addon-api: 8.3.0
+      node-gyp-build: 4.8.4
+    optionalDependencies:
+      tree-sitter: 0.21.1
+
+  tree-sitter@0.21.1:
+    dependencies:
+      node-addon-api: 8.3.0
+      node-gyp-build: 4.8.4
+
   triple-beam@1.3.0: {}
 
   ts-api-utils@1.0.1(typescript@5.7.2):
@@ -26895,12 +27216,12 @@ snapshots:
     dependencies:
       typescript: 5.7.2
 
-  ts-ics@1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.23.8):
+  ts-ics@1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.24.1):
     dependencies:
       date-fns: 2.30.0
       date-fns-tz: 2.0.0(date-fns@2.30.0)
       lodash: 4.17.21
-      zod: 3.23.8
+      zod: 3.24.1
 
   ts-interface-checker@0.1.13: {}
 
@@ -26978,6 +27299,34 @@ snapshots:
 
   tsscmp@1.0.6: {}
 
+  tsup@8.3.6(@microsoft/api-extractor@7.48.0(@types/node@18.16.16))(jiti@1.21.0)(postcss@8.4.49)(typescript@5.7.2):
+    dependencies:
+      bundle-require: 5.1.0(esbuild@0.24.0)
+      cac: 6.7.14
+      chokidar: 4.0.1
+      consola: 3.4.0
+      debug: 4.4.0
+      esbuild: 0.24.0
+      joycon: 3.1.1
+      picocolors: 1.1.1
+      postcss-load-config: 6.0.1(jiti@1.21.0)(postcss@8.4.49)
+      resolve-from: 5.0.0
+      rollup: 4.24.0
+      source-map: 0.8.0-beta.0
+      sucrase: 3.35.0
+      tinyexec: 0.3.2
+      tinyglobby: 0.2.10
+      tree-kill: 1.2.2
+    optionalDependencies:
+      '@microsoft/api-extractor': 7.48.0(@types/node@18.16.16)
+      postcss: 8.4.49
+      typescript: 5.7.2
+    transitivePeerDependencies:
+      - jiti
+      - supports-color
+      - tsx
+      - yaml
+
   tunnel-agent@0.6.0:
     dependencies:
       safe-buffer: 5.2.1
@@ -27048,25 +27397,12 @@ snapshots:
 
   type-of-is@3.5.1: {}
 
-  typed-array-buffer@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      is-typed-array: 1.1.13
-
   typed-array-buffer@1.0.2:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-typed-array: 1.1.13
 
-  typed-array-byte-length@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
   typed-array-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
@@ -27075,14 +27411,6 @@ snapshots:
       has-proto: 1.0.3
       is-typed-array: 1.1.13
 
-  typed-array-byte-offset@1.0.0:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
   typed-array-byte-offset@1.0.2:
     dependencies:
       available-typed-arrays: 1.0.7
@@ -27092,12 +27420,6 @@ snapshots:
       has-proto: 1.0.3
       is-typed-array: 1.1.13
 
-  typed-array-length@1.0.4:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      is-typed-array: 1.1.13
-
   typed-array-length@1.0.5:
     dependencies:
       call-bind: 1.0.7
@@ -27126,8 +27448,6 @@ snapshots:
 
   uc.micro@2.1.0: {}
 
-  ufo@1.3.2: {}
-
   ufo@1.5.4: {}
 
   uglify-js@3.17.4: {}
@@ -27149,11 +27469,11 @@ snapshots:
 
   underscore@1.13.6: {}
 
-  undici@5.28.4:
+  undici@5.28.5:
     dependencies:
-      '@fastify/busboy': 2.0.0
+      '@fastify/busboy': 2.1.1
 
-  undici@6.19.7: {}
+  undici@6.21.1: {}
 
   unicode-canonical-property-names-ecmascript@2.0.1: {}
 
@@ -27325,15 +27645,16 @@ snapshots:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  vite-node@2.1.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
+  vite-node@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       cac: 6.7.14
-      debug: 4.3.7
-      es-module-lexer: 1.5.4
-      pathe: 1.1.2
-      vite: 5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      debug: 4.4.0
+      es-module-lexer: 1.6.0
+      pathe: 2.0.2
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - '@types/node'
+      - jiti
       - less
       - lightningcss
       - sass
@@ -27342,6 +27663,8 @@ snapshots:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
 
   vite-plugin-dts@4.3.0(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
@@ -27350,10 +27673,10 @@ snapshots:
       '@volar/typescript': 2.4.10
       '@vue/language-core': 2.1.6(typescript@5.7.2)
       compare-versions: 6.1.1
-      debug: 4.3.7
+      debug: 4.4.0
       kolorist: 1.8.0
       local-pkg: 0.5.0
-      magic-string: 0.30.14
+      magic-string: 0.30.17
       typescript: 5.7.2
     optionalDependencies:
       vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
@@ -27362,22 +27685,19 @@ snapshots:
       - rollup
       - supports-color
 
+  vite-plugin-static-copy@2.2.0(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)):
+    dependencies:
+      chokidar: 4.0.1
+      fast-glob: 3.3.2
+      fs-extra: 11.3.0
+      picocolors: 1.1.1
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+
   vite-svg-loader@5.1.0(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       svgo: 3.3.2
       vue: 3.5.13(typescript@5.7.2)
 
-  vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
-    dependencies:
-      esbuild: 0.24.0
-      postcss: 8.4.49
-      rollup: 4.24.0
-    optionalDependencies:
-      '@types/node': 18.16.16
-      fsevents: 2.3.3
-      sass: 1.64.1
-      terser: 5.16.1
-
   vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       esbuild: 0.24.0
@@ -27390,38 +27710,49 @@ snapshots:
       sass: 1.64.1
       terser: 5.16.1
 
-  vitest-mock-extended@2.0.2(typescript@5.7.2)(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)):
+  vitest-axe@0.1.0(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)):
+    dependencies:
+      aria-query: 5.3.0
+      axe-core: 4.7.2
+      chalk: 5.4.1
+      dom-accessibility-api: 0.5.15
+      lodash-es: 4.17.21
+      redent: 3.0.0
+      vitest: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+
+  vitest-mock-extended@2.0.2(typescript@5.7.2)(vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
       ts-essentials: 10.0.2(typescript@5.7.2)
       typescript: 5.7.2
-      vitest: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
 
-  vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1):
+  vitest@3.0.2(@types/node@18.16.16)(jiti@1.21.0)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1):
     dependencies:
-      '@vitest/expect': 2.1.8
-      '@vitest/mocker': 2.1.8(vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
-      '@vitest/pretty-format': 2.1.8
-      '@vitest/runner': 2.1.8
-      '@vitest/snapshot': 2.1.8
-      '@vitest/spy': 2.1.8
-      '@vitest/utils': 2.1.8
+      '@vitest/expect': 3.0.2
+      '@vitest/mocker': 3.0.2(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      '@vitest/pretty-format': 3.0.2
+      '@vitest/runner': 3.0.2
+      '@vitest/snapshot': 3.0.2
+      '@vitest/spy': 3.0.2
+      '@vitest/utils': 3.0.2
       chai: 5.1.2
-      debug: 4.3.7
+      debug: 4.4.0
       expect-type: 1.1.0
-      magic-string: 0.30.14
-      pathe: 1.1.2
+      magic-string: 0.30.17
+      pathe: 2.0.2
       std-env: 3.8.0
       tinybench: 2.9.0
-      tinyexec: 0.3.1
-      tinypool: 1.0.1
-      tinyrainbow: 1.2.0
-      vite: 5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
-      vite-node: 2.1.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      tinyexec: 0.3.2
+      tinypool: 1.0.2
+      tinyrainbow: 2.0.0
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-node: 3.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 18.16.16
       jsdom: 23.0.1
     transitivePeerDependencies:
+      - jiti
       - less
       - lightningcss
       - msw
@@ -27431,6 +27762,8 @@ snapshots:
       - sugarss
       - supports-color
       - terser
+      - tsx
+      - yaml
 
   void-elements@3.1.0: {}
 
@@ -27469,8 +27802,8 @@ snapshots:
 
   vue-docgen-api@4.76.0(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       '@vue/compiler-dom': 3.5.13
       '@vue/compiler-sfc': 3.5.13
       ast-types: 0.16.1
@@ -27604,8 +27937,12 @@ snapshots:
 
   web-streams-polyfill@4.0.0-beta.3: {}
 
+  web-tree-sitter@0.24.3: {}
+
   webidl-conversions@3.0.1: {}
 
+  webidl-conversions@4.0.2: {}
+
   webidl-conversions@7.0.0: {}
 
   webpack-sources@3.2.3: {}
@@ -27646,6 +27983,12 @@ snapshots:
       tr46: 0.0.3
       webidl-conversions: 3.0.1
 
+  whatwg-url@7.1.0:
+    dependencies:
+      lodash.sortby: 4.7.0
+      tr46: 1.0.1
+      webidl-conversions: 4.0.2
+
   which-boxed-primitive@1.0.2:
     dependencies:
       is-bigint: 1.0.4
@@ -27897,16 +28240,20 @@ snapshots:
       property-expr: 2.0.5
       toposort: 2.0.2
 
-  zod-class@0.0.16(zod@3.23.8):
+  zod-class@0.0.16(zod@3.24.1):
     dependencies:
       type-fest: 4.26.1
-      zod: 3.23.8
+      zod: 3.24.1
 
-  zod-to-json-schema@3.23.3(zod@3.23.8):
+  zod-to-json-schema@3.23.3(zod@3.24.1):
     dependencies:
-      zod: 3.23.8
+      zod: 3.24.1
 
-  zod@3.23.8: {}
+  zod-to-json-schema@3.24.1(zod@3.24.1):
+    dependencies:
+      zod: 3.24.1
+
+  zod@3.24.1: {}
 
   zx@8.1.4:
     optionalDependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 817bb12dfb..0ee9c1c265 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -2,10 +2,11 @@ packages:
   - packages/*
   - packages/@n8n/*
   - packages/@n8n_io/*
+  - packages/frontend/**
   - cypress
 
 catalog:
-  '@sentry/node': 8.42.0
+  '@sentry/node': 8.52.1
   '@types/basic-auth': ^1.1.3
   '@types/express': ^4.17.21
   '@types/lodash': ^4.14.195
@@ -27,16 +28,23 @@ catalog:
   uuid: 10.0.0
   xml2js: 0.6.2
   xss: 1.0.15
-  zod: 3.23.8
-  '@langchain/core': 0.3.19
+  zod: 3.24.1
+  '@langchain/core': 0.3.30
 
 catalogs:
   frontend:
-    '@vitest/coverage-v8': ^2.1.6
+    '@testing-library/jest-dom': ^6.6.3
+    '@testing-library/user-event': ^14.6.0
+    '@testing-library/vue': ^8.1.0
+    '@vue/tsconfig': ^0.7.0
+    '@vitest/coverage-v8': ^3.0.2
     '@vitejs/plugin-vue': ^5.2.1
     '@sentry/vue': ^8.33.1
+    tsup: ^8.3.6
+    typescript: ^5.6.2
     vite: ^6.0.2
-    vitest: ^2.1.8
+    vite-plugin-dts: ^4.3.0
+    vitest: ^3.0.2
     vitest-mock-extended: ^2.0.2
     vue: ^3.5.13
     vue-router: ^4.5.0
diff --git a/turbo.json b/turbo.json
index 53ac21655e..5851fb4572 100644
--- a/turbo.json
+++ b/turbo.json
@@ -45,6 +45,7 @@
 				"@n8n/codemirror-lang#lint",
 				"@n8n/storybook#lint",
 				"n8n-cypress#lint",
+				"@n8n/composables#build",
 				"n8n-design-system#lint",
 				"n8n-editor-ui#lint"
 			]
@@ -77,6 +78,7 @@
 			"dependsOn": [
 				"@n8n/chat#test",
 				"@n8n/codemirror-lang#test",
+				"@n8n/composables#build",
 				"n8n-design-system#test",
 				"n8n-editor-ui#test"
 			],